Fix review comments by reshuffle filters, checking file name

start instead of contains.
neo4j · Jul 3, 2017 · a96540f · a96540f
1 parent c1e9d0c
commit a96540f
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/community/neo4j/src/test/java/org/neo4j/index/backup/IndexBackupIT.java b/community/neo4j/src/test/java/org/neo4j/index/backup/IndexBackupIT.java
@@ -20,6 +20,7 @@
 package org.neo4j.index.backup;
 
 import org.apache.commons.io.FilenameUtils;
+import org.apache.lucene.index.IndexFileNames;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -145,24 +146,18 @@ public void snapshotFilesDeletedWhenSnapshotReleased() throws IOException
     private void compareSnapshotFiles( Set<String> firstSnapshotFileNames, Set<String> secondSnapshotFileNames,
             FileSystemAbstraction fileSystem )
     {
-        Set<String> firstSnapshotIndexesSegments = firstSnapshotFileNames.stream()
-                        .filter( this::segmentsFilePredicate )
-                        .collect( Collectors.toSet() );
-        Set<String> secondSnapshotIndexesSegments = secondSnapshotFileNames.stream()
-                .filter( this::segmentsFilePredicate )
-                .collect( Collectors.toSet() );
         assertThat( format( "Should have %d modified index segment files. Snapshot segment files are: %s",
-                        NUMBER_OF_INDEXES, firstSnapshotIndexesSegments ), firstSnapshotIndexesSegments,
+                        NUMBER_OF_INDEXES, firstSnapshotFileNames ), firstSnapshotFileNames,
                 hasSize( NUMBER_OF_INDEXES ) );
-        for ( String fileName : firstSnapshotIndexesSegments )
+        for ( String fileName : firstSnapshotFileNames )
         {
             assertFalse( "Snapshot segments fileset should not have files from another snapshot set." +
-                            describeFileSets( firstSnapshotIndexesSegments, secondSnapshotIndexesSegments ),
+                            describeFileSets( firstSnapshotFileNames, secondSnapshotFileNames ),
-                    secondSnapshotIndexesSegments.contains( fileName ) );
+                    secondSnapshotFileNames.contains( fileName ) );
             String path = FilenameUtils.getFullPath( fileName );
             assertTrue( "Snapshot should contain files for index in path: " + path + "." +
-                            describeFileSets( firstSnapshotIndexesSegments, secondSnapshotIndexesSegments ),
+                            describeFileSets( firstSnapshotFileNames, secondSnapshotFileNames ),
-                    secondSnapshotIndexesSegments.stream().anyMatch( name -> name.startsWith( path ) ) );
+                    secondSnapshotFileNames.stream().anyMatch( name -> name.startsWith( path ) ) );
             assertTrue( format( "Snapshot segment file '%s' should exist.", fileName ),
                     fileSystem.fileExists( new File( fileName ) ) );
         }
@@ -199,7 +194,9 @@ private String describeFileSets( Set<String> firstFileSet, Set<String> secondFil
 
     private Set<String> getFileNames( ResourceIterator<File> files )
     {
-        return files.stream().map( File::getAbsolutePath ).collect( Collectors.toSet() );
+        return files.stream().map( File::getAbsolutePath )
+                .filter( this::segmentsFilePredicate )
+                .collect( Collectors.toSet() );
     }
 
     private void forceCheckpoint( CheckPointer checkPointer ) throws IOException
@@ -256,6 +253,6 @@ private DependencyResolver getDatabaseResolver()
 
     private boolean segmentsFilePredicate( String fileName )
     {
-        return fileName.contains( "segments_" );
+        return FilenameUtils.getName( fileName ).startsWith( IndexFileNames.SEGMENTS );
     }
 }