Skip to content

Commit 5701226

Browse files
committed
Fix tests that match query plan
Because the returned plan has changed in 3.5. This commit makes assertions more generic.
1 parent b82135a commit 5701226

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

driver/src/test/java/org/neo4j/driver/v1/integration/SessionAsyncIT.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,9 @@ public void shouldExposeResultSummaryForExplainQuery()
339339
assertNotNull( summary.plan() );
340340
// asserting on plan is a bit fragile and can break when server side changes or with different
341341
// server versions; that is why do fuzzy assertions in this test based on string content
342-
String planAsString = summary.plan().toString();
343-
assertThat( planAsString, containsString( "CreateNode" ) );
344-
assertThat( planAsString, containsString( "Expand" ) );
345-
assertThat( planAsString, containsString( "AllNodesScan" ) );
342+
String planAsString = summary.plan().toString().toLowerCase();
343+
assertThat( planAsString, containsString( "create" ) );
344+
assertThat( planAsString, containsString( "expand" ) );
346345
assertNull( summary.profile() );
347346
assertEquals( 0, summary.notifications().size() );
348347
assertThat( summary, containsResultAvailableAfterAndResultConsumedAfter() );
@@ -367,8 +366,8 @@ public void shouldExposeResultSummaryForProfileQuery()
367366
assertNotNull( summary.profile() );
368367
// asserting on profile is a bit fragile and can break when server side changes or with different
369368
// server versions; that is why do fuzzy assertions in this test based on string content
370-
String profileAsString = summary.profile().toString();
371-
assertThat( profileAsString, containsString( "DbHits" ) );
369+
String profileAsString = summary.profile().toString().toLowerCase();
370+
assertThat( profileAsString, containsString( "hits" ) );
372371
assertEquals( 0, summary.notifications().size() );
373372
assertThat( summary, containsResultAvailableAfterAndResultConsumedAfter() );
374373
}

driver/src/test/java/org/neo4j/driver/v1/integration/TransactionAsyncIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ public void shouldExposeResultSummaryForExplainQuery()
518518
assertNotNull( summary.plan() );
519519
// asserting on plan is a bit fragile and can break when server side changes or with different
520520
// server versions; that is why do fuzzy assertions in this test based on string content
521-
assertThat( summary.plan().toString(), containsString( "AllNodesScan" ) );
521+
assertThat( summary.plan().toString().toLowerCase(), containsString( "scan" ) );
522522
assertNull( summary.profile() );
523523
assertEquals( 0, summary.notifications().size() );
524524
assertThat( summary, containsResultAvailableAfterAndResultConsumedAfter() );
@@ -548,8 +548,8 @@ public void shouldExposeResultSummaryForProfileQuery()
548548
assertNotNull( summary.profile() );
549549
// asserting on profile is a bit fragile and can break when server side changes or with different
550550
// server versions; that is why do fuzzy assertions in this test based on string content
551-
String profileAsString = summary.profile().toString();
552-
assertThat( profileAsString, containsString( "DbHits" ) );
551+
String profileAsString = summary.profile().toString().toLowerCase();
552+
assertThat( profileAsString, containsString( "hits" ) );
553553
assertEquals( 0, summary.notifications().size() );
554554
assertThat( summary, containsResultAvailableAfterAndResultConsumedAfter() );
555555
}

0 commit comments

Comments
 (0)