Remove different Unique and NonUnique implementations of StringLayout…

…TestUtil and NumberLayoutTestUtil

Instead when needing unique layout, wrap layout in UniqueLayoutTestUtil like we do for temporal layouts.

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexAccessorTest.java

@@ -51,11 +51,11 @@ public static Collection<Object[]> data()
         return Arrays.asList( new Object[][]{
                 {"Number",
                         numberAccessorFactory(),
-                        (LayoutTestUtilFactory) NumberNonUniqueLayoutTestUtil::new
+                        (LayoutTestUtilFactory) () -> new NumberLayoutTestUtil( descriptor )
                 },
                 {"String",
                         stringAccessorFactory(),
-                        (LayoutTestUtilFactory) StringNonUniqueLayoutTestUtil::new
+                        (LayoutTestUtilFactory) () -> new StringLayoutTestUtil( descriptor )
                 },
                 {"Date",
                         temporalAccessorFactory( ValueGroup.DATE ),

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeUniqueIndexPopulatorTest.java

@@ -26,11 +26,11 @@ public static Collection<Object[]> data()
         return Arrays.asList( new Object[][]{
                 {"Number",
                         numberPopulatorFactory(),
-                        (LayoutTestUtilFactory) NumberUniqueLayoutTestUtil::new
+                        (LayoutTestUtilFactory) () -> new UniqueLayoutTestUtil<>( new NumberLayoutTestUtil( descriptor ) )
                 },
                 {"String",
                         (PopulatorFactory) StringIndexPopulator::new,
-                        (LayoutTestUtilFactory) StringUniqueLayoutTestUtil::new
+                        (LayoutTestUtilFactory) () -> new UniqueLayoutTestUtil<>( new StringLayoutTestUtil( descriptor ) )
                 },
                 {"Date",
                         temporalPopulatorFactory( ValueGroup.DATE ),

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberFullScanNonUniqueIndexSamplerTest.java

@@ -26,6 +26,7 @@
 import org.neo4j.index.internal.gbptree.GBPTree;
 import org.neo4j.index.internal.gbptree.Writer;
 import org.neo4j.io.pagecache.IOLimiter;
+import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory;
 import org.neo4j.storageengine.api.schema.IndexSample;
 import org.neo4j.values.storable.NumberValue;
 import org.neo4j.values.storable.RandomValues;
@@ -97,6 +98,6 @@ private void buildTree( Value[] values ) throws IOException
     @Override
     protected LayoutTestUtil<NumberIndexKey,NativeIndexValue> createLayoutTestUtil()
     {
-        return new NumberNonUniqueLayoutTestUtil();
+        return new NumberLayoutTestUtil( TestIndexDescriptorFactory.forLabel( 42, 666 ) );
     }
 }

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberLayoutTestUtil.java

@@ -26,7 +26,7 @@
 import org.neo4j.values.storable.RandomValues;
 import org.neo4j.values.storable.ValueGroup;
 
-abstract class NumberLayoutTestUtil extends LayoutTestUtil<NumberIndexKey,NativeIndexValue>
+class NumberLayoutTestUtil extends LayoutTestUtil<NumberIndexKey,NativeIndexValue>
 {
     private static final Number[] ALL_EXTREME_VALUES = new Number[]
             {
@@ -55,6 +55,18 @@ abstract class NumberLayoutTestUtil extends LayoutTestUtil<NumberIndexKey,Native
         super( indexDescriptor.withId( 0 ) );
     }
 
+    @Override
+    IndexLayout<NumberIndexKey,NativeIndexValue> createLayout()
+    {
+        return new NumberLayoutNonUnique();
+    }
+
+    @Override
+    IndexEntryUpdate<IndexDescriptor>[] someUpdates()
+    {
+        return someUpdatesWithDuplicateValues();
+    }
+
     @Override
     RandomValues.Type[] supportedTypes()
     {

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NumberNonUniqueIndexPopulatorTest.java

@@ -19,6 +19,8 @@
  */
 package org.neo4j.kernel.impl.index.schema;
 
+import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory;
+
 public class NumberNonUniqueIndexPopulatorTest extends NativeNonUniqueIndexPopulatorTest<NumberIndexKey,NativeIndexValue>
 {
     @Override
@@ -30,6 +32,6 @@ NativeIndexPopulator<NumberIndexKey,NativeIndexValue> createPopulator()
     @Override
     protected LayoutTestUtil<NumberIndexKey,NativeIndexValue> createLayoutTestUtil()
     {
-        return new NumberNonUniqueLayoutTestUtil();
+        return new NumberLayoutTestUtil( TestIndexDescriptorFactory.forLabel( 42, 666 ) );
     }
 }

community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/StringNonUniqueIndexPopulatorTest.java

@@ -19,6 +19,8 @@
  */
 package org.neo4j.kernel.impl.index.schema;
 
+import org.neo4j.kernel.api.schema.index.TestIndexDescriptorFactory;
+
 public class StringNonUniqueIndexPopulatorTest extends NativeNonUniqueIndexPopulatorTest<StringIndexKey,NativeIndexValue>
 {
     @Override
@@ -30,6 +32,6 @@ NativeIndexPopulator<StringIndexKey,NativeIndexValue> createPopulator()
     @Override
     protected LayoutTestUtil<StringIndexKey,NativeIndexValue> createLayoutTestUtil()
     {
-        return new StringNonUniqueLayoutTestUtil();
+        return new StringLayoutTestUtil( TestIndexDescriptorFactory.forLabel( 42, 666 ) );
     }
 }