From 1842d42bc6122f8a08c1544e7f5499849dfad204 Mon Sep 17 00:00:00 2001 From: bee0511 Date: Mon, 29 Sep 2025 16:32:17 -0500 Subject: [PATCH 1/2] fix flaky test in DeprecatedJoinMapperTest#testFullJoinWithoutAliases --- .../kotlin/mybatis3/joins/DeprecatedJoinMapperTest.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/kotlin/examples/kotlin/mybatis3/joins/DeprecatedJoinMapperTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/joins/DeprecatedJoinMapperTest.kt index d712c46c6..afaa874b3 100644 --- a/src/test/kotlin/examples/kotlin/mybatis3/joins/DeprecatedJoinMapperTest.kt +++ b/src/test/kotlin/examples/kotlin/mybatis3/joins/DeprecatedJoinMapperTest.kt @@ -276,17 +276,17 @@ class DeprecatedJoinMapperTest { assertThat(rows).hasSize(6) - assertThat(rows[0]).containsExactly( + assertThat(rows[0]).containsOnly( entry("DESCRIPTION", "Catcher Glove"), entry("ITEM_ID", 55) ) - assertThat(rows[3]).containsExactly( + assertThat(rows[3]).containsOnly( entry("ORDER_ID", 2), entry("QUANTITY", 6) ) - assertThat(rows[5]).containsExactly( + assertThat(rows[5]).containsOnly( entry("ORDER_ID", 2), entry("QUANTITY", 1), entry("DESCRIPTION", "Outfield Glove"), From b5e30472147db6fea01e02c08fcac58faf13f5d3 Mon Sep 17 00:00:00 2001 From: bee0511 Date: Tue, 30 Sep 2025 00:32:32 -0500 Subject: [PATCH 2/2] fix other flaky tests within DeprecatedJoinMapperTest --- .../joins/DeprecatedJoinMapperTest.kt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/test/kotlin/examples/kotlin/mybatis3/joins/DeprecatedJoinMapperTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/joins/DeprecatedJoinMapperTest.kt index afaa874b3..4586f72d3 100644 --- a/src/test/kotlin/examples/kotlin/mybatis3/joins/DeprecatedJoinMapperTest.kt +++ b/src/test/kotlin/examples/kotlin/mybatis3/joins/DeprecatedJoinMapperTest.kt @@ -324,12 +324,12 @@ class DeprecatedJoinMapperTest { assertThat(rows).hasSize(5) - assertThat(rows[2]).containsExactly( + assertThat(rows[2]).containsOnly( entry("ORDER_ID", 2), entry("QUANTITY", 6) ) - assertThat(rows[4]).containsExactly( + assertThat(rows[4]).containsOnly( entry("ORDER_ID", 2), entry("QUANTITY", 1), entry("DESCRIPTION", "Outfield Glove"), @@ -375,12 +375,12 @@ class DeprecatedJoinMapperTest { assertThat(rows).hasSize(5) - assertThat(rows[2]).containsExactly( + assertThat(rows[2]).containsOnly( entry("ORDER_ID", 2), entry("QUANTITY", 6) ) - assertThat(rows[4]).containsExactly( + assertThat(rows[4]).containsOnly( entry("ORDER_ID", 2), entry("QUANTITY", 1), entry("DESCRIPTION", "Outfield Glove"), @@ -418,12 +418,12 @@ class DeprecatedJoinMapperTest { assertThat(rows).hasSize(5) - assertThat(rows[2]).containsExactly( + assertThat(rows[2]).containsOnly( entry("ORDER_ID", 2), entry("QUANTITY", 6) ) - assertThat(rows[4]).containsExactly( + assertThat(rows[4]).containsOnly( entry("ORDER_ID", 2), entry("QUANTITY", 1), entry("DESCRIPTION", "Outfield Glove"), @@ -461,12 +461,12 @@ class DeprecatedJoinMapperTest { assertThat(rows).hasSize(5) - assertThat(rows[0]).containsExactly( + assertThat(rows[0]).containsOnly( entry("DESCRIPTION", "Catcher Glove"), entry("ITEM_ID", 55) ) - assertThat(rows[4]).containsExactly( + assertThat(rows[4]).containsOnly( entry("ORDER_ID", 2), entry("QUANTITY", 1), entry("DESCRIPTION", "Outfield Glove"), @@ -512,12 +512,12 @@ class DeprecatedJoinMapperTest { assertThat(rows).hasSize(5) - assertThat(rows[0]).containsExactly( + assertThat(rows[0]).containsOnly( entry("DESCRIPTION", "Catcher Glove"), entry("ITEM_ID", 55) ) - assertThat(rows[4]).containsExactly( + assertThat(rows[4]).containsOnly( entry("ORDER_ID", 2), entry("QUANTITY", 1), entry("DESCRIPTION", "Outfield Glove"), @@ -555,12 +555,12 @@ class DeprecatedJoinMapperTest { assertThat(rows).hasSize(5) - assertThat(rows[0]).containsExactly( + assertThat(rows[0]).containsOnly( entry("DESCRIPTION", "Catcher Glove"), entry("ITEM_ID", 55) ) - assertThat(rows[4]).containsExactly( + assertThat(rows[4]).containsOnly( entry("ORDER_ID", 2), entry("QUANTITY", 1), entry("DESCRIPTION", "Outfield Glove"),