Fix compilation after rebase.

neo4j · May 22, 2018 · 7e87d88 · 7e87d88
1 parent 851da56
commit 7e87d88
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/KernelTokenTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/KernelTokenTest.java
@@ -26,7 +26,7 @@
 import org.neo4j.internal.kernel.api.exceptions.schema.IllegalTokenNameException;
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
 import org.neo4j.kernel.impl.core.TokenHolder;
-import org.neo4j.storageengine.api.StoreReadLayer;
+import org.neo4j.storageengine.api.StorageReader;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
@@ -37,7 +37,7 @@
 
 public class KernelTokenTest
 {
-    private final StoreReadLayer storeReadLayer = mock( StoreReadLayer.class );
+    private final StorageReader storeReadLayer = mock( StorageReader.class );
     private final KernelTransactionImplementation ktx = mock( KernelTransactionImplementation.class );
     private KernelToken token = new KernelToken( storeReadLayer, ktx );
 

diff --git a/.../org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReaderLabelTest.java b/.../org/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReaderLabelTest.java
@@ -81,11 +81,11 @@ public void shouldBeAbleToCreateMultipleLabels() throws Exception
         // GIVEN
         String[] labelNames = {label1.name(), label2.name()};
         int[] labelIds = new int[labelNames.length];
-        disk.labelGetOrCreateForNames( labelNames, labelIds );
+        storageReader.labelGetOrCreateForNames( labelNames, labelIds );
 
         // WHEN
-        String firstLabelName = disk.labelGetName( labelIds[0] );
+        String firstLabelName = storageReader.labelGetName( labelIds[0] );
-        String secondLabelName = disk.labelGetName( labelIds[1] );
+        String secondLabelName = storageReader.labelGetName( labelIds[1] );
 
         // THEN
         assertEquals( labelNames[0], firstLabelName );

diff --git a/...g/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReaderPropertyTest.java b/...g/neo4j/kernel/impl/storageengine/impl/recordstorage/RecordStorageReaderPropertyTest.java
@@ -140,16 +140,16 @@ public void shouldCreatePropertyKeyIfNotExists()
     @Test
     public void shouldBeAbleToGetOrCreateMultiplePropertyKeys() throws Exception
     {
-        int idB = disk.propertyKeyGetOrCreateForName( "b" );
+        int idB = storageReader.propertyKeyGetOrCreateForName( "b" );
 
         String[] names = {"a", "b", "c"};
         int[] ids = new int[3];
         Arrays.fill( ids, TokenHolder.NO_ID );
 
-        disk.propertyKeyGetOrCreateForNames( names, ids );
+        storageReader.propertyKeyGetOrCreateForNames( names, ids );
-        assertThat( ids[0], is( disk.propertyKeyGetForName( "a" ) ) );
+        assertThat( ids[0], is( storageReader.propertyKeyGetForName( "a" ) ) );
         assertThat( ids[1], is( idB ) );
-        assertThat( ids[2], is( disk.propertyKeyGetForName( "c" ) ) );
+        assertThat( ids[2], is( storageReader.propertyKeyGetForName( "c" ) ) );
         assertThat( ids[0], greaterThanOrEqualTo( 0 ) );
         assertThat( ids[1], greaterThanOrEqualTo( 0 ) );
         assertThat( ids[2], greaterThanOrEqualTo( 0 ) );

diff --git a/...ernel/impl/storageengine/impl/recordstorage/RecordStorageReaderRelTypesAndDegreeTest.java b/...ernel/impl/storageengine/impl/recordstorage/RecordStorageReaderRelTypesAndDegreeTest.java
@@ -363,11 +363,11 @@ public void shouldBeAbleToCreateMultipleRelationshipTypes() throws Exception
         // GIVEN
         String[] typeNames = {relType1.name(), relType2.name()};
         int[] typeIds = new int[typeNames.length];
-        disk.relationshipTypeGetOrCreateForNames( typeNames, typeIds );
+        storageReader.relationshipTypeGetOrCreateForNames( typeNames, typeIds );
 
         // WHEN
-        String firstLabelName = disk.relationshipTypeGetName( typeIds[0] );
+        String firstLabelName = storageReader.relationshipTypeGetName( typeIds[0] );
-        String secondLabelName = disk.relationshipTypeGetName( typeIds[1] );
+        String secondLabelName = storageReader.relationshipTypeGetName( typeIds[1] );
 
         // THEN
         assertEquals( typeNames[0], firstLabelName );