Leon 7 лет назад
Родитель
Сommit
9e5e3baee3

+ 75
- 79
.idea/workspace.xml Просмотреть файл

@@ -1,10 +1,7 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4
-    <list default="true" id="30b7e4a0-b899-49c3-865c-0311dfadae62" name="Default" comment="">
5
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java" />
6
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/anthropoid/TestPersonWarehouse.java" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/anthropoid/TestPersonWarehouse.java" />
7
-    </list>
4
+    <list default="true" id="30b7e4a0-b899-49c3-865c-0311dfadae62" name="Default" comment="" />
8 5
     <ignored path="$PROJECT_DIR$/out/" />
9 6
     <ignored path="$PROJECT_DIR$/target/" />
10 7
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -55,16 +52,6 @@
55 52
           </provider>
56 53
         </entry>
57 54
       </file>
58
-      <file leaf-file-name="TestConstants.java" pinned="false" current-in-tab="false">
59
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/TestConstants.java">
60
-          <provider selected="true" editor-type-id="text-editor">
61
-            <state relative-caret-position="105">
62
-              <caret line="7" column="26" lean-forward="false" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
63
-              <folding />
64
-            </state>
65
-          </provider>
66
-        </entry>
67
-      </file>
68 55
       <file leaf-file-name="TestPersonFactory.java" pinned="false" current-in-tab="false">
69 56
         <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/anthropoid/TestPersonFactory.java">
70 57
           <provider selected="true" editor-type-id="text-editor">
@@ -107,7 +94,7 @@
107 94
           </provider>
108 95
         </entry>
109 96
       </file>
110
-      <file leaf-file-name="PersonFactory.java" pinned="false" current-in-tab="false">
97
+      <file leaf-file-name="PersonFactory.java" pinned="false" current-in-tab="true">
111 98
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java">
112 99
           <provider selected="true" editor-type-id="text-editor">
113 100
             <state relative-caret-position="777">
@@ -117,11 +104,11 @@
117 104
           </provider>
118 105
         </entry>
119 106
       </file>
120
-      <file leaf-file-name="PersonWarehouse.java" pinned="false" current-in-tab="true">
107
+      <file leaf-file-name="PersonWarehouse.java" pinned="false" current-in-tab="false">
121 108
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java">
122 109
           <provider selected="true" editor-type-id="text-editor">
123
-            <state relative-caret-position="360">
124
-              <caret line="68" column="63" lean-forward="false" selection-start-line="68" selection-start-column="63" selection-end-line="68" selection-end-column="63" />
110
+            <state relative-caret-position="990">
111
+              <caret line="74" column="15" lean-forward="true" selection-start-line="74" selection-start-column="15" selection-end-line="74" selection-end-column="15" />
125 112
               <folding>
126 113
                 <element signature="e#2007#2008#0" expanded="true" />
127 114
                 <element signature="e#2063#2064#0" expanded="true" />
@@ -132,6 +119,16 @@
132 119
           </provider>
133 120
         </entry>
134 121
       </file>
122
+      <file leaf-file-name="Person.java" pinned="false" current-in-tab="false">
123
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/Person.java">
124
+          <provider selected="true" editor-type-id="text-editor">
125
+            <state relative-caret-position="330">
126
+              <caret line="26" column="31" lean-forward="true" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
127
+              <folding />
128
+            </state>
129
+          </provider>
130
+        </entry>
131
+      </file>
135 132
       <file leaf-file-name="StreamMap.java" pinned="false" current-in-tab="false">
136 133
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/StreamMap.java">
137 134
           <provider selected="true" editor-type-id="text-editor">
@@ -489,33 +486,7 @@
489 486
       </list>
490 487
     </option>
491 488
   </component>
