Test fixes

neo4j · Nov 27, 2017 · 03e88c0 · 03e88c0
1 parent 105f2de
commit 03e88c0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/...va/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigratorTest.java b/...va/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigratorTest.java
@@ -47,6 +47,7 @@
 import org.neo4j.kernel.impl.store.MetaDataStore;
 import org.neo4j.kernel.impl.store.format.standard.StandardV2_3;
 import org.neo4j.kernel.impl.store.format.standard.StandardV3_2;
+import org.neo4j.kernel.impl.store.format.standard.StandardV3_4;
 import org.neo4j.kernel.impl.util.monitoring.ProgressReporter;
 import org.neo4j.kernel.lifecycle.Lifespan;
 import org.neo4j.kernel.monitoring.Monitors;
@@ -155,8 +156,8 @@ public void moveCreatedNativeLabelIndexBackToStoreDirectory() throws IOException
     @Test
     public void populateNativeLabelScanIndexDuringMigration() throws IOException
     {
-        prepare32DatabaseWithNodes();
+        prepare34DatabaseWithNodes();
-        indexMigrator.migrate( storeDir, migrationDir, progressReporter, StandardV3_2.STORE_VERSION, StandardV3_2.STORE_VERSION );
+        indexMigrator.migrate( storeDir, migrationDir, progressReporter, StandardV3_4.STORE_VERSION, StandardV3_4.STORE_VERSION );
         indexMigrator.moveMigratedFiles( migrationDir, storeDir, StandardV2_3.STORE_VERSION, StandardV3_2.STORE_VERSION );
 
         try ( Lifespan lifespan = new Lifespan() )
@@ -178,8 +179,8 @@ public void populateNativeLabelScanIndexDuringMigration() throws IOException
     @Test
     public void reportProgressOnNativeIndexPopulation() throws IOException
     {
-        prepare32DatabaseWithNodes();
+        prepare34DatabaseWithNodes();
-        indexMigrator.migrate( storeDir, migrationDir, progressReporter, StandardV3_2.STORE_VERSION, StandardV3_2.STORE_VERSION );
+        indexMigrator.migrate( storeDir, migrationDir, progressReporter, StandardV3_4.STORE_VERSION, StandardV3_4.STORE_VERSION );
         indexMigrator.moveMigratedFiles( migrationDir, storeDir, StandardV2_3.STORE_VERSION, StandardV3_2.STORE_VERSION );
 
         verify( progressReporter ).start( 10 );
@@ -228,7 +229,7 @@ private ByteBuffer writeNativeIndexFile( File file, byte[] content ) throws IOEx
         return sourceBuffer;
     }
 
-    private void prepare32DatabaseWithNodes()
+    private void prepare34DatabaseWithNodes()
     {
         GraphDatabaseService embeddedDatabase = new TestGraphDatabaseFactory().newEmbeddedDatabase( storeDir );
         try

diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/HighLimit.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/store/format/highlimit/HighLimit.java
@@ -44,14 +44,14 @@
  */
 public class HighLimit extends BaseRecordFormats
 {
-    public static final String STORE_VERSION = StoreVersion.HIGH_LIMIT_V3_2_0.versionString();
+    public static final String STORE_VERSION = StoreVersion.HIGH_LIMIT_V3_4_0.versionString();
 
     public static final RecordFormats RECORD_FORMATS = new HighLimit();
     public static final String NAME = "high_limit";
 
     public HighLimit()
     {
-        super( STORE_VERSION, StoreVersion.HIGH_LIMIT_V3_2_0.introductionVersion(), 4, Capability.DENSE_NODES,
+        super( STORE_VERSION, StoreVersion.HIGH_LIMIT_V3_4_0.introductionVersion(), 5, Capability.DENSE_NODES,
                 Capability.RELATIONSHIP_TYPE_3BYTES, Capability.SCHEMA, Capability.LUCENE_5, Capability.POINT_PROPERTIES );
     }
 

diff --git a/...nel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorTest.java b/...nel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorTest.java
@@ -109,12 +109,16 @@ public void detectObsoleteCountStoresToRebuildDuringMigration() throws IOExcepti
         Set<String> expectedVersions = new TreeSet<>(
                 Arrays.stream( StoreVersion.values() ).map( StoreVersion::versionString )
                         .collect( Collectors.toSet() ) );
+
         assertTrue( storeMigrator.countStoreRebuildRequired( StoreVersion.STANDARD_V2_3.versionString() ) );
         actualVersions.add( StoreVersion.STANDARD_V2_3.versionString() );
         assertTrue( storeMigrator.countStoreRebuildRequired( StoreVersion.STANDARD_V3_0.versionString() ) );
         actualVersions.add( StoreVersion.STANDARD_V3_0.versionString() );
         assertFalse( storeMigrator.countStoreRebuildRequired( StoreVersion.STANDARD_V3_2.versionString() ) );
         actualVersions.add( StoreVersion.STANDARD_V3_2.versionString() );
+        assertFalse( storeMigrator.countStoreRebuildRequired( StoreVersion.STANDARD_V3_4.versionString() ) );
+        actualVersions.add( StoreVersion.STANDARD_V3_4.versionString() );
+
         assertTrue( storeMigrator.countStoreRebuildRequired( StoreVersion.HIGH_LIMIT_V3_0_0.versionString() ) );
         actualVersions.add( StoreVersion.HIGH_LIMIT_V3_0_0.versionString() );
         assertTrue( storeMigrator.countStoreRebuildRequired( StoreVersion.HIGH_LIMIT_V3_0_6.versionString() ) );
@@ -123,6 +127,9 @@ public void detectObsoleteCountStoresToRebuildDuringMigration() throws IOExcepti
         actualVersions.add( StoreVersion.HIGH_LIMIT_V3_1_0.versionString() );
         assertFalse( storeMigrator.countStoreRebuildRequired( StoreVersion.HIGH_LIMIT_V3_2_0.versionString() ) );
         actualVersions.add( StoreVersion.HIGH_LIMIT_V3_2_0.versionString() );
+        assertFalse( storeMigrator.countStoreRebuildRequired( StoreVersion.HIGH_LIMIT_V3_4_0.versionString() ) );
+        actualVersions.add( StoreVersion.HIGH_LIMIT_V3_4_0.versionString() );
+
         assertEquals( expectedVersions, actualVersions );
     }