William Brown 5 gadus atpakaļ
vecāks
revīzija
c022d527e3
2 mainītis faili ar 35 papildinājumiem un 47 dzēšanām
  1. 34
    46
      .idea/workspace.xml
  2. 1
    1
      arraz/src/test/java/ArrazTest.java

+ 34
- 46
.idea/workspace.xml Parādīt failu

@@ -2,7 +2,7 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="3455511b-a100-4bbd-b07c-68f009bc8dbc" name="Default" comment="">
5
-      <change beforePath="$PROJECT_DIR$/arraz/src/main/java/Arraz.java" beforeDir="false" afterPath="$PROJECT_DIR$/arraz/src/main/java/Arraz.java" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 6
       <change beforePath="$PROJECT_DIR$/arraz/src/test/java/ArrazTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/arraz/src/test/java/ArrazTest.java" afterDir="false" />
7 7
     </list>
8 8
     <ignored path="$PROJECT_DIR$/arraz/target/" />
@@ -25,16 +25,17 @@
25 25
     <session id="-1803996711">
26 26
       <usages-collector id="statistics.lifecycle.project">
27 27
         <counts>
28
-          <entry key="project.closed" value="5" />
28
+          <entry key="project.closed" value="7" />
29 29
           <entry key="project.open.time.14" value="2" />
30
-          <entry key="project.open.time.2" value="1" />
30
+          <entry key="project.open.time.2" value="2" />
31
+          <entry key="project.open.time.3" value="1" />
31 32
           <entry key="project.open.time.4" value="2" />
32
-          <entry key="project.opened" value="5" />
33
+          <entry key="project.opened" value="7" />
33 34
         </counts>
34 35
       </usages-collector>
35 36
       <usages-collector id="statistics.file.types.edit">
36 37
         <counts>
37
-          <entry key="JAVA" value="9947" />
38
+          <entry key="JAVA" value="9964" />
38 39
           <entry key="XML" value="4" />
39 40
         </counts>
40 41
       </usages-collector>
@@ -51,16 +52,10 @@
51 52
       <file pinned="false" current-in-tab="true">
52 53
         <entry file="file://$PROJECT_DIR$/arraz/src/main/java/Arraz.java">
53 54
           <provider selected="true" editor-type-id="text-editor">
54
-            <state relative-caret-position="1335">
55
-              <caret line="89" column="9" lean-forward="true" selection-start-line="89" selection-start-column="9" selection-end-line="89" selection-end-column="9" />
55
+            <state relative-caret-position="330">
56
+              <caret line="341" column="18" lean-forward="true" selection-start-line="341" selection-start-column="18" selection-end-line="341" selection-end-column="18" />
56 57
               <folding>
57 58
                 <element signature="imports" expanded="true" />
58
-                <element signature="e#504#505#0" expanded="true" />
59
-                <element signature="e#561#562#0" expanded="true" />
60
-                <element signature="e#616#617#0" expanded="true" />
61
-                <element signature="e#674#675#0" expanded="true" />
62
-                <element signature="e#4880#4881#0" expanded="true" />
63
-                <element signature="e#4918#4919#0" expanded="true" />
64 59
               </folding>
65 60
             </state>
66 61
           </provider>
@@ -69,12 +64,10 @@
69 64
       <file pinned="false" current-in-tab="false">
70 65
         <entry file="file://$PROJECT_DIR$/arraz/src/test/java/ArrazTest.java">
71 66
           <provider selected="true" editor-type-id="text-editor">
72
-            <state relative-caret-position="3090">
73
-              <caret line="206" column="37" lean-forward="true" selection-start-line="206" selection-start-column="37" selection-end-line="206" selection-end-column="37" />
67
+            <state relative-caret-position="4770">
68
+              <caret line="322" column="48" selection-start-line="322" selection-start-column="48" selection-end-line="322" selection-end-column="48" />
74 69
               <folding>
75 70
                 <element signature="imports" expanded="true" />
76
-                <element signature="e#8537#8546#0" expanded="true" />
77
-                <element signature="e#8823#8832#0" expanded="true" />
78 71
               </folding>
79 72
             </state>
80 73
           </provider>
@@ -98,6 +91,7 @@
98 91
       <find>remove</find>
99 92
       <find>findindex</find>
100 93
       <find>copy</find>
94
+      <find>sort</find>
101 95
     </findStrings>
102 96
     <replaceStrings>
103 97
       <replace>public</replace>
@@ -137,7 +131,7 @@
137 131
       </MavenImportingSettings>
138 132
     </option>
139 133
   </component>
