Merge branch 1.6 into 1.7

lutovich · lutovich · commit f8f5b57808f8 · 2018-09-27T12:16:11.000+02:00
diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/SummaryIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/SummaryIT.java
@@ -38,6 +38,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -88,8 +89,8 @@ void shouldContainTimeInformation()
         ServerVersion serverVersion = ServerVersion.version( summary.server().version() );
         if ( STATEMENT_RESULT_TIMINGS.availableIn( serverVersion ) )
         {
-            assertThat( summary.resultAvailableAfter( TimeUnit.MILLISECONDS ), greaterThan( 0L ) );
-            assertThat( summary.resultConsumedAfter( TimeUnit.MILLISECONDS ), greaterThan( 0L ) );
+            assertThat( summary.resultAvailableAfter( TimeUnit.MILLISECONDS ), greaterThanOrEqualTo( 0L ) );
+            assertThat( summary.resultConsumedAfter( TimeUnit.MILLISECONDS ), greaterThanOrEqualTo( 0L ) );
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`import static org.hamcrest.Matchers.containsString;`
`39`	`39`	`import static org.hamcrest.Matchers.equalTo;`
`40`	`40`	`import static org.hamcrest.Matchers.greaterThan;`
	`41`	`+import static org.hamcrest.Matchers.greaterThanOrEqualTo;`
`41`	`42`	`import static org.hamcrest.Matchers.notNullValue;`
`42`	`43`	`import static org.hamcrest.junit.MatcherAssert.assertThat;`
`43`	`44`	`import static org.junit.jupiter.api.Assertions.assertEquals;`
`@@ -88,8 +89,8 @@ void shouldContainTimeInformation()`
`88`	`89`	`ServerVersion serverVersion = ServerVersion.version( summary.server().version() );`
`89`	`90`	`if ( STATEMENT_RESULT_TIMINGS.availableIn( serverVersion ) )`
`90`	`91`	`{`
`91`		`- assertThat( summary.resultAvailableAfter( TimeUnit.MILLISECONDS ), greaterThan( 0L ) );`
`92`		`- assertThat( summary.resultConsumedAfter( TimeUnit.MILLISECONDS ), greaterThan( 0L ) );`
	`92`	`+ assertThat( summary.resultAvailableAfter( TimeUnit.MILLISECONDS ), greaterThanOrEqualTo( 0L ) );`
	`93`	`+ assertThat( summary.resultConsumedAfter( TimeUnit.MILLISECONDS ), greaterThanOrEqualTo( 0L ) );`
`93`	`94`	`}`
`94`	`95`	`else`
`95`	`96`	`{`