Adds NodeValueClientFilter testing for when IndexQuery denies values

neo4j · Sep 11, 2018 · 653dca3 · 653dca3
1 parent ae33149
commit 653dca3
Showing 1 changed file with 31 additions and 7 deletions.
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueClientFilterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueClientFilterTest.java
@@ -138,18 +138,30 @@ public void shouldNotAcceptNodeWithoutMatchingProperty()
     }
 
     @Test
-    public void shouldConsultProvidedFiltersForMixOfValuesAndNoValues()
+    public void shouldConsultProvidedAcceptingFiltersForMixOfValuesAndNoValues()
     {
-        shouldConsultProvidedFilters( Function.identity() );
+        shouldConsultProvidedFilters( Function.identity(), true );
     }
 
     @Test
-    public void shouldConsultProvidedFiltersForNullValues()
+    public void shouldConsultProvidedAcceptingFiltersForNullValues()
     {
-        shouldConsultProvidedFilters( v -> null );
+        shouldConsultProvidedFilters( v -> null, true );
     }
 
-    private void shouldConsultProvidedFilters( Function<Value[],Value[]> filterValues )
+    @Test
+    public void shouldConsultProvidedDenyingFiltersForMixOfValuesAndNoValues()
+    {
+        shouldConsultProvidedFilters( Function.identity(), false );
+    }
+
+    @Test
+    public void shouldConsultProvidedDenyingFiltersForNullValues()
+    {
+        shouldConsultProvidedFilters( v -> null, false );
+    }
+
+    private void shouldConsultProvidedFilters( Function<Value[],Value[]> filterValues, boolean filterAcceptsValue )
     {
         // given
         long nodeReference = 123;
@@ -167,7 +179,8 @@ private void shouldConsultProvidedFilters( Function<Value[],Value[]> filterValue
             propertyKeyIds[i] = propertyKeyId;
             if ( random.nextBoolean() )
             {
-                filters[i] = IndexQuery.exact( propertyKeyId, actualValues[i].asObjectCopy() );
+                Object filterValue = (filterAcceptsValue ? actualValues[i] : anyOtherValueThan( actualValues[i] )).asObjectCopy();
+                filters[i] = IndexQuery.exact( propertyKeyId, filterValue );
             }
             values[i] = random.nextBoolean() ? NO_VALUE : actualValues[i];
             properties.put( propertyKeyId, actualValues[i] );
@@ -180,7 +193,18 @@ private void shouldConsultProvidedFilters( Function<Value[],Value[]> filterValue
         boolean accepted = filter.acceptNode( nodeReference, filterValues.apply( values ) );
 
         // then
-        assertTrue( accepted );
+        assertEquals( filterAcceptsValue, accepted );
+    }
+
+    private Value anyOtherValueThan( Value valueToNotReturn )
+    {
+        Value candidate;
+        do
+        {
+            candidate = random.nextValue();
+        }
+        while ( candidate.eq( valueToNotReturn ) );
+        return candidate;
     }
 
     private NodeValueClientFilter initializeFilter( IndexQuery... filters )