140
-  <component name="ProjectFrameBounds">
134
+  <component name="ProjectFrameBounds" extendedState="6">
141 135
     <option name="y" value="22" />
142 136
     <option name="width" value="1280" />
143 137
     <option name="height" value="739" />
@@ -212,7 +206,7 @@
212 206
     <property name="GO_FMT" value="false" />
213 207
     <property name="WebServerToolWindowFactoryState" value="false" />
214 208
     <property name="aspect.path.notification.shown" value="true" />
215
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544145500059" />
209
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544197039678" />
216 210
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
217 211
     <property name="jdk.selected.JAVA_MODULE" value="1.8" />
218 212
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -239,7 +233,7 @@
239 233
       </list>
240 234
     </option>
241 235
   </component>
242
-  <component name="RunManager" selected="JUnit.ArrazTest">
236
+  <component name="RunManager" selected="JUnit.ArrazTest.testSort2">
243 237
     <configuration default="true" type="Applet" factoryName="Applet">
244 238
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
245 239
       <method v="2">
@@ -294,11 +288,11 @@
294 288
         <option name="Make" enabled="true" />
295 289
       </method>
296 290
     </configuration>
297
-    <configuration name="ArrazTest.testRemoveElementFromArray3" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
291
+    <configuration name="ArrazTest.testSort2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
298 292
       <module name="arraz" />
299 293
       <option name="PACKAGE_NAME" value="" />
300 294
       <option name="MAIN_CLASS_NAME" value="ArrazTest" />
301
-      <option name="METHOD_NAME" value="testRemoveElementFromArray3" />
295
+      <option name="METHOD_NAME" value="testSort2" />
302 296
       <option name="TEST_OBJECT" value="method" />
303 297
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
304 298
       <method v="2">
@@ -329,19 +323,19 @@
329 323
       </method>
330 324
     </configuration>
331 325
     <list>
332
-      <item itemvalue="JUnit.ArrazTest.testRemoveElementFromArray3" />
333 326
       <item itemvalue="JUnit.ArrazTest.testFindIndexOf2" />
334 327
       <item itemvalue="JUnit.ArrazTest.testCopyArrayByInterator1" />
335 328
       <item itemvalue="JUnit.ArrazTest.testCopyArrayByInterator2" />
336 329
       <item itemvalue="JUnit.ArrazTest" />
330
+      <item itemvalue="JUnit.ArrazTest.testSort2" />
337 331
     </list>
338 332
     <recent_temporary>
339 333
       <list>
334
+        <item itemvalue="JUnit.ArrazTest.testSort2" />
340 335
         <item itemvalue="JUnit.ArrazTest" />
341 336
         <item itemvalue="JUnit.ArrazTest.testCopyArrayByInterator2" />
342 337
         <item itemvalue="JUnit.ArrazTest.testCopyArrayByInterator1" />
343 338
         <item itemvalue="JUnit.ArrazTest.testFindIndexOf2" />
344
-        <item itemvalue="JUnit.ArrazTest.testRemoveElementFromArray3" />
345 339
       </list>
346 340
     </recent_temporary>
347 341
   </component>
@@ -363,6 +357,8 @@
363 357
       <workItem from="1544048104554" duration="1398000" />
364 358
       <workItem from="1544060926907" duration="4177000" />
365 359
       <workItem from="1544125434968" duration="11066000" />
360
+      <workItem from="1544196949279" duration="205000" />
361
+      <workItem from="1544206032237" duration="356000" />
366 362
     </task>
367 363
     <task id="LOCAL-00001" summary="readme and docs">
368 364
       <created>1544021313039</created>
@@ -375,12 +371,6 @@
375 371
     <servers />
376 372
   </component>
377 373
   <component name="TestHistory">
378
-    <history-entry file="ArrazTest - 2018.12.06 at 19h 59m 51s.xml">
379
-      <configuration name="ArrazTest" configurationId="JUnit" />
380
-    </history-entry>
381
-    <history-entry file="ArrazTest - 2018.12.06 at 20h 00m 03s.xml">
382
-      <configuration name="ArrazTest" configurationId="JUnit" />
383
-    </history-entry>
384 374
     <history-entry file="ArrazTest_testCheck2ArraysForEqual3 - 2018.12.06 at 20h 01m 22s.xml">
385 375
       <configuration name="ArrazTest.testCheck2ArraysForEqual3" configurationId="JUnit" />
386 376
     </history-entry>
@@ -405,9 +395,15 @@
405 395
     <history-entry file="ArrazTest - 2018.12.06 at 20h 18m 25s.xml">
406 396
       <configuration name="ArrazTest" configurationId="JUnit" />
