Fix silly test problems.

neo4j · Apr 17, 2018 · 922d2b9 · 922d2b9
1 parent 3669bd9
commit 922d2b9
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/NodeWriteTestBase.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/NodeWriteTestBase.java
@@ -32,6 +32,7 @@
 import org.neo4j.values.storable.Values;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -268,9 +269,6 @@ public void shouldThrowWhenSettingPropertyOnDeletedNode() throws Exception
         {
             // wanted
         }
-
-        // Then
-        assertNoProperty( node, propertyKey );
     }
 
     @Test
@@ -485,14 +483,17 @@ private long createNodeWithProperty( String propertyKey, Object value )
 
     private void assertNoLabels( long nodeId )
     {
-        assertLabels( nodeId );
+        try ( org.neo4j.graphdb.Transaction ignore = graphDb.beginTx() )
+        {
+            assertThat( graphDb.getNodeById( nodeId ).getLabels(), equalTo( Iterables.empty() ) );
+        }
     }
 
-    private void assertLabels( long nodeId, String... labels )
+    private void assertLabels( long nodeId, String label )
     {
         try ( org.neo4j.graphdb.Transaction ignore = graphDb.beginTx() )
         {
-            assertThat( graphDb.getNodeById( nodeId ).getLabels(), equalTo( Iterables.asIterable( labels ) ) );
+            assertThat( graphDb.getNodeById( nodeId ).getLabels(), containsInAnyOrder( label( label ) ) );
         }
     }