492
-  <component name="RunManager" selected="JUnit.TestPersonWarehouse">
493
-    <configuration default="false" name="TestSuiteFullRegression" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
494
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
495
-        <pattern>
496
-          <option name="PATTERN" value="com.zipcodewilmington.streams.anthropoid.*" />
497
-          <option name="ENABLED" value="true" />
498
-        </pattern>
499
-      </extension>
500
-      <module name="looptest" />
501
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
502
-      <option name="ALTERNATIVE_JRE_PATH" />
503
-      <option name="PACKAGE_NAME" value="com.zipcodewilmington.streams" />
504
-      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.streams.TestSuiteFullRegression" />
505
-      <option name="METHOD_NAME" />
506
-      <option name="TEST_OBJECT" value="class" />
507
-      <option name="VM_PARAMETERS" value="-ea" />
508
-      <option name="PARAMETERS" />
509
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
510
-      <option name="ENV_VARIABLES" />
511
-      <option name="PASS_PARENT_ENVS" value="true" />
512
-      <option name="TEST_SEARCH_SCOPE">
513
-        <value defaultName="singleModule" />
514
-      </option>
515
-      <envs />
516
-      <patterns />
517
-      <method />
518
-    </configuration>
489
+  <component name="RunManager" selected="JUnit.TestSuiteFullRegression">
519 490
     <configuration default="false" name="TestPerson" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
520 491
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
521 492
         <pattern>
@@ -614,6 +585,32 @@
614 585
       <patterns />
615 586
       <method />
616 587
     </configuration>
588
+    <configuration default="false" name="TestSuiteFullRegression" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
589
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
590
+        <pattern>
591
+          <option name="PATTERN" value="com.zipcodewilmington.streams.anthropoid.*" />
592
+          <option name="ENABLED" value="true" />
593
+        </pattern>
594
+      </extension>
595
+      <module name="streamdemo" />
596
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
597
+      <option name="ALTERNATIVE_JRE_PATH" />
598
+      <option name="PACKAGE_NAME" value="com.zipcodewilmington.streams" />
599
+      <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.streams.TestSuiteFullRegression" />
600
+      <option name="METHOD_NAME" value="" />
601
+      <option name="TEST_OBJECT" value="class" />
602
+      <option name="VM_PARAMETERS" value="-ea" />
603
+      <option name="PARAMETERS" value="" />
604
+      <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
605
+      <option name="ENV_VARIABLES" />
606
+      <option name="PASS_PARENT_ENVS" value="true" />
607
+      <option name="TEST_SEARCH_SCOPE">
608
+        <value defaultName="singleModule" />
609
+      </option>
610
+      <envs />
611
+      <patterns />
612
+      <method />
613
+    </configuration>
617 614
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
618 615
       <module name="" />
619 616
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
@@ -819,18 +816,18 @@
819 816
       <method />
820 817
     </configuration>
821 818
     <list size="5">
822
-      <item index="0" class="java.lang.String" itemvalue="JUnit.TestSuiteFullRegression" />
823
-      <item index="1" class="java.lang.String" itemvalue="Application.TestPerson" />
824
-      <item index="2" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse.testAddPerson" />
825
-      <item index="3" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse.testGetIdToNameMap" />
826
-      <item index="4" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse" />
819
+      <item index="0" class="java.lang.String" itemvalue="Application.TestPerson" />
820
+      <item index="1" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse.testAddPerson" />
821
+      <item index="2" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse.testGetIdToNameMap" />
822
+      <item index="3" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse" />
823
+      <item index="4" class="java.lang.String" itemvalue="JUnit.TestSuiteFullRegression" />
827 824
     </list>
828 825
     <recent_temporary>
829 826
       <list size="5">
830
-        <item index="0" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse" />
831
-        <item index="1" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse.testAddPerson" />
832
-        <item index="2" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse.testGetIdToNameMap" />
833
-        <item index="3" class="java.lang.String" itemvalue="JUnit.TestSuiteFullRegression" />
827
+        <item index="0" class="java.lang.String" itemvalue="JUnit.TestSuiteFullRegression" />
828
+        <item index="1" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse" />
829
+        <item index="2" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse.testAddPerson" />
830
+        <item index="3" class="java.lang.String" itemvalue="JUnit.TestPersonWarehouse.testGetIdToNameMap" />
834 831
         <item index="4" class="java.lang.String" itemvalue="Application.TestPerson" />
