This is an automated email from the ASF dual-hosted git repository.
jimin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new ca86742b52 test: Deflake PK value comparison in multiple Insert
Executor tests (#7808)
ca86742b52 is described below
commit ca86742b52e9bd05fb6434aa8e68a4d79758636e
Author: Xiaoyang Cai <[email protected]>
AuthorDate: Tue Nov 25 20:19:46 2025 -0600
test: Deflake PK value comparison in multiple Insert Executor tests (#7808)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
.../exec/KingbaseInsertExecutorTest.java | 25 +++++++---------------
.../exec/OceanBaseInsertExecutorTest.java | 25 +++++++---------------
.../datasource/exec/OracleInsertExecutorTest.java | 25 +++++++---------------
.../datasource/exec/OscarInsertExecutorTest.java | 25 +++++++---------------
.../exec/PostgresqlInsertExecutorTest.java | 25 +++++++---------------
7 files changed, 42 insertions(+), 85 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 88b67830e8..c2bdc6ead3 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -121,6 +121,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7804](https://github.com/apache/incubator-seata/pull/7804)] fix
testXARollbackWithResourceLock() to ensure ci runs normally
- [[#7800](https://github.com/apache/incubator-seata/pull/7800)] fix
non-deterministic in StringUtilsTest#testToStringAndCycleDependency
- [[#7802](https://github.com/apache/incubator-seata/pull/7802)] Fix
non-deterministic in `ConnectionContextProxyTest`.
+- [[#7808](https://github.com/apache/incubator-seata/pull/7808)] Deflake
multiple Insert Executor tests by fixing order-dependent primary key (PK) value
comparison
### refactor:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 9bbdf69f3a..18b8107681 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -120,6 +120,7 @@
- [[#7804](https://github.com/apache/incubator-seata/pull/7804)] 修复
testXARollbackWithResourceLock() 以确保 CI 正常运行
- [[#7800](https://github.com/apache/incubator-seata/pull/7800)] 修复
`StringUtilsTest.testToStringAndCycleDependency` 因反射字段顺序不稳定导致的测试用例间歇性失败问题
- [[#7802](https://github.com/apache/incubator-seata/pull/7802)] 修复
`ConnectionContextProxyTest` 中锁键顺序不稳定导致的测试用例间歇性失败问题。
+- [[#7808](https://github.com/apache/incubator-seata/pull/7808)] 修复多个 Insert
Executor 单测中因主键值比较顺序导致的间歇性失败问题
### refactor:
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/KingbaseInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/KingbaseInsertExecutorTest.java
index 455e5b7e7d..56891e7bd8 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/KingbaseInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/KingbaseInsertExecutorTest.java
@@ -222,8 +222,7 @@ public class KingbaseInsertExecutorTest {
List<String> columns = new ArrayList<>();
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(true);
- Assertions.assertIterableEquals(
- mockPkValuesFromColumn.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockPkValuesFromColumn,
insertExecutor.getPkValues());
// situation2: insert columns contain the pk column
columns = new ArrayList<>();
@@ -231,17 +230,15 @@ public class KingbaseInsertExecutorTest {
columns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- mockPkValuesFromColumn.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockPkValuesFromColumn,
insertExecutor.getPkValues());
// situation3: insert columns are not empty and do not contain the pk
column
columns = new ArrayList<>();
columns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- Collections.singletonMap(ID_COLUMN,
mockPkValuesAutoGenerated).entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(
+ Collections.singletonMap(ID_COLUMN,
mockPkValuesAutoGenerated), insertExecutor.getPkValues());
}
@Test
@@ -269,9 +266,7 @@ public class KingbaseInsertExecutorTest {
List<String> insertColumns = new ArrayList<>();
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(insertColumns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(true);
- Assertions.assertIterableEquals(
- mockAllPkValuesFromColumn.entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockAllPkValuesFromColumn,
insertExecutor.getPkValues());
// situation2: insert columns contain all pk columns
insertColumns = new ArrayList<>();
@@ -280,9 +275,7 @@ public class KingbaseInsertExecutorTest {
insertColumns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(insertColumns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- mockAllPkValuesFromColumn.entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockAllPkValuesFromColumn,
insertExecutor.getPkValues());
// situation3: insert columns contain partial pk columns
insertColumns = new ArrayList<>();
@@ -297,8 +290,7 @@ public class KingbaseInsertExecutorTest {
Map<String, List<Object>> expectPkValues = new
HashMap<>(mockPkValuesFromColumn_ID);
expectPkValues.put(USER_ID_COLUMN, mockPkValuesAutoGenerated_USER_ID);
- Assertions.assertIterableEquals(
- expectPkValues.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(expectPkValues, insertExecutor.getPkValues());
// situation4: insert columns are not empty and do not contain the pk
column
insertColumns = new ArrayList<>();
@@ -311,8 +303,7 @@ public class KingbaseInsertExecutorTest {
expectPkValues = new HashMap<>();
expectPkValues.put(ID_COLUMN, mockPkValuesAutoGenerated_ID);
expectPkValues.put(USER_ID_COLUMN, mockPkValuesAutoGenerated_USER_ID);
- Assertions.assertIterableEquals(
- expectPkValues.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(expectPkValues, insertExecutor.getPkValues());
}
@Test
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OceanBaseInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OceanBaseInsertExecutorTest.java
index a9c811a807..7cc9134829 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OceanBaseInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OceanBaseInsertExecutorTest.java
@@ -222,8 +222,7 @@ public class OceanBaseInsertExecutorTest {
List<String> columns = new ArrayList<>();
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(true);
- Assertions.assertIterableEquals(
- mockPkValuesFromColumn.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockPkValuesFromColumn,
insertExecutor.getPkValues());
// situation2: insert columns contain the pk column
columns = new ArrayList<>();
@@ -231,17 +230,15 @@ public class OceanBaseInsertExecutorTest {
columns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- mockPkValuesFromColumn.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockPkValuesFromColumn,
insertExecutor.getPkValues());
// situation3: insert columns are not empty and do not contain the pk
column
columns = new ArrayList<>();
columns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- Collections.singletonMap(ID_COLUMN,
mockPkValuesAutoGenerated).entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(
+ Collections.singletonMap(ID_COLUMN,
mockPkValuesAutoGenerated), insertExecutor.getPkValues());
}
@Test
@@ -269,9 +266,7 @@ public class OceanBaseInsertExecutorTest {
List<String> insertColumns = new ArrayList<>();
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(insertColumns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(true);
- Assertions.assertIterableEquals(
- mockAllPkValuesFromColumn.entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockAllPkValuesFromColumn,
insertExecutor.getPkValues());
// situation2: insert columns contain all pk columns
insertColumns = new ArrayList<>();
@@ -280,9 +275,7 @@ public class OceanBaseInsertExecutorTest {
insertColumns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(insertColumns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- mockAllPkValuesFromColumn.entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockAllPkValuesFromColumn,
insertExecutor.getPkValues());
// situation3: insert columns contain partial pk columns
insertColumns = new ArrayList<>();
@@ -297,8 +290,7 @@ public class OceanBaseInsertExecutorTest {
Map<String, List<Object>> expectPkValues = new
HashMap<>(mockPkValuesFromColumn_ID);
expectPkValues.put(USER_ID_COLUMN, mockPkValuesAutoGenerated_USER_ID);
- Assertions.assertIterableEquals(
- expectPkValues.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(expectPkValues, insertExecutor.getPkValues());
// situation4: insert columns are not empty and do not contain the pk
column
insertColumns = new ArrayList<>();
@@ -311,8 +303,7 @@ public class OceanBaseInsertExecutorTest {
expectPkValues = new HashMap<>();
expectPkValues.put(ID_COLUMN, mockPkValuesAutoGenerated_ID);
expectPkValues.put(USER_ID_COLUMN, mockPkValuesAutoGenerated_USER_ID);
- Assertions.assertIterableEquals(
- expectPkValues.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(expectPkValues, insertExecutor.getPkValues());
}
@Test
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OracleInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OracleInsertExecutorTest.java
index 554ba3f966..1a06c4381e 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OracleInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OracleInsertExecutorTest.java
@@ -220,8 +220,7 @@ public class OracleInsertExecutorTest {
List<String> columns = new ArrayList<>();
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(true);
- Assertions.assertIterableEquals(
- mockPkValuesFromColumn.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockPkValuesFromColumn,
insertExecutor.getPkValues());
// situation2: insert columns contain the pk column
columns = new ArrayList<>();
@@ -229,17 +228,15 @@ public class OracleInsertExecutorTest {
columns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- mockPkValuesFromColumn.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockPkValuesFromColumn,
insertExecutor.getPkValues());
// situation3: insert columns are not empty and do not contain the pk
column
columns = new ArrayList<>();
columns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- Collections.singletonMap(ID_COLUMN,
mockPkValuesAutoGenerated).entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(
+ Collections.singletonMap(ID_COLUMN,
mockPkValuesAutoGenerated), insertExecutor.getPkValues());
}
@Test
@@ -267,9 +264,7 @@ public class OracleInsertExecutorTest {
List<String> insertColumns = new ArrayList<>();
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(insertColumns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(true);
- Assertions.assertIterableEquals(
- mockAllPkValuesFromColumn.entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockAllPkValuesFromColumn,
insertExecutor.getPkValues());
// situation2: insert columns contain all pk columns
insertColumns = new ArrayList<>();
@@ -278,9 +273,7 @@ public class OracleInsertExecutorTest {
insertColumns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(insertColumns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- mockAllPkValuesFromColumn.entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockAllPkValuesFromColumn,
insertExecutor.getPkValues());
// situation3: insert columns contain partial pk columns
insertColumns = new ArrayList<>();
@@ -295,8 +288,7 @@ public class OracleInsertExecutorTest {
Map<String, List<Object>> expectPkValues = new
HashMap<>(mockPkValuesFromColumn_ID);
expectPkValues.put(USER_ID_COLUMN, mockPkValuesAutoGenerated_USER_ID);
- Assertions.assertIterableEquals(
- expectPkValues.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(expectPkValues, insertExecutor.getPkValues());
// situation4: insert columns are not empty and do not contain the pk
column
insertColumns = new ArrayList<>();
@@ -309,8 +301,7 @@ public class OracleInsertExecutorTest {
expectPkValues = new HashMap<>();
expectPkValues.put(ID_COLUMN, mockPkValuesAutoGenerated_ID);
expectPkValues.put(USER_ID_COLUMN, mockPkValuesAutoGenerated_USER_ID);
- Assertions.assertIterableEquals(
- expectPkValues.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(expectPkValues, insertExecutor.getPkValues());
}
@Test
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OscarInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OscarInsertExecutorTest.java
index b1d82be9f4..876aabcb71 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OscarInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/OscarInsertExecutorTest.java
@@ -215,8 +215,7 @@ public class OscarInsertExecutorTest {
List<String> columns = new ArrayList<>();
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(true);
- Assertions.assertIterableEquals(
- mockPkValuesFromColumn.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockPkValuesFromColumn,
insertExecutor.getPkValues());
// situation2: insert columns contain the pk column
columns = new ArrayList<>();
@@ -224,17 +223,15 @@ public class OscarInsertExecutorTest {
columns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- mockPkValuesFromColumn.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockPkValuesFromColumn,
insertExecutor.getPkValues());
// situation3: insert columns are not empty and do not contain the pk
column
columns = new ArrayList<>();
columns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- Collections.singletonMap(ID_COLUMN,
mockPkValuesAutoGenerated).entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(
+ Collections.singletonMap(ID_COLUMN,
mockPkValuesAutoGenerated), insertExecutor.getPkValues());
}
@Test
@@ -262,9 +259,7 @@ public class OscarInsertExecutorTest {
List<String> insertColumns = new ArrayList<>();
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(insertColumns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(true);
- Assertions.assertIterableEquals(
- mockAllPkValuesFromColumn.entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockAllPkValuesFromColumn,
insertExecutor.getPkValues());
// situation2: insert columns contain all pk columns
insertColumns = new ArrayList<>();
@@ -273,9 +268,7 @@ public class OscarInsertExecutorTest {
insertColumns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(insertColumns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- mockAllPkValuesFromColumn.entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockAllPkValuesFromColumn,
insertExecutor.getPkValues());
// situation3: insert columns contain partial pk columns
insertColumns = new ArrayList<>();
@@ -290,8 +283,7 @@ public class OscarInsertExecutorTest {
Map<String, List<Object>> expectPkValues = new
HashMap<>(mockPkValuesFromColumn_ID);
expectPkValues.put(USER_ID_COLUMN, mockPkValuesAutoGenerated_USER_ID);
- Assertions.assertIterableEquals(
- expectPkValues.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(expectPkValues, insertExecutor.getPkValues());
// situation4: insert columns are not empty and do not contain the pk
column
insertColumns = new ArrayList<>();
@@ -304,8 +296,7 @@ public class OscarInsertExecutorTest {
expectPkValues = new HashMap<>();
expectPkValues.put(ID_COLUMN, mockPkValuesAutoGenerated_ID);
expectPkValues.put(USER_ID_COLUMN, mockPkValuesAutoGenerated_USER_ID);
- Assertions.assertIterableEquals(
- expectPkValues.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(expectPkValues, insertExecutor.getPkValues());
}
@Test
diff --git
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/PostgresqlInsertExecutorTest.java
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/PostgresqlInsertExecutorTest.java
index 561985e5fc..e3a6a041a1 100644
---
a/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/PostgresqlInsertExecutorTest.java
+++
b/rm-datasource/src/test/java/org/apache/seata/rm/datasource/exec/PostgresqlInsertExecutorTest.java
@@ -171,8 +171,7 @@ public class PostgresqlInsertExecutorTest {
List<String> columns = new ArrayList<>();
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(true);
- Assertions.assertIterableEquals(
- mockPkValuesFromColumn.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockPkValuesFromColumn,
insertExecutor.getPkValues());
// situation2: insert columns contain the pk column
columns = new ArrayList<>();
@@ -180,17 +179,15 @@ public class PostgresqlInsertExecutorTest {
columns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- mockPkValuesFromColumn.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockPkValuesFromColumn,
insertExecutor.getPkValues());
// situation3: insert columns are not empty and do not contain the pk
column
columns = new ArrayList<>();
columns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(columns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- Collections.singletonMap(ID_COLUMN,
mockPkValuesAutoGenerated).entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(
+ Collections.singletonMap(ID_COLUMN,
mockPkValuesAutoGenerated), insertExecutor.getPkValues());
}
@Test
@@ -218,9 +215,7 @@ public class PostgresqlInsertExecutorTest {
List<String> insertColumns = new ArrayList<>();
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(insertColumns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(true);
- Assertions.assertIterableEquals(
- mockAllPkValuesFromColumn.entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockAllPkValuesFromColumn,
insertExecutor.getPkValues());
// situation2: insert columns contain all pk columns
insertColumns = new ArrayList<>();
@@ -229,9 +224,7 @@ public class PostgresqlInsertExecutorTest {
insertColumns.add(USER_NAME_COLUMN);
when(sqlInsertRecognizer.getInsertColumns()).thenReturn(insertColumns);
when(sqlInsertRecognizer.insertColumnsIsEmpty()).thenReturn(false);
- Assertions.assertIterableEquals(
- mockAllPkValuesFromColumn.entrySet(),
- insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(mockAllPkValuesFromColumn,
insertExecutor.getPkValues());
// situation3: insert columns contain partial pk columns
insertColumns = new ArrayList<>();
@@ -246,8 +239,7 @@ public class PostgresqlInsertExecutorTest {
Map<String, List<Object>> expectPkValues = new
HashMap<>(mockPkValuesFromColumn_ID);
expectPkValues.put(USER_ID_COLUMN, mockPkValuesAutoGenerated_USER_ID);
- Assertions.assertIterableEquals(
- expectPkValues.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(expectPkValues, insertExecutor.getPkValues());
// situation4: insert columns are not empty and do not contain the pk
column
insertColumns = new ArrayList<>();
@@ -260,8 +252,7 @@ public class PostgresqlInsertExecutorTest {
expectPkValues = new HashMap<>();
expectPkValues.put(ID_COLUMN, mockPkValuesAutoGenerated_ID);
expectPkValues.put(USER_ID_COLUMN, mockPkValuesAutoGenerated_USER_ID);
- Assertions.assertIterableEquals(
- expectPkValues.entrySet(),
insertExecutor.getPkValues().entrySet());
+ Assertions.assertEquals(expectPkValues, insertExecutor.getPkValues());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
