This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 33e24436d64 [fix](regression) mow cases should use assertEquals not
assertTrue (#28338)
33e24436d64 is described below
commit 33e24436d64ea28eca5dff13117b83eb0001ed71
Author: meiyi <myime...@gmail.com>
AuthorDate: Wed Dec 13 22:14:32 2023 +0800
[fix](regression) mow cases should use assertEquals not assertTrue (#28338)
---
.../unique_with_mow/test_pk_uk_case.groovy | 11 ++++-------
.../unique_with_mow_p0/cluster_key/test_pk_uk_case.groovy | 11 ++++-------
.../suites/unique_with_mow_p0/test_pk_uk_case.groovy | 13 +++++--------
.../suites/unique_with_mow_p2/test_pk_uk_case.groovy | 13 +++++--------
.../unique_with_mow_p2/test_pk_uk_case_cluster.groovy | 13 +++++--------
5 files changed, 23 insertions(+), 38 deletions(-)
diff --git
a/regression-test/suites/inverted_index_p0/unique_with_mow/test_pk_uk_case.groovy
b/regression-test/suites/inverted_index_p0/unique_with_mow/test_pk_uk_case.groovy
index 917057ea508..956095fe089 100644
---
a/regression-test/suites/inverted_index_p0/unique_with_mow/test_pk_uk_case.groovy
+++
b/regression-test/suites/inverted_index_p0/unique_with_mow/test_pk_uk_case.groovy
@@ -197,10 +197,7 @@ suite("test_pk_uk_case", "inverted_index") {
def result0 = sql """ SELECT count(*) FROM ${tableNamePk}; """
def result1 = sql """ SELECT count(*) FROM ${tableNameUk}; """
logger.info("result:" + result0[0][0] + "|" + result1[0][0])
- assertTrue(result0[0]==result1[0])
- if (result0[0][0]!=result1[0][0]) {
- logger.info("result:" + result0[0][0] + "|" + result1[0][0])
- }
+ assertEquals(result0[0], result1[0])
result0 = sql """ SELECT
l_returnflag,
@@ -242,11 +239,11 @@ suite("test_pk_uk_case", "inverted_index") {
l_returnflag,
l_linestatus
"""
- assertTrue(result0.size()==result1.size())
+ assertEquals(result0.size(), result1.size())
for (int i = 0; i < result0.size(); ++i) {
- for (j = 0; j < result0[0].size(); j++) {
+ for (int j = 0; j < result0[0].size(); j++) {
logger.info("result: " + result0[i][j] + "|" + result1[i][j])
- assertTrue(result0[i][j]==result1[i][j])
+ assertEquals(result0[i][j], result1[i][j])
}
}
diff --git
a/regression-test/suites/unique_with_mow_p0/cluster_key/test_pk_uk_case.groovy
b/regression-test/suites/unique_with_mow_p0/cluster_key/test_pk_uk_case.groovy
index 337bf3c1a77..018b134a056 100644
---
a/regression-test/suites/unique_with_mow_p0/cluster_key/test_pk_uk_case.groovy
+++
b/regression-test/suites/unique_with_mow_p0/cluster_key/test_pk_uk_case.groovy
@@ -193,10 +193,7 @@ suite("test_pk_uk_case") {
def result0 = sql """ SELECT count(*) FROM ${tableNamePk}; """
def result1 = sql """ SELECT count(*) FROM ${tableNameUk}; """
logger.info("result:" + result0[0][0] + "|" + result1[0][0])
- assertTrue(result0[0]==result1[0])
- if (result0[0][0]!=result1[0][0]) {
- logger.info("result:" + result0[0][0] + "|" + result1[0][0])
- }
+ assertEquals(result0[0], result1[0])
result0 = sql """ SELECT
l_returnflag,
@@ -238,11 +235,11 @@ suite("test_pk_uk_case") {
l_returnflag,
l_linestatus
"""
- assertTrue(result0.size()==result1.size())
+ assertEquals(result0.size(), result1.size())
for (int i = 0; i < result0.size(); ++i) {
- for (j = 0; j < result0[0].size(); j++) {
+ for (int j = 0; j < result0[0].size(); j++) {
logger.info("result: " + result0[i][j] + "|" + result1[i][j])
- assertTrue(result0[i][j]==result1[i][j])
+ assertEquals(result0[i][j], result1[i][j])
}
}
diff --git a/regression-test/suites/unique_with_mow_p0/test_pk_uk_case.groovy
b/regression-test/suites/unique_with_mow_p0/test_pk_uk_case.groovy
index 7b051c5de82..49abd0e6036 100644
--- a/regression-test/suites/unique_with_mow_p0/test_pk_uk_case.groovy
+++ b/regression-test/suites/unique_with_mow_p0/test_pk_uk_case.groovy
@@ -190,10 +190,7 @@ suite("test_pk_uk_case") {
def result0 = sql """ SELECT count(*) FROM ${tableNamePk}; """
def result1 = sql """ SELECT count(*) FROM ${tableNameUk}; """
logger.info("result:" + result0[0][0] + "|" + result1[0][0])
- assertTrue(result0[0]==result1[0])
- if (result0[0][0]!=result1[0][0]) {
- logger.info("result:" + result0[0][0] + "|" + result1[0][0])
- }
+ assertEquals(result0[0], result1[0])
result0 = sql """ SELECT
l_returnflag,
@@ -234,12 +231,12 @@ suite("test_pk_uk_case") {
ORDER BY
l_returnflag,
l_linestatus
- """
- assertTrue(result0.size()==result1.size())
+ """
+ assertEquals(result0.size(), result1.size())
for (int i = 0; i < result0.size(); ++i) {
- for (j = 0; j < result0[0].size(); j++) {
+ for (int j = 0; j < result0[0].size(); j++) {
logger.info("result: " + result0[i][j] + "|" + result1[i][j])
- assertTrue(result0[i][j]==result1[i][j])
+ assertEquals(result0[i][j], result1[i][j])
}
}
diff --git a/regression-test/suites/unique_with_mow_p2/test_pk_uk_case.groovy
b/regression-test/suites/unique_with_mow_p2/test_pk_uk_case.groovy
index 5e376f608d6..7fd218eb1ca 100644
--- a/regression-test/suites/unique_with_mow_p2/test_pk_uk_case.groovy
+++ b/regression-test/suites/unique_with_mow_p2/test_pk_uk_case.groovy
@@ -190,10 +190,7 @@ suite("test_pk_uk_case") {
def result0 = sql """ SELECT count(*) FROM ${tableNamePk}; """
def result1 = sql """ SELECT count(*) FROM ${tableNameUk}; """
logger.info("result:" + result0[0][0] + "|" + result1[0][0])
- assertTrue(result0[0]==result1[0])
- if (result0[0][0]!=result1[0][0]) {
- logger.info("result:" + result0[0][0] + "|" + result1[0][0])
- }
+ assertEquals(result0[0], result1[0])
result0 = sql """ SELECT
l_returnflag,
@@ -234,12 +231,12 @@ suite("test_pk_uk_case") {
ORDER BY
l_returnflag,
l_linestatus
- """
- assertTrue(result0.size()==result1.size())
+ """
+ assertEquals(result0.size(), result1.size())
for (int i = 0; i < result0.size(); ++i) {
- for (j = 0; j < result0[0].size(); j++) {
+ for (int j = 0; j < result0[0].size(); j++) {
logger.info("result: " + result0[i][j] + "|" + result1[i][j])
- assertTrue(result0[i][j]==result1[i][j])
+ assertEquals(result0[i][j], result1[i][j])
}
}
diff --git
a/regression-test/suites/unique_with_mow_p2/test_pk_uk_case_cluster.groovy
b/regression-test/suites/unique_with_mow_p2/test_pk_uk_case_cluster.groovy
index ec124132760..d8fe10ffb4c 100644
--- a/regression-test/suites/unique_with_mow_p2/test_pk_uk_case_cluster.groovy
+++ b/regression-test/suites/unique_with_mow_p2/test_pk_uk_case_cluster.groovy
@@ -191,10 +191,7 @@ suite("test_pk_uk_case_cluster") {
def result0 = sql """ SELECT count(*) FROM ${tableNamePk}; """
def result1 = sql """ SELECT count(*) FROM ${tableNameUk}; """
logger.info("result:" + result0[0][0] + "|" + result1[0][0])
- assertTrue(result0[0]==result1[0])
- if (result0[0][0]!=result1[0][0]) {
- logger.info("result:" + result0[0][0] + "|" + result1[0][0])
- }
+ assertEquals(result0[0], result1[0])
result0 = sql """ SELECT
l_returnflag,
@@ -235,12 +232,12 @@ suite("test_pk_uk_case_cluster") {
ORDER BY
l_returnflag,
l_linestatus
- """
- assertTrue(result0.size()==result1.size())
+ """
+ assertEquals(result0.size(), result1.size())
for (int i = 0; i < result0.size(); ++i) {
- for (j = 0; j < result0[0].size(); j++) {
+ for (int j = 0; j < result0[0].size(); j++) {
logger.info("result: " + result0[i][j] + "|" + result1[i][j])
- assertTrue(result0[i][j]==result1[i][j])
+ assertEquals(result0[i][j], result1[i][j])
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