835 832
       </list>
836 833
     </recent_temporary>
@@ -852,9 +849,6 @@
852 849
     <servers />
853 850
   </component>
854 851
   <component name="TestHistory">
855
-    <history-entry file="TestPersonWarehouse - 2017.05.31 at 15h 54m 04s.xml">
856
-      <configuration name="TestPersonWarehouse" configurationId="JUnit" />
857
-    </history-entry>
858 852
     <history-entry file="TestPersonWarehouse - 2017.05.31 at 15h 54m 05s.xml">
859 853
       <configuration name="TestPersonWarehouse" configurationId="JUnit" />
860 854
     </history-entry>
@@ -882,6 +876,9 @@
882 876
     <history-entry file="TestPersonWarehouse - 2017.05.31 at 15h 58m 34s.xml">
883 877
       <configuration name="TestPersonWarehouse" configurationId="JUnit" />
884 878
     </history-entry>
879
+    <history-entry file="TestPersonWarehouse - 2017.05.31 at 15h 59m 25s.xml">
880
+      <configuration name="TestPersonWarehouse" configurationId="JUnit" />
881
+    </history-entry>
885 882
   </component>
886 883
   <component name="TodoView">
887 884
     <todo-panel id="selected-file">
@@ -894,7 +891,6 @@
894 891
   </component>
895 892
   <component name="ToolWindowManager">
896 893
     <frame x="1440" y="23" width="1920" height="1053" extended-state="6" />
897
-    <editor active="true" />
898 894
     <layout>
899 895
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
900 896
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32778355" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -906,12 +902,12 @@
906 902
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
907 903
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
908 904
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
909
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31425598" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
905
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31425598" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
910 906
       <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
911
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25078043" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
907
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25078043" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
912 908
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
913 909
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
914
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20820022" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
910
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20820022" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
915 911
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298647" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
916 912
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
917 913
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1266,14 +1262,6 @@
1266 1262
         </state>
1267 1263
       </provider>
1268 1264
     </entry>
1269
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/Person.java">
1270
-      <provider selected="true" editor-type-id="text-editor">
1271
-        <state relative-caret-position="330">
1272
-          <caret line="26" column="31" lean-forward="true" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
1273
-          <folding />
1274
-        </state>
1275
-      </provider>
1276
-    </entry>
1277 1265
     <entry file="file://$PROJECT_DIR$/streamdemo.iml">
1278 1266
       <provider selected="true" editor-type-id="text-editor">
1279 1267
         <state relative-caret-position="0">
@@ -1311,14 +1299,6 @@
1311 1299
         </state>
1312 1300
       </provider>
1313 1301
     </entry>
1314
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java">
1315
-      <provider selected="true" editor-type-id="text-editor">
1316
-        <state relative-caret-position="777">
1317
-          <caret line="60" column="84" lean-forward="true" selection-start-line="60" selection-start-column="84" selection-end-line="60" selection-end-column="84" />
1318
-          <folding />
1319
-        </state>
1320
-      </provider>
1321
-    </entry>
1322 1302
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/streams/anthropoid/TestPersonWarehouse.java">
1323 1303
       <provider selected="true" editor-type-id="text-editor">
1324 1304
         <state relative-caret-position="313">
@@ -1331,8 +1311,8 @@
1331 1311
     </entry>
1332 1312
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonWarehouse.java">
1333 1313
       <provider selected="true" editor-type-id="text-editor">
