Merge 3.0 into 3.1

neo4j · Aug 22, 2016 · 2af5eb3 · 2af5eb3
2 parents 9abbceb + 19cb517
commit 2af5eb3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java
@@ -91,6 +91,7 @@
 import org.neo4j.test.DoubleLatch;
 
 import static java.lang.System.currentTimeMillis;
+import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -867,7 +868,7 @@ public void shouldStoreIndexFailureWhenFailingToCreateOnlineAccessorAfterPopulat
         // then
         assertEquals( FAILED, indexing.getIndexProxy( 1 ).getState() );
         assertEquals( asList( true, false ), closeArgs.getAllValues() );
-        assertThat( storedFailure(), containsString( "java.io.IOException: Expected failure\n\tat " ) );
+        assertThat( storedFailure(), containsString( format( "java.io.IOException: Expected failure%n\tat " ) ) );
         logProvider.assertAtLeastOnce( inLog( IndexPopulationJob.class ).error( equalTo(
                 "Failed to populate index: [:TheLabel(propertyKey) [provider: {key=quantum-dex, version=25.0}]]" ),
                 causedBy( exception ) ) );
@@ -902,7 +903,7 @@ public void shouldStoreIndexFailureWhenFailingToCreateOnlineAccessorAfterRecover
         // then
         assertEquals( FAILED, indexing.getIndexProxy( 1 ).getState() );
         assertEquals( asList( true, false ), closeArgs.getAllValues() );
-        assertThat( storedFailure(), containsString( "java.io.IOException: Expected failure\n\tat " ) );
+        assertThat( storedFailure(), containsString( format( "java.io.IOException: Expected failure%n\tat " ) ) );
         logProvider.assertAtLeastOnce( inLog( IndexPopulationJob.class ).error( equalTo(
                 "Failed to populate index: [:TheLabel(propertyKey) [provider: {key=quantum-dex, version=25.0}]]" ),
                 causedBy( exception ) ) );