NodeValueIndexCursorTestBase include array/boolean value options

Also removed legacy test for in-memory index, which didn't really test in-memory index since that doesn't exist anymore.
neo4j · Sep 24, 2018 · d4a772e · d4a772e
1 parent 6d48b06
commit d4a772e
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 24 deletions.
diff --git a/...t/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorLuceneTest.java b/...t/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorLuceneTest.java
@@ -44,16 +44,4 @@ protected String providerVersion()
     {
         return "1.0";
     }
-
-    @Override
-    protected boolean indexProvidesStringValues()
-    {
-        return false;
-    }
-
-    @Override
-    protected boolean indexProvidesNumericValues()
-    {
-        return false;
-    }
 }
diff --git a/...index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative10Test.java b/...index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative10Test.java
@@ -43,12 +43,6 @@ protected String providerVersion()
         return "1.0";
     }
 
-    @Override
-    protected boolean indexProvidesStringValues()
-    {
-        return false;
-    }
-
     @Override
     protected boolean indexProvidesNumericValues()
     {

diff --git a/...wapi/NodeValueIndexCursorGenericTest.java → ...odeValueIndexCursorNativeBtree10Test.java b/...wapi/NodeValueIndexCursorGenericTest.java → ...odeValueIndexCursorNativeBtree10Test.java
@@ -21,7 +21,7 @@
 
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 
-public class NodeValueIndexCursorGenericTest extends AbstractNodeValueIndexCursorTest
+public class NodeValueIndexCursorNativeBtree10Test extends AbstractNodeValueIndexCursorTest
 {
     @Override
     public ReadTestSupport newTestSupport()
@@ -60,4 +60,16 @@ protected boolean indexProvidesAllValues()
     {
         return true;
     }
+
+    @Override
+    protected boolean indexProvidesArrayValues()
+    {
+        return true;
+    }
+
+    @Override
+    protected boolean indexProvidesBooleanValues()
+    {
+        return true;
+    }
 }
diff --git a/.../kernel-api/src/test/java/org/neo4j/internal/kernel/api/NodeValueIndexCursorTestBase.java b/.../kernel-api/src/test/java/org/neo4j/internal/kernel/api/NodeValueIndexCursorTestBase.java
@@ -153,8 +153,26 @@ public void createTestGraph( GraphDatabaseService graphDb )
     protected abstract void createCompositeIndex( GraphDatabaseService graphDb, String label, String... properties ) throws Exception;
     protected abstract String providerKey();
     protected abstract String providerVersion();
-    protected abstract boolean indexProvidesStringValues();
-    protected abstract boolean indexProvidesNumericValues();
+
+    protected boolean indexProvidesStringValues()
+    {
+        return false;
+    }
+
+    protected boolean indexProvidesNumericValues()
+    {
+        return false;
+    }
+
+    protected boolean indexProvidesArrayValues()
+    {
+        return false;
+    }
+
+    protected boolean indexProvidesBooleanValues()
+    {
+        return false;
+    }
 
     protected boolean indexProvidesTemporalValues()
     {
@@ -544,7 +562,7 @@ public void shouldPerformSpatialRangeSearch() throws KernelException
     public void shouldPerformBooleanSearch() throws KernelException
     {
         // given
-        boolean needsValues = indexProvidesAllValues();
+        boolean needsValues = indexProvidesBooleanValues();
         int label = token.nodeLabel( "Node" );
         int prop = token.propertyKey( "prop" );
         IndexReference index = schemaRead.index( label, prop );
@@ -571,7 +589,7 @@ public void shouldPerformBooleanSearch() throws KernelException
     public void shouldPerformTextArraySearch() throws KernelException
     {
         // given
-        boolean needsValues = indexProvidesAllValues();
+        boolean needsValues = indexProvidesArrayValues();
         int label = token.nodeLabel( "Node" );
         int prop = token.propertyKey( "prop" );
         IndexReference index = schemaRead.index( label, prop );
@@ -842,7 +860,7 @@ private void assertFoundNodesAndValue( NodeValueIndexCursor node,
             // Assert has value capability
             if ( IndexValueCapability.YES.equals( expectValue ) )
             {
-                assertTrue( "has value", node.hasValue() );
+                assertTrue( "Value capability said index would have value for " + expectValue + ", but didn't", node.hasValue() );
             }
 
             // Assert has correct value