From 6a8ab608e5fff8b100f606d160f9f4fc9a624f05 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 24 Feb 2020 15:41:51 +0100 Subject: [PATCH] #189 - Polishing. Made assertions in tests more strict. Original pull request: #308. --- .../data/r2dbc/core/DefaultDatabaseClient.java | 1 + .../data/r2dbc/core/DefaultDatabaseClientUnitTests.java | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java index f95b356..37777d8 100644 --- a/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java @@ -343,6 +343,7 @@ class DefaultDatabaseClient implements DatabaseClient, ConnectionAccessor { ExecuteSpecSupport(Map byIndex, Map byName, Supplier sqlSupplier, StatementFilterFunction filterFunction) { + this.byIndex = byIndex; this.byName = byName; this.sqlSupplier = sqlSupplier; diff --git a/src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java b/src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java index de571c9..bdfef8e 100644 --- a/src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java @@ -492,7 +492,7 @@ public class DefaultDatabaseClientUnitTests { .as(StepVerifier::create) // .expectNextCount(1).verifyComplete(); - verify(statement, never()).execute(); + verifyNoInteractions(statement); } @Test // gh-189 @@ -524,6 +524,7 @@ public class DefaultDatabaseClientUnitTests { inOrder.verify(statement).returnGeneratedValues("foo"); inOrder.verify(statement).returnGeneratedValues("bar"); inOrder.verify(statement).execute(); + inOrder.verifyNoMoreInteractions(); } @Test // gh-189 @@ -551,7 +552,10 @@ public class DefaultDatabaseClientUnitTests { .as(StepVerifier::create) // .verifyComplete(); - verify(statement).returnGeneratedValues("foo"); + InOrder inOrder = inOrder(statement); + inOrder.verify(statement).returnGeneratedValues("foo"); + inOrder.verify(statement).execute(); + inOrder.verifyNoMoreInteractions(); } @Test // gh-189 @@ -583,6 +587,7 @@ public class DefaultDatabaseClientUnitTests { inOrder.verify(statement).returnGeneratedValues("foo"); inOrder.verify(statement).returnGeneratedValues("bar"); inOrder.verify(statement).execute(); + inOrder.verifyNoMoreInteractions(); } static class Person {