1334
-        <state relative-caret-position="360">
1335
-          <caret line="68" column="63" lean-forward="false" selection-start-line="68" selection-start-column="63" selection-end-line="68" selection-end-column="63" />
1314
+        <state relative-caret-position="990">
1315
+          <caret line="74" column="15" lean-forward="true" selection-start-line="74" selection-start-column="15" selection-end-line="74" selection-end-column="15" />
1336 1316
           <folding>
1337 1317
             <element signature="e#2007#2008#0" expanded="true" />
1338 1318
             <element signature="e#2063#2064#0" expanded="true" />
@@ -1342,6 +1322,22 @@
1342 1322
         </state>
1343 1323
       </provider>
1344 1324
     </entry>
1325
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/Person.java">
1326
+      <provider selected="true" editor-type-id="text-editor">
1327
+        <state relative-caret-position="330">
1328
+          <caret line="26" column="31" lean-forward="true" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
1329
+          <folding />
1330
+        </state>
1331
+      </provider>
1332
+    </entry>
1333
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/streams/anthropoid/PersonFactory.java">
1334
+      <provider selected="true" editor-type-id="text-editor">
1335
+        <state relative-caret-position="777">
1336
+          <caret line="60" column="84" lean-forward="true" selection-start-line="60" selection-start-column="84" selection-end-line="60" selection-end-column="84" />
1337
+          <folding />
1338
+        </state>
1339
+      </provider>
1340
+    </entry>
1345 1341
   </component>
1346 1342
   <component name="masterDetails">
1347 1343
     <states>

+ 2
- 1
src/test/java/com/zipcodewilmington/streams/TestSuiteFullRegression.java Просмотреть файл

@@ -1,6 +1,7 @@
1 1
 package com.zipcodewilmington.streams;
2 2
 
3 3
 import com.zipcodewilmington.streams.anthropoid.TestPersonFactory;
4
+import com.zipcodewilmington.streams.anthropoid.TestSuiteAnthropoidRegression;
4 5
 import com.zipcodewilmington.streams.conversions.TestSuiteConversionRegression;
5 6
 import org.junit.runner.RunWith;
6 7
 import org.junit.runners.Suite;
@@ -10,7 +11,7 @@ import org.junit.runners.Suite;
10 11
 @Suite.SuiteClasses({
11 12
         TestStreamFilter.class,
12 13
         TestStreamMap.class,
13
-        TestPersonFactory.class,
14
+        TestSuiteAnthropoidRegression.class,
14 15
         TestSuiteConversionRegression.class
15 16
 })
16 17
 

+ 20
- 0
src/test/java/com/zipcodewilmington/streams/anthropoid/TestSuiteAnthropoidRegression.java Просмотреть файл

@@ -0,0 +1,20 @@
1
+package com.zipcodewilmington.streams.anthropoid;
2
+
3
+import com.zipcodewilmington.streams.conversions.TestConverterArray;
4
+import com.zipcodewilmington.streams.conversions.TestConverterList;
5
+import com.zipcodewilmington.streams.conversions.TestConverterStream;
6
+import org.junit.runner.RunWith;
7
+import org.junit.runners.Suite;
8
+
9
+@RunWith(Suite.class)
10
+
11
+@Suite.SuiteClasses({
12
+        TestPersonFactory.class,
13
+        TestPersonWarehouse.class
14
+})
15
+
16
+/**
17
+ * Created by leon on 5/31/17.
18
+ */
19
+public class TestSuiteAnthropoidRegression {
20
+}

+ 531446
- 6
target/PersonWarehouse.leonlog
Разница между файлами не показана из-за своего большого размера
Просмотреть файл


+ 1
- 1
target/global.leonlog Просмотреть файл

@@ -1,2 +1,2 @@
1
-May 31, 2017 3:59:25 PM com.zipcodewilmington.streams.tools.logging.LoggerHandler log
1
+May 31, 2017 3:59:57 PM com.zipcodewilmington.streams.tools.logging.LoggerHandler log
2 2
 INFO: Instantiating logger for [ com.zipcodewilmington.streams.anthropoid.PersonWarehouse ] ...