Cleanup

neo4j · Oct 18, 2017 · a854a21 · a854a21
1 parent 2acbf53
commit a854a21
Showing 1 changed file with 29 additions and 75 deletions.
diff --git a/...ndex/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeSchemaIndexIteratorTest.java b/...ndex/src/test/java/org/neo4j/kernel/impl/api/OperationsFacadeSchemaIndexIteratorTest.java
@@ -54,6 +54,7 @@
 import org.neo4j.test.rule.RandomRule;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -295,27 +296,7 @@ public void multipleIteratorsNestedInterleavedExists() throws Exception
             List<Long> actual2 = new ArrayList<>();
 
             // Interleave
-            while ( iter1.hasNext() && iter2.hasNext() )
+            exhaustInterleaved( iter1, actual1, iter2, actual2 );
-            {
-                if ( rnd.nextBoolean() )
-                {
-                    actual1.add( iter1.next() );
-                }
-                else
-                {
-                    actual2.add( iter2.next() );
-                }
-            }
-
-            // Empty the rest
-            while ( iter1.hasNext() )
-            {
-                actual1.add( iter1.next() );
-            }
-            while ( iter2.hasNext() )
-            {
-                actual2.add( iter2.next() );
-            }
 
             // then
             indexCoordinator.assertExistsResult( actual1 );
@@ -338,27 +319,7 @@ public void multipleIteratorsNestedInterleavedExact() throws Exception
             List<Long> actual2 = new ArrayList<>();
 
             // Interleave
-            while ( iter1.hasNext() && iter2.hasNext() )
+            exhaustInterleaved( iter1, actual1, iter2, actual2 );
-            {
-                if ( rnd.nextBoolean() )
-                {
-                    actual1.add( iter1.next() );
-                }
-                else
-                {
-                    actual2.add( iter2.next() );
-                }
-            }
-
-            // Empty the rest
-            while ( iter1.hasNext() )
-            {
-                actual1.add( iter1.next() );
-            }
-            while ( iter2.hasNext() )
-            {
-                actual2.add( iter2.next() );
-            }
 
             // then
             indexCoordinator.assertExactResult( actual1 );
@@ -382,27 +343,7 @@ public void multipleIteratorsNestedInterleavedRange() throws Exception
             List<Long> actual2 = new ArrayList<>();
 
             // Interleave
-            while ( iter1.hasNext() && iter2.hasNext() )
+            exhaustInterleaved( iter1, actual1, iter2, actual2 );
-            {
-                if ( rnd.nextBoolean() )
-                {
-                    actual1.add( iter1.next() );
-                }
-                else
-                {
-                    actual2.add( iter2.next() );
-                }
-            }
-
-            // Empty the rest
-            while ( iter1.hasNext() )
-            {
-                actual1.add( iter1.next() );
-            }
-            while ( iter2.hasNext() )
-            {
-                actual2.add( iter2.next() );
-            }
 
             // then
             indexCoordinator.assertRangeResult( actual1 );
@@ -411,15 +352,30 @@ public void multipleIteratorsNestedInterleavedRange() throws Exception
         }
     }
 
-    // multipleIteratorsNotNestedExists
+    private void exhaustInterleaved( PrimitiveLongIterator source1, List<Long> target1, PrimitiveLongIterator source2, List<Long> target2 )
-    // multipleIteratorsNotNestedExact
+    {
-    // multipleIteratorsNotNestedRange
+        while ( source1.hasNext() && source2.hasNext() )
-    // multipleIteratorsNestedInnerNewExists
+        {
-    // multipleIteratorsNestedInnerNewExact
+            if ( rnd.nextBoolean() )
-    // multipleIteratorsNestedInnerNewRange
+            {
-    // multipleIteratorsNestedInterleavedExists
+                target1.add( source1.next() );
-    // multipleIteratorsNestedInterleavedExact
+            }
-    // multipleIteratorsNestedInterleavedRange
+            else
+            {
+                target2.add( source2.next() );
+            }
+        }
+
+        // Empty the rest
+        while ( source1.hasNext() )
+        {
+            target1.add( source1.next() );
+        }
+        while ( source2.hasNext() )
+        {
+            target2.add( source2.next() );
+        }
+    }
 
     private static class StringCompositeIndexCoordinator extends IndexCoordinator
     {
@@ -807,9 +763,7 @@ void assertExistsResult( List<Long> actual )
 
         void assertSameContent( List<Long> actual, List<Long> expected )
         {
-            actual.sort( Long::compareTo );
+            assertThat( actual, is( containsInAnyOrder( expected.toArray() ) ) );
-            expected.sort( Long::compareTo );
-            assertThat( actual, is( expected ) );
         }
 
         abstract void assertExactResult( List<Long> result );