Merge branch 1.5 into 1.6

lutovich · lutovich · commit f050166bb6f7 · 2018-03-05T13:45:24.000+01:00
diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/SessionResetIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/SessionResetIT.java
@@ -339,10 +339,10 @@ public void shouldKillLongStreamingResult() throws Throwable
 
             fail( "Should have got an exception about streaming get killed." );
         }
-        catch ( ClientException e )
+        catch ( Neo4jException e )
         {
             endTime = System.currentTimeMillis();
-            assertThat( e.code(), equalTo( "Neo.ClientError.Procedure.ProcedureCallFailed" ) );
+            assertThat( e.getMessage(), containsString( "The transaction has been terminated" ) );
             assertThat( recordCount, greaterThan( 1 ) );
 
             assertTrue( startTime > 0 );

Original file line number	Diff line number	Diff line change
`@@ -339,10 +339,10 @@ public void shouldKillLongStreamingResult() throws Throwable`
`339`	`339`
`340`	`340`	`fail( "Should have got an exception about streaming get killed." );`
`341`	`341`	`}`
`342`		`- catch ( ClientException e )`
	`342`	`+ catch ( Neo4jException e )`
`343`	`343`	`{`
`344`	`344`	`endTime = System.currentTimeMillis();`
`345`		`- assertThat( e.code(), equalTo( "Neo.ClientError.Procedure.ProcedureCallFailed" ) );`
	`345`	`+ assertThat( e.getMessage(), containsString( "The transaction has been terminated" ) );`
`346`	`346`	`assertThat( recordCount, greaterThan( 1 ) );`
`347`	`347`
`348`	`348`	`assertTrue( startTime > 0 );`