Skip to content

Commit 2334f5a

Browse files
committed
#189 - Polishing.
Made assertions in tests more strict.
1 parent ad07318 commit 2334f5a

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Diff for: src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java

+1
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ class ExecuteSpecSupport {
343343

344344
ExecuteSpecSupport(Map<Integer, SettableValue> byIndex, Map<String, SettableValue> byName,
345345
Supplier<String> sqlSupplier, StatementFilterFunction filterFunction) {
346+
346347
this.byIndex = byIndex;
347348
this.byName = byName;
348349
this.sqlSupplier = sqlSupplier;

Diff for: src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ public void shouldApplyExecuteFunction() {
496496
.as(StepVerifier::create) //
497497
.expectNextCount(1).verifyComplete();
498498

499-
verify(statement, never()).execute();
499+
verifyNoInteractions(statement);
500500
}
501501

502502
@Test // gh-189
@@ -528,6 +528,7 @@ public void shouldApplyStatementFilterFunctions() {
528528
inOrder.verify(statement).returnGeneratedValues("foo");
529529
inOrder.verify(statement).returnGeneratedValues("bar");
530530
inOrder.verify(statement).execute();
531+
inOrder.verifyNoMoreInteractions();
531532
}
532533

533534
@Test // gh-189
@@ -555,7 +556,10 @@ public void shouldApplyStatementFilterFunctionsToTypedExecute() {
555556
.as(StepVerifier::create) //
556557
.verifyComplete();
557558

558-
verify(statement).returnGeneratedValues("foo");
559+
InOrder inOrder = inOrder(statement);
560+
inOrder.verify(statement).returnGeneratedValues("foo");
561+
inOrder.verify(statement).execute();
562+
inOrder.verifyNoMoreInteractions();
559563
}
560564

561565
@Test // gh-189
@@ -587,6 +591,7 @@ public void shouldApplySimpleStatementFilterFunctions() {
587591
inOrder.verify(statement).returnGeneratedValues("foo");
588592
inOrder.verify(statement).returnGeneratedValues("bar");
589593
inOrder.verify(statement).execute();
594+
inOrder.verifyNoMoreInteractions();
590595
}
591596

592597
static class Person {

0 commit comments

Comments
 (0)