Merge pull request mybatis#988 from jeffgbutler/flakey-tests

Fix a few more potentially flakey tests

Author: jeffgbutler

src/test/java/examples/simple/PersonMapperTest.java

@@ -957,6 +957,6 @@ void gh737() {
                 "where id = #{parameters.p2,jdbcType=INTEGER}";
 
         assertThat(updateStatement.getUpdateStatement()).isEqualTo(expected);
-        assertThat(updateStatement.getParameters()).containsExactly(entry("p1", 4), entry("p2", 5));
+        assertThat(updateStatement.getParameters()).containsOnly(entry("p1", 4), entry("p2", 5));
     }
 }

src/test/java/examples/type_conversion/TypeConversionTest.java

@@ -93,7 +93,7 @@ void testFunctionInSelect() {
                     .render(RenderingStrategies.MYBATIS3);
 
             Map<String, Object> row = mapper.selectOneMappedRow(selectStatement);
-            assertThat(row).containsExactly(entry("FILE_ID", 1), entry("FILE_CONTENTS", randomBlob));
+            assertThat(row).containsOnly(entry("FILE_ID", 1), entry("FILE_CONTENTS", randomBlob));
 
             selectStatement = select(fileId, toBase64(fileContents).as("checksum"))
                     .from(myfiles)

src/test/java/org/mybatis/dynamic/sql/util/FragmentCollectorTest.java

@@ -41,6 +41,6 @@ void testWhereFragmentCollectorMerge() {
         fc1.merge(fc2);
 
         assertThat(fc1.collectFragments(Collectors.joining(","))).isEqualTo(":p1,:p2");
-        assertThat(fc1.parameters()).containsExactly(entry("p1", 1), entry("p2", 2));
+        assertThat(fc1.parameters()).containsOnly(entry("p1", 1), entry("p2", 2));
     }
 }

src/test/java/org/mybatis/dynamic/sql/where/render/OptionalCriterionRenderTest.java

@@ -143,7 +143,7 @@ void testOverrideFirstConnector() {
                 .render(RenderingStrategies.SPRING_NAMED_PARAMETER);
 
         assertThat(whereClause).hasValueSatisfying(wc -> {
-            assertThat(wc.getParameters()).containsExactly(entry("p1", "fred"), entry("p2", "flintstone"));
+            assertThat(wc.getParameters()).containsOnly(entry("p1", "fred"), entry("p2", "flintstone"));
             assertThat(wc.getWhereClause()).isEqualTo("where first_name = :p1 or last_name = :p2");
         });
     }
@@ -185,7 +185,7 @@ void testWhereExistsOr() {
                 "or exists (select * from person where id = :p2)";
 
         assertThat(whereClause).hasValueSatisfying(wc -> {
-            assertThat(wc.getParameters()).containsExactly(entry("p1", 3), entry("p2", 4));
+            assertThat(wc.getParameters()).containsOnly(entry("p1", 3), entry("p2", 4));
             assertThat(wc.getWhereClause()).isEqualTo(expected);
         });
     }
@@ -217,7 +217,7 @@ void testWhereExistsOrOr() {
                 "or exists (select * from person where id = :p3))";
 
         assertThat(whereClause).hasValueSatisfying(wc -> {
-            assertThat(wc.getParameters()).containsExactly(entry("p1", 3), entry("p2", 4), entry("p3", 5));
+            assertThat(wc.getParameters()).containsOnly(entry("p1", 3), entry("p2", 4), entry("p3", 5));
             assertThat(wc.getWhereClause()).isEqualTo(expected);
         });
     }
@@ -242,7 +242,7 @@ void testWhereExistsAnd() {
                 "and exists (select * from person where id = :p2)";
 
         assertThat(whereClause).hasValueSatisfying(wc -> {
-            assertThat(wc.getParameters()).containsExactly(entry("p1", 3), entry("p2", 4));
+            assertThat(wc.getParameters()).containsOnly(entry("p1", 3), entry("p2", 4));
             assertThat(wc.getWhereClause()).isEqualTo(expected);
         });
     }
@@ -274,7 +274,7 @@ void testWhereExistsAndAnd() {
                 "and exists (select * from person where id = :p3))";
 
         assertThat(whereClause).hasValueSatisfying(wc -> {
-            assertThat(wc.getParameters()).containsExactly(entry("p1", 3), entry("p2", 4), entry("p3", 5));
+            assertThat(wc.getParameters()).containsOnly(entry("p1", 3), entry("p2", 4), entry("p3", 5));
             assertThat(wc.getWhereClause()).isEqualTo(expected);
         });
     }
@@ -315,7 +315,7 @@ void testCollapsingCriteriaGroup3() {
         String expected = "where first_name = :p1 or first_name = :p2";
 
         assertThat(whereClause).hasValueSatisfying(wc -> {
-            assertThat(wc.getParameters()).containsExactly(entry("p1", "Fred"), entry("p2", "Betty"));
+            assertThat(wc.getParameters()).containsOnly(entry("p1", "Fred"), entry("p2", "Betty"));
             assertThat(wc.getWhereClause()).isEqualTo(expected);
         });
     }

src/test/kotlin/examples/kotlin/spring/canonical/KotlinElementsTest.kt

@@ -672,6 +672,6 @@ open class KotlinElementsTest {
         assertThat(updateStatement.updateStatement).isEqualTo(
             "update Person set address_id = (address_id + :p1) where id = :p2"
         )
-        assertThat(updateStatement.parameters).containsExactly(entry("p1", 4), entry("p2", 5))
+        assertThat(updateStatement.parameters).containsOnly(entry("p1", 4), entry("p2", 5))
     }
 }