Merge Randoms and RandomValues

`Randoms` is removed and all its functionality is moved over to `RandomValues`. This includes the ability for `RandomValues` to be accessed directly on `RandomRule`. In order to accomodate this `RandomRule` has moved out of `commons` and into `neo4j-random-values`.
neo4j · May 11, 2018 · 28feea7 · 28feea7
1 parent ed656b5
commit 28feea7
Show file tree

Hide file tree

Showing 38 changed files with 276 additions and 1,170 deletions.
diff --git a/community/common/src/test/java/org/neo4j/test/Randoms.java b/community/common/src/test/java/org/neo4j/test/Randoms.java
diff --git a/community/common/src/test/java/org/neo4j/test/rule/RandomRule.java b/community/common/src/test/java/org/neo4j/test/rule/RandomRule.java
diff --git a/community/index/pom.xml b/community/index/pom.xml
@@ -75,6 +75,12 @@ the relevant Commercial Agreement.
           <scope>test</scope>
       </dependency>
       <dependency>
+        <groupId>org.neo4j</groupId>
+        <artifactId>neo4j-random-values</artifactId>
+        <version>${project.version}</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
           <groupId>org.neo4j</groupId>
           <artifactId>neo4j-collections</artifactId>
           <version>${project.version}</version>

diff --git a/community/index/src/test/java/org/neo4j/index/internal/gbptree/LargeDynamicKeysIT.java b/community/index/src/test/java/org/neo4j/index/internal/gbptree/LargeDynamicKeysIT.java
@@ -39,7 +39,6 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.neo4j.test.Randoms.CSA_LETTERS_AND_DIGITS;
 
 public class LargeDynamicKeysIT
 {
@@ -72,7 +71,7 @@ public void shouldWriteAndReadKeysOfSizesCloseToTheLimits() throws IOException
                     String string;
                     do
                     {
-                        string = random.string( 3_000, 4_000, CSA_LETTERS_AND_DIGITS );
+                        string = random.nextAlphaNumericString( 3_000, 4_000 );
                     }
                     while ( !generatedStrings.add( string ) );
                     RawBytes key = new RawBytes();

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java b/community/kernel/src/test/java/org/neo4j/kernel/RecoveryIT.java
@@ -555,7 +555,7 @@ private void produceRandomGraphUpdates( GraphDatabaseService db, int numberOfTra
                             Node node = db.createNode( random.nextBoolean() ? array( randomLabel() ) : new Label[0] );
                             if ( random.nextBoolean() )
                             {
-                                node.setProperty( randomKey(), random.propertyValue() );
+                                node.setProperty( randomKey(), random.nextValueAsObject() );
                             }
                         }
                         else
@@ -566,7 +566,7 @@ private void produceRandomGraphUpdates( GraphDatabaseService db, int numberOfTra
                                         .createRelationshipTo( random.among( nodes ), randomRelationshipType() );
                                 if ( random.nextBoolean() )
                                 {
-                                    relationship.setProperty( randomKey(), random.propertyValue() );
+                                    relationship.setProperty( randomKey(), random.nextValueAsObject() );
                                 }
                             }
                         }
@@ -583,12 +583,12 @@ else if ( operation < 0.5 )
                         }
                         else if ( operation < 0.75 )
                         {   // set node property
-                            random.among( nodes, node -> node.setProperty( randomKey(), random.propertyValue() ) );
+                            random.among( nodes, node -> node.setProperty( randomKey(), random.nextValueAsObject() ) );
                         }
                         else
                         {   // set relationship property
                             onRandomRelationship( nodes,
-                                    relationship -> relationship.setProperty( randomKey(), random.propertyValue() ) );
+                                    relationship -> relationship.setProperty( randomKey(), random.nextValueAsObject() ) );
                         }
                     }
                     else
@@ -712,7 +712,7 @@ else if ( operation < 0.3 )
                         {
                             if ( random.nextBoolean() )
                             {
-                                node.setProperty( key, random.propertyValue() );
+                                node.setProperty( key, random.nextValueAsObject() );
                             }
                         }
                         nodes.add( node );
@@ -727,7 +727,7 @@ else if ( operation < 0.6 )
                     }
                     else if ( operation < 0.85 )
                     {   // Set property
-                        random.among( nodes, node -> node.setProperty( random.among( keys ), random.propertyValue() ) );
+                        random.among( nodes, node -> node.setProperty( random.among( keys ), random.nextValueAsObject() ) );
                     }
                     else
                     {   // Remove property

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/event/TransactionEventsIT.java
@@ -579,7 +579,7 @@ String randomPropertyKey()
 
         Object randomPropertyValue()
         {
-            return random.propertyValue();
+            return random.nextValueAsObject();
         }
 
         int nodeCount()

diff --git a/...unity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java b/...unity/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/DurationLayoutTestUtil.java
@@ -28,7 +28,6 @@
 import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor;
-import org.neo4j.test.Randoms;
 import org.neo4j.values.storable.DurationValue;
 import org.neo4j.values.storable.RandomValues;
 import org.neo4j.values.storable.Value;
@@ -48,15 +47,6 @@ public class DurationLayoutTestUtil extends LayoutTestUtil<DurationSchemaKey, Na
             DurationValue.duration( 0, 0, 0, Long.MAX_VALUE),
     };
 
-    public static DurationValue randomDuration( Randoms random )
-    {
-        // not using random.randomDuration, since it cannot mix durations greater and smaller than 1 day
-        return DurationValue.duration( random.nextLong( -999_999_999L * 12, 999_999_999L * 12),
-                random.nextLong( -999_999_999L * 12 * 28, 999_999_999L * 12 * 28),
-                random.nextLong(),
-                random.nextLong() );
-    }
-
     DurationLayoutTestUtil( SchemaIndexDescriptor schemaIndexDescriptor )
     {
         super( schemaIndexDescriptor );

diff --git a/...c/test/java/org/neo4j/kernel/impl/index/schema/FilteringNativeHitIndexProgressorTest.java b/...c/test/java/org/neo4j/kernel/impl/index/schema/FilteringNativeHitIndexProgressorTest.java
@@ -53,7 +53,7 @@ public void shouldFilterResults()
         for ( int i = 0; i < 100; i++ )
         {
             // duplicates are fine
-            keys.add( random.string() );
+            keys.add( random.nextString() );
         }
 
         RawCursor<Hit<StringSchemaKey,NativeSchemaValue>,IOException> cursor = new ResultCursor( keys.iterator() );