407 397
     </history-entry>
398
+    <history-entry file="ArrazTest_testSort2 - 2018.12.07 at 10h 36m 38s.xml">
399
+      <configuration name="ArrazTest.testSort2" configurationId="JUnit" />
400
+    </history-entry>
401
+    <history-entry file="ArrazTest_testSort2 - 2018.12.07 at 10h 37m 24s.xml">
402
+      <configuration name="ArrazTest.testSort2" configurationId="JUnit" />
403
+    </history-entry>
408 404
   </component>
409 405
   <component name="TimeTrackingManager">
410
-    <option name="totallyTimeSpent" value="22214000" />
406
+    <option name="totallyTimeSpent" value="22775000" />
411 407
   </component>
412 408
   <component name="ToolWindowManager">
413 409
     <frame x="0" y="22" width="1280" height="739" extended-state="0" />
@@ -432,7 +428,6 @@
432 428
       <window_info anchor="bottom" id="Version Control" order="9" />
433 429
       <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
434 430
       <window_info anchor="bottom" id="Messages" order="11" weight="0.32921174" />
435
-      <window_info anchor="right" id="Coverage" side_tool="true" weight="0.32956383" />
436 431
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
437 432
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
438 433
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -442,6 +437,7 @@
442 437
       <window_info anchor="right" id="Database" order="6" />
443 438
       <window_info anchor="right" id="Palette&#9;" order="7" />
444 439
       <window_info anchor="right" id="Maven Projects" order="8" />
440
+      <window_info anchor="right" id="Coverage" order="9" side_tool="true" weight="0.32956383" />
445 441
     </layout>
446 442
   </component>
447 443
   <component name="TypeScriptGeneratedFilesManager">
@@ -472,30 +468,22 @@
472 468
         </state>
473 469
       </provider>
474 470
     </entry>
475
-    <entry file="file://$PROJECT_DIR$/arraz/src/test/java/ArrazTest.java">
471
+    <entry file="file://$PROJECT_DIR$/arraz/src/main/java/Arraz.java">
476 472
       <provider selected="true" editor-type-id="text-editor">
477
-        <state relative-caret-position="3090">
478
-          <caret line="206" column="37" lean-forward="true" selection-start-line="206" selection-start-column="37" selection-end-line="206" selection-end-column="37" />
473
+        <state relative-caret-position="330">
474
+          <caret line="341" column="18" lean-forward="true" selection-start-line="341" selection-start-column="18" selection-end-line="341" selection-end-column="18" />
479 475
           <folding>
480 476
             <element signature="imports" expanded="true" />
481
-            <element signature="e#8537#8546#0" expanded="true" />
482
-            <element signature="e#8823#8832#0" expanded="true" />
483 477
           </folding>
484 478
         </state>
485 479
       </provider>
486 480
     </entry>
487
-    <entry file="file://$PROJECT_DIR$/arraz/src/main/java/Arraz.java">
481
+    <entry file="file://$PROJECT_DIR$/arraz/src/test/java/ArrazTest.java">
488 482
       <provider selected="true" editor-type-id="text-editor">
489
-        <state relative-caret-position="1335">
490
-          <caret line="89" column="9" lean-forward="true" selection-start-line="89" selection-start-column="9" selection-end-line="89" selection-end-column="9" />
483
+        <state relative-caret-position="4770">
484
+          <caret line="322" column="48" selection-start-line="322" selection-start-column="48" selection-end-line="322" selection-end-column="48" />
491 485
           <folding>
492 486
             <element signature="imports" expanded="true" />
493
-            <element signature="e#504#505#0" expanded="true" />
494
-            <element signature="e#561#562#0" expanded="true" />
495
-            <element signature="e#616#617#0" expanded="true" />
496
-            <element signature="e#674#675#0" expanded="true" />
497
-            <element signature="e#4880#4881#0" expanded="true" />
498
-            <element signature="e#4918#4919#0" expanded="true" />
499 487
           </folding>
500 488
         </state>
501 489
       </provider>

+ 1
- 1
arraz/src/test/java/ArrazTest.java Parādīt failu

@@ -320,7 +320,7 @@ public class ArrazTest {
320 320
 
321 321
     @Test
322 322
     public void testSort2(){
323
-        int[] arr = new int[] {1,9,3,4,6,5,7,8,2};
323
+        int[] arr = new int[] {9,8,7,6,5,4,3,2,1};
324 324
 
325 325
         int[] expected  = new int[] {1,2,3,4,5,6,7,8,9};
326 326
         int[] actual = arraz.sort(arr);