This is an automated email from the ASF dual-hosted git repository.
jakevin 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 650136c32e [Enhancement](fe): replace assertTrue(X.equals(X)) with
assertEquals (#15356)
650136c32e is described below
commit 650136c32e0d171e5b1ea8fcb3335732d7e55f2e
Author: PF FOUR <31887125+etc...@users.noreply.github.com>
AuthorDate: Tue Dec 27 00:37:24 2022 +0800
[Enhancement](fe): replace assertTrue(X.equals(X)) with assertEquals
(#15356)
---
.../java/org/apache/doris/alter/AlterTest.java | 8 ++---
.../java/org/apache/doris/analysis/ExprTest.java | 36 +++++++++----------
.../org/apache/doris/analysis/InsertStmtTest.java | 8 ++---
.../doris/analysis/LiteralExprCompareTest.java | 42 +++++++++++-----------
.../apache/doris/analysis/VirtualSlotRefTest.java | 2 +-
.../doris/backup/RestoreFileMappingTest.java | 6 ++--
.../java/org/apache/doris/catalog/BackendTest.java | 14 ++++----
.../doris/catalog/ColocateTableIndexTest.java | 4 +--
.../org/apache/doris/catalog/ColumnStatTest.java | 16 ++++-----
.../org/apache/doris/catalog/ColumnTypeTest.java | 6 ++--
.../org/apache/doris/catalog/CreateTableTest.java | 10 +++---
.../java/org/apache/doris/catalog/EnvTest.java | 2 +-
.../doris/catalog/MaterializedIndexTest.java | 2 +-
.../org/apache/doris/catalog/PartitionKeyTest.java | 8 ++---
.../doris/catalog/ReplicaAllocationTest.java | 6 ++--
.../java/org/apache/doris/catalog/ReplicaTest.java | 6 ++--
.../java/org/apache/doris/catalog/TableTest.java | 2 +-
.../doris/cluster/SystemInfoServiceTest.java | 2 +-
.../org/apache/doris/load/EtlJobStatusTest.java | 2 +-
.../java/org/apache/doris/load/FailMsgTest.java | 2 +-
.../java/org/apache/doris/load/LoadJobTest.java | 8 ++---
.../apache/doris/load/PartitionLoadInfoTest.java | 6 ++--
.../java/org/apache/doris/load/SourceTest.java | 16 ++++-----
.../org/apache/doris/load/TabletLoadInfoTest.java | 6 ++--
.../org/apache/doris/mysql/privilege/AuthTest.java | 2 +-
.../rules/analysis/FunctionRegistryTest.java | 2 +-
.../apache/doris/persist/CreateTableInfoTest.java | 4 +--
.../doris/persist/DropAndRecoverInfoTest.java | 16 ++++-----
.../org/apache/doris/persist/DropDbInfoTest.java | 14 ++++----
.../doris/persist/DropPartitionInfoTest.java | 16 ++++-----
.../persist/RefreshExternalTableInfoTest.java | 6 ++--
.../java/org/apache/doris/persist/StorageTest.java | 22 ++++++------
.../org/apache/doris/planner/QueryPlanTest.java | 2 +-
.../java/org/apache/doris/qe/CoordinatorTest.java | 6 ++--
.../apache/doris/load/loadv2/dpp/SparkDppTest.java | 4 +--
35 files changed, 157 insertions(+), 157 deletions(-)
diff --git a/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java
b/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java
index b5d435203e..cdcc767e9a 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/alter/AlterTest.java
@@ -1039,14 +1039,14 @@ public class AlterTest {
// external table support reorder column
db =
Env.getCurrentInternalCatalog().getDbOrMetaException("default_cluster:test");
odbcTable = db.getTableOrMetaException("odbc_table");
- Assert.assertTrue(odbcTable.getBaseSchema().stream()
+ Assert.assertEquals(odbcTable.getBaseSchema().stream()
.map(column -> column.getName())
- .reduce("", (totalName, columnName) -> totalName +
columnName).equals("k1k2k3k4k5k6"));
+ .reduce("", (totalName, columnName) -> totalName +
columnName), "k1k2k3k4k5k6");
stmt = "alter table test.odbc_table order by (k6, k5, k4, k3, k2, k1)";
alterTable(stmt, false);
- Assert.assertTrue(odbcTable.getBaseSchema().stream()
+ Assert.assertEquals(odbcTable.getBaseSchema().stream()
.map(column -> column.getName())
- .reduce("", (totalName, columnName) -> totalName +
columnName).equals("k6k5k4k3k2k1"));
+ .reduce("", (totalName, columnName) -> totalName +
columnName), "k6k5k4k3k2k1");
// external table support drop column
stmt = "alter table test.odbc_table drop column k6";
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ExprTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/ExprTest.java
index aa63a1c933..68801ea18f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ExprTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ExprTest.java
@@ -105,11 +105,11 @@ public class ExprTest {
// date
DateLiteral dateLiteral = new DateLiteral(2020, 4, 5, 12, 0, 5,
Type.DATETIME);
- Assert.assertTrue(dateLiteral.getType().equals(Type.DATETIME));
+ Assert.assertEquals(dateLiteral.getType(), Type.DATETIME);
DateLiteral castLiteral = (DateLiteral)
dateLiteral.uncheckedCastTo(Type.DATE);
Assert.assertFalse(dateLiteral == castLiteral);
- Assert.assertTrue(dateLiteral.getType().equals(Type.DATETIME));
- Assert.assertTrue(castLiteral.getType().equals(Type.DATE));
+ Assert.assertEquals(dateLiteral.getType(), Type.DATETIME);
+ Assert.assertEquals(castLiteral.getType(), Type.DATE);
Assert.assertEquals(0, castLiteral.getHour());
Assert.assertEquals(0, castLiteral.getMinute());
@@ -120,11 +120,11 @@ public class ExprTest {
Assert.assertEquals(5, dateLiteral.getSecond());
DateLiteral dateLiteral2 = new DateLiteral(2020, 4, 5, Type.DATE);
- Assert.assertTrue(dateLiteral2.getType().equals(Type.DATE));
+ Assert.assertEquals(dateLiteral2.getType(), Type.DATE);
castLiteral = (DateLiteral)
dateLiteral2.uncheckedCastTo(Type.DATETIME);
Assert.assertFalse(dateLiteral2 == castLiteral);
- Assert.assertTrue(dateLiteral2.getType().equals(Type.DATE));
- Assert.assertTrue(castLiteral.getType().equals(Type.DATETIME));
+ Assert.assertEquals(dateLiteral2.getType(), Type.DATE);
+ Assert.assertEquals(castLiteral.getType(), Type.DATETIME);
Assert.assertEquals(0, castLiteral.getHour());
Assert.assertEquals(0, castLiteral.getMinute());
@@ -132,40 +132,40 @@ public class ExprTest {
// float
FloatLiteral floatLiteral = new FloatLiteral(0.1, Type.FLOAT);
- Assert.assertTrue(floatLiteral.getType().equals(Type.FLOAT));
+ Assert.assertEquals(floatLiteral.getType(), Type.FLOAT);
FloatLiteral castFloatLiteral = (FloatLiteral)
floatLiteral.uncheckedCastTo(Type.DOUBLE);
- Assert.assertTrue(floatLiteral.getType().equals(Type.FLOAT));
- Assert.assertTrue(castFloatLiteral.getType().equals(Type.DOUBLE));
+ Assert.assertEquals(floatLiteral.getType(), Type.FLOAT);
+ Assert.assertEquals(castFloatLiteral.getType(), Type.DOUBLE);
Assert.assertFalse(floatLiteral == castFloatLiteral);
FloatLiteral castFloatLiteral2 = (FloatLiteral)
floatLiteral.uncheckedCastTo(Type.FLOAT);
Assert.assertTrue(floatLiteral == castFloatLiteral2);
// int
IntLiteral intLiteral = new IntLiteral(200);
- Assert.assertTrue(intLiteral.getType().equals(Type.SMALLINT));
+ Assert.assertEquals(intLiteral.getType(), Type.SMALLINT);
IntLiteral castIntLiteral = (IntLiteral)
intLiteral.uncheckedCastTo(Type.INT);
- Assert.assertTrue(intLiteral.getType().equals(Type.SMALLINT));
- Assert.assertTrue(castIntLiteral.getType().equals(Type.INT));
+ Assert.assertEquals(intLiteral.getType(), Type.SMALLINT);
+ Assert.assertEquals(castIntLiteral.getType(), Type.INT);
Assert.assertFalse(intLiteral == castIntLiteral);
IntLiteral castIntLiteral2 = (IntLiteral)
intLiteral.uncheckedCastTo(Type.SMALLINT);
Assert.assertTrue(intLiteral == castIntLiteral2);
// null
NullLiteral nullLiteral = NullLiteral.create(Type.DATE);
- Assert.assertTrue(nullLiteral.getType().equals(Type.DATE));
+ Assert.assertEquals(nullLiteral.getType(), Type.DATE);
NullLiteral castNullLiteral = (NullLiteral)
nullLiteral.uncheckedCastTo(Type.DATETIME);
- Assert.assertTrue(nullLiteral.getType().equals(Type.DATE));
- Assert.assertTrue(castNullLiteral.getType().equals(Type.DATETIME));
+ Assert.assertEquals(nullLiteral.getType(), Type.DATE);
+ Assert.assertEquals(castNullLiteral.getType(), Type.DATETIME);
Assert.assertFalse(nullLiteral == castNullLiteral);
NullLiteral castNullLiteral2 = (NullLiteral)
nullLiteral.uncheckedCastTo(Type.DATE);
Assert.assertTrue(nullLiteral == castNullLiteral2);
// string
StringLiteral stringLiteral = new StringLiteral("abc");
- Assert.assertTrue(stringLiteral.getType().equals(Type.VARCHAR));
+ Assert.assertEquals(stringLiteral.getType(), Type.VARCHAR);
StringLiteral castStringLiteral = (StringLiteral)
stringLiteral.uncheckedCastTo(Type.CHAR);
- Assert.assertTrue(stringLiteral.getType().equals(Type.VARCHAR));
- Assert.assertTrue(castStringLiteral.getType().equals(Type.CHAR));
+ Assert.assertEquals(stringLiteral.getType(), Type.VARCHAR);
+ Assert.assertEquals(castStringLiteral.getType(), Type.CHAR);
Assert.assertFalse(stringLiteral == castStringLiteral);
StringLiteral castStringLiteral2 = (StringLiteral)
stringLiteral.uncheckedCastTo(Type.VARCHAR);
Assert.assertTrue(stringLiteral == castStringLiteral2);
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/InsertStmtTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/InsertStmtTest.java
index 898a949952..b16abaf470 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/InsertStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/InsertStmtTest.java
@@ -200,7 +200,7 @@ public class InsertStmtTest {
Assert.assertTrue(queryStmtSubstitute.getResultExprs().get(4)
instanceof FunctionCallExpr);
FunctionCallExpr expr4 = (FunctionCallExpr)
queryStmtSubstitute.getResultExprs().get(4);
- Assert.assertTrue(expr4.getFnName().getFunction().equals("to_bitmap"));
+ Assert.assertEquals(expr4.getFnName().getFunction(), "to_bitmap");
List<Expr> slots = Lists.newArrayList();
expr4.collect(IntLiteral.class, slots);
Assert.assertEquals(1, slots.size());
@@ -208,7 +208,7 @@ public class InsertStmtTest {
Assert.assertTrue(queryStmtSubstitute.getResultExprs().get(5)
instanceof FunctionCallExpr);
FunctionCallExpr expr5 = (FunctionCallExpr)
queryStmtSubstitute.getResultExprs().get(5);
- Assert.assertTrue(expr5.getFnName().getFunction().equals("hll_hash"));
+ Assert.assertEquals(expr5.getFnName().getFunction(), "hll_hash");
slots = Lists.newArrayList();
expr5.collect(StringLiteral.class, slots);
Assert.assertEquals(1, slots.size());
@@ -263,7 +263,7 @@ public class InsertStmtTest {
Assert.assertTrue(queryStmtSubstitue.getResultExprs().get(4)
instanceof FunctionCallExpr);
FunctionCallExpr expr4 = (FunctionCallExpr)
queryStmtSubstitue.getResultExprs().get(4);
- Assert.assertTrue(expr4.getFnName().getFunction().equals("to_bitmap"));
+ Assert.assertEquals(expr4.getFnName().getFunction(), "to_bitmap");
List<Expr> slots = Lists.newArrayList();
expr4.collect(SlotRef.class, slots);
Assert.assertEquals(1, slots.size());
@@ -273,7 +273,7 @@ public class InsertStmtTest {
Assert.assertTrue(queryStmtSubstitue.getResultExprs().get(5)
instanceof FunctionCallExpr);
FunctionCallExpr expr5 = (FunctionCallExpr)
queryStmtSubstitue.getResultExprs().get(5);
- Assert.assertTrue(expr5.getFnName().getFunction().equals("hll_hash"));
+ Assert.assertEquals(expr5.getFnName().getFunction(), "hll_hash");
slots = Lists.newArrayList();
expr5.collect(SlotRef.class, slots);
Assert.assertEquals(1, slots.size());
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/LiteralExprCompareTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/LiteralExprCompareTest.java
index baf07d8a2d..e0d6b77ab0 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/analysis/LiteralExprCompareTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/analysis/LiteralExprCompareTest.java
@@ -42,9 +42,9 @@ public class LiteralExprCompareTest {
LiteralExpr boolTrue2 = new BoolLiteral(true);
// value equal
- Assert.assertTrue(boolTrue1.equals(boolTrue2));
+ Assert.assertEquals(boolTrue1, boolTrue2);
// self equal
- Assert.assertTrue(boolTrue1.equals(boolTrue1));
+ Assert.assertEquals(boolTrue1, boolTrue1);
// value compare
Assert.assertTrue(!boolTrue1.equals(boolFalse1) && 1 ==
boolTrue1.compareLiteral(boolFalse1));
@@ -249,9 +249,9 @@ public class LiteralExprCompareTest {
LiteralExpr decimal4 = new DecimalLiteral("2.23457");
// value equal
- Assert.assertTrue(decimal1.equals(decimal2));
+ Assert.assertEquals(decimal1, decimal2);
// self equal
- Assert.assertTrue(decimal1.equals(decimal1));
+ Assert.assertEquals(decimal1, decimal1);
// value compare
Assert.assertTrue(!decimal3.equals(decimal2) && 1 ==
decimal3.compareLiteral(decimal2));
@@ -276,9 +276,9 @@ public class LiteralExprCompareTest {
// float
// value equal
- Assert.assertTrue(float1.equals(float2));
+ Assert.assertEquals(float1, float2);
// self equal
- Assert.assertTrue(float1.equals(float1));
+ Assert.assertEquals(float1, float1);
// value compare
Assert.assertTrue(!float3.equals(float2) && 1 ==
float3.compareLiteral(float2));
@@ -291,9 +291,9 @@ public class LiteralExprCompareTest {
// double
// value equal
- Assert.assertTrue(double1.equals(double2));
+ Assert.assertEquals(double1, double2);
// self equal
- Assert.assertTrue(double1.equals(double1));
+ Assert.assertEquals(double1, double1);
// value compare
Assert.assertTrue(!double3.equals(double2) && 1 ==
double3.compareLiteral(double2));
@@ -343,9 +343,9 @@ public class LiteralExprCompareTest {
LiteralExpr infinity4 = LiteralExpr.createInfinity(type, false);
// value equal
- Assert.assertTrue(tinyint1.equals(tinyint1));
+ Assert.assertEquals(tinyint1, tinyint1);
// self equal
- Assert.assertTrue(tinyint1.equals(tinyint2));
+ Assert.assertEquals(tinyint1, tinyint2);
// value compare
Assert.assertTrue(!tinyint1.equals(tinyint3) && 1 ==
tinyint1.compareLiteral(tinyint3));
@@ -357,12 +357,12 @@ public class LiteralExprCompareTest {
Assert.assertTrue(0 == tinyint1.compareLiteral(tinyint2));
// infinity
- Assert.assertTrue(infinity1.equals(infinity1));
- Assert.assertTrue(infinity1.equals(infinity2));
- Assert.assertTrue(infinity3.equals(infinity3));
- Assert.assertTrue(infinity3.equals(infinity4));
- Assert.assertFalse(tinyint1.equals(infinity1));
- Assert.assertTrue(tinyint3.equals(infinity3));
+ Assert.assertEquals(infinity1, infinity1);
+ Assert.assertEquals(infinity1, infinity2);
+ Assert.assertEquals(infinity3, infinity3);
+ Assert.assertEquals(infinity3, infinity4);
+ Assert.assertNotEquals(tinyint1, infinity1);
+ Assert.assertEquals(tinyint3, infinity3);
Assert.assertTrue(0 == infinity1.compareLiteral(infinity1));
Assert.assertTrue(0 == infinity1.compareLiteral(infinity2));
@@ -393,7 +393,7 @@ public class LiteralExprCompareTest {
LiteralExpr infinity3 = new LargeIntLiteral(false);
// value equal
- Assert.assertTrue(largeInt1.equals(largeInt1));
+ Assert.assertEquals(largeInt1, largeInt1);
// value compare
Assert.assertTrue(!largeInt1.equals(largeInt3) && 1 ==
largeInt1.compareLiteral(largeInt3));
@@ -401,10 +401,10 @@ public class LiteralExprCompareTest {
Assert.assertTrue(0 == largeInt1.compareLiteral(largeInt1));
// infinity
- Assert.assertTrue(infinity1.equals(infinity1));
- Assert.assertTrue(infinity3.equals(infinity3));
- Assert.assertTrue(infinity1.equals(largeInt1));
- Assert.assertTrue(infinity3.equals(largeInt3));
+ Assert.assertEquals(infinity1, infinity1);
+ Assert.assertEquals(infinity3, infinity3);
+ Assert.assertEquals(infinity1, largeInt1);
+ Assert.assertEquals(infinity3, largeInt3);
Assert.assertTrue(!infinity1.equals(largeInt3) && 1 ==
infinity1.compareLiteral(largeInt3));
Assert.assertTrue(!infinity3.equals(infinity1) && -1 ==
infinity3.compareLiteral(infinity1));
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/VirtualSlotRefTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/VirtualSlotRefTest.java
index 85071685ce..4ff1c693f4 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/VirtualSlotRefTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/VirtualSlotRefTest.java
@@ -103,7 +103,7 @@ public class VirtualSlotRefTest {
public void testClone() {
Expr v = virtualSlot.clone();
Assert.assertTrue(v instanceof VirtualSlotRef);
- Assert.assertTrue(((VirtualSlotRef)
v).getRealSlots().get(0).equals(virtualSlot.getRealSlots().get(0)));
+ Assert.assertEquals(((VirtualSlotRef) v).getRealSlots().get(0),
virtualSlot.getRealSlots().get(0));
Assert.assertFalse(((VirtualSlotRef) v).getRealSlots().get(0) ==
virtualSlot.getRealSlots().get(0));
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreFileMappingTest.java
b/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreFileMappingTest.java
index dc3483ec0d..d37a63f6d1 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreFileMappingTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreFileMappingTest.java
@@ -39,7 +39,7 @@ public class RestoreFileMappingTest {
@Test
public void test() {
IdChain key = new IdChain(10005L, 10006L, 10005L, 10007L, 10008L);
- Assert.assertTrue(key.equals(src));
+ Assert.assertEquals(key, src);
Assert.assertEquals(src, key);
IdChain val = fileMapping.get(key);
Assert.assertNotNull(val);
@@ -48,12 +48,12 @@ public class RestoreFileMappingTest {
Long l1 = new Long(10005L);
Long l2 = new Long(10005L);
Assert.assertFalse(l1 == l2);
- Assert.assertTrue(l1.equals(l2));
+ Assert.assertEquals(l1, l2);
Long l3 = new Long(1L);
Long l4 = new Long(1L);
Assert.assertFalse(l3 == l4);
- Assert.assertTrue(l3.equals(l4));
+ Assert.assertEquals(l3, l4);
}
}
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/BackendTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/BackendTest.java
index 463eee0a09..5cf3bfba1e 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/BackendTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/BackendTest.java
@@ -172,23 +172,23 @@ public class BackendTest {
Assert.assertEquals(100, backend100BackendStatus.lastStreamLoadTime);
for (int count = 0; count < 200; count++) {
- Assert.assertTrue(list1.get(count).equals(list2.get(count)));
+ Assert.assertEquals(list1.get(count), list2.get(count));
}
- Assert.assertFalse(list1.get(1).equals(list1.get(2)));
- Assert.assertFalse(list1.get(1).equals(this));
- Assert.assertTrue(list1.get(1).equals(list1.get(1)));
+ Assert.assertNotEquals(list1.get(1), list1.get(2));
+ Assert.assertNotEquals(list1.get(1), this);
+ Assert.assertEquals(list1.get(1), list1.get(1));
Backend back1 = new Backend(1, "a", 1);
back1.updateOnce(1, 1, 1);
Backend back2 = new Backend(2, "a", 1);
back2.updateOnce(1, 1, 1);
- Assert.assertFalse(back1.equals(back2));
+ Assert.assertNotEquals(back1, back2);
back1 = new Backend(1, "a", 1);
back1.updateOnce(1, 1, 1);
back2 = new Backend(1, "b", 1);
back2.updateOnce(1, 1, 1);
- Assert.assertFalse(back1.equals(back2));
+ Assert.assertNotEquals(back1, back2);
back1 = new Backend(1, "a", 1);
back1.updateOnce(1, 1, 1);
@@ -198,7 +198,7 @@ public class BackendTest {
tagMap.put(Tag.TYPE_LOCATION, "l1");
tagMap.put("compute", "c1");
back2.setTagMap(tagMap);
- Assert.assertFalse(back1.equals(back2));
+ Assert.assertNotEquals(back1, back2);
Assert.assertEquals("Backend [id=1, host=a, heartbeatPort=1,
alive=true, tags: {location=default}]",
back1.toString());
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableIndexTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableIndexTest.java
index 4e300347b8..5b78103f71 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableIndexTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColocateTableIndexTest.java
@@ -41,7 +41,7 @@ public class ColocateTableIndexTest {
GroupId groupId1 = new GroupId(1000, 2000);
GroupId groupId2 = new GroupId(1000, 2000);
Map<GroupId, Long> map = Maps.newHashMap();
- Assert.assertTrue(groupId1.equals(groupId2));
+ Assert.assertEquals(groupId1, groupId2);
Assert.assertTrue(groupId1.hashCode() == groupId2.hashCode());
map.put(groupId1, 1000L);
Assert.assertTrue(map.containsKey(groupId2));
@@ -73,7 +73,7 @@ public class ColocateTableIndexTest {
DataInputStream dis = new DataInputStream(Files.newInputStream(path));
ColocateTableIndex.GroupId rGroupId =
ColocateTableIndex.GroupId.read(dis);
- Assert.assertTrue(groupId.equals(rGroupId));
+ Assert.assertEquals(groupId, rGroupId);
// 3. delete files
dis.close();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnStatTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnStatTest.java
index f8d0bc77be..9fe3ac8b59 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnStatTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnStatTest.java
@@ -61,22 +61,22 @@ public class ColumnStatTest {
DataInputStream dis = new DataInputStream(Files.newInputStream(path));
ColumnStats rStats1 = new ColumnStats();
rStats1.readFields(dis);
- Assert.assertTrue(rStats1.equals(stats1));
+ Assert.assertEquals(rStats1, stats1);
ColumnStats rStats2 = new ColumnStats();
rStats2.readFields(dis);
- Assert.assertTrue(rStats2.equals(stats2));
+ Assert.assertEquals(rStats2, stats2);
ColumnStats rStats3 = ColumnStats.read(dis);
- Assert.assertTrue(rStats3.equals(stats3));
+ Assert.assertEquals(rStats3, stats3);
ColumnStats rStats4 = ColumnStats.read(dis);
- Assert.assertTrue(rStats4.equals(stats4));
- Assert.assertTrue(rStats4.equals(stats3));
+ Assert.assertEquals(rStats4, stats4);
+ Assert.assertEquals(rStats4, stats3);
- Assert.assertTrue(rStats3.equals(rStats3));
- Assert.assertFalse(rStats3.equals(this));
- Assert.assertFalse(rStats2.equals(rStats3));
+ Assert.assertEquals(rStats3, rStats3);
+ Assert.assertNotEquals(rStats3, this);
+ Assert.assertNotEquals(rStats2, rStats3);
// 3. delete files
dis.close();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java
index 7d88a696f9..9a69d908cd 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ColumnTypeTest.java
@@ -240,17 +240,17 @@ public class ColumnTypeTest {
// 2. Read objects from file
DataInputStream dis = new DataInputStream(Files.newInputStream(path));
Type rType1 = ColumnType.read(dis);
- Assert.assertTrue(rType1.equals(type1));
+ Assert.assertEquals(rType1, type1);
Type rType2 = ColumnType.read(dis);
- Assert.assertTrue(rType2.equals(type2));
+ Assert.assertEquals(rType2, type2);
Type rType3 = ColumnType.read(dis);
// Change it when remove DecimalV2
Assert.assertTrue(rType3.equals(type3) || rType3.equals(type4));
- Assert.assertFalse(type1.equals(this));
+ Assert.assertNotEquals(type1, this);
// 3. delete files
dis.close();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java
index b12f09bea8..2c8c6407f5 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/CreateTableTest.java
@@ -88,14 +88,14 @@ public class CreateTableTest {
Set<TabletMeta> tabletIdSetAfterDuplicateCreateTable4 =
new
HashSet<>(env.getTabletInvertedIndex().getTabletMetaTable().values());
-
Assert.assertTrue(tabletIdSetAfterCreateFirstTable.equals(tabletIdSetAfterDuplicateCreateTable1));
-
Assert.assertTrue(tabletIdSetAfterCreateFirstTable.equals(tabletIdSetAfterDuplicateCreateTable2));
-
Assert.assertTrue(tabletIdSetAfterCreateFirstTable.equals(tabletIdSetAfterDuplicateCreateTable3));
-
Assert.assertTrue(tabletMetaSetBeforeCreateFirstTable.equals(tabletIdSetAfterDuplicateCreateTable4));
+ Assert.assertEquals(tabletIdSetAfterCreateFirstTable,
tabletIdSetAfterDuplicateCreateTable1);
+ Assert.assertEquals(tabletIdSetAfterCreateFirstTable,
tabletIdSetAfterDuplicateCreateTable2);
+ Assert.assertEquals(tabletIdSetAfterCreateFirstTable,
tabletIdSetAfterDuplicateCreateTable3);
+ Assert.assertEquals(tabletMetaSetBeforeCreateFirstTable,
tabletIdSetAfterDuplicateCreateTable4);
// check whether table id is cleared from colocate group after
duplicate create table
Set<Long> colocateTableIdAfterCreateFirstTable =
env.getColocateTableIndex().getTable2Group().keySet();
-
Assert.assertTrue(colocateTableIdBeforeCreateFirstTable.equals(colocateTableIdAfterCreateFirstTable));
+ Assert.assertEquals(colocateTableIdBeforeCreateFirstTable,
colocateTableIdAfterCreateFirstTable);
}
@Test
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/EnvTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/EnvTest.java
index d660cd8ddd..c06ffa494a 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/EnvTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/EnvTest.java
@@ -178,7 +178,7 @@ public class EnvTest {
long checksum2 = env.loadLoadJob(dis, 0);
Assert.assertEquals(checksum1, checksum2);
LoadJob job2 = env.getLoadInstance().getLoadJob(-1);
- Assert.assertTrue(job1.equals(job2));
+ Assert.assertEquals(job1, job2);
dis.close();
deleteDir(dir);
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java
index aa29fa32bd..ccc8f8925e 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/catalog/MaterializedIndexTest.java
@@ -78,7 +78,7 @@ public class MaterializedIndexTest {
// 2. Read objects from file
DataInputStream dis = new DataInputStream(Files.newInputStream(path));
MaterializedIndex rIndex = MaterializedIndex.read(dis);
- Assert.assertTrue(index.equals(rIndex));
+ Assert.assertEquals(index, rIndex);
// 3. delete files
dis.close();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/catalog/PartitionKeyTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/PartitionKeyTest.java
index 38806ad1b1..fc10460615 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/PartitionKeyTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/PartitionKeyTest.java
@@ -240,13 +240,13 @@ public class PartitionKeyTest {
// 2. Read objects from file
DataInputStream dis = new DataInputStream(Files.newInputStream(path));
PartitionKey rKeyEmpty = PartitionKey.read(dis);
- Assert.assertTrue(keyEmpty.equals(rKeyEmpty));
+ Assert.assertEquals(keyEmpty, rKeyEmpty);
PartitionKey rKey = new PartitionKey();
rKey.readFields(dis);
- Assert.assertTrue(key.equals(rKey));
- Assert.assertTrue(key.equals(key));
- Assert.assertFalse(key.equals(this));
+ Assert.assertEquals(key, rKey);
+ Assert.assertEquals(key, key);
+ Assert.assertNotEquals(key, this);
// 3. delete files
dis.close();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaAllocationTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaAllocationTest.java
index 00dbf1443c..77bd999b00 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaAllocationTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaAllocationTest.java
@@ -43,7 +43,7 @@ public class ReplicaAllocationTest {
// DEFAULT_ALLOCATION
ReplicaAllocation replicaAlloc = ReplicaAllocation.DEFAULT_ALLOCATION;
Assert.assertFalse(replicaAlloc.isNotSet());
-
Assert.assertTrue(replicaAlloc.equals(ReplicaAllocation.DEFAULT_ALLOCATION));
+ Assert.assertEquals(replicaAlloc,
ReplicaAllocation.DEFAULT_ALLOCATION);
Assert.assertFalse(replicaAlloc.isEmpty());
Assert.assertEquals(3, replicaAlloc.getTotalReplicaNum());
Assert.assertEquals("tag.location.default: 3",
replicaAlloc.toCreateStmt());
@@ -51,7 +51,7 @@ public class ReplicaAllocationTest {
// NOT SET
replicaAlloc = ReplicaAllocation.NOT_SET;
Assert.assertTrue(replicaAlloc.isNotSet());
-
Assert.assertFalse(replicaAlloc.equals(ReplicaAllocation.DEFAULT_ALLOCATION));
+ Assert.assertNotEquals(replicaAlloc,
ReplicaAllocation.DEFAULT_ALLOCATION);
Assert.assertTrue(replicaAlloc.isEmpty());
Assert.assertEquals(0, replicaAlloc.getTotalReplicaNum());
Assert.assertEquals("", replicaAlloc.toCreateStmt());
@@ -59,7 +59,7 @@ public class ReplicaAllocationTest {
// set replica num
replicaAlloc = new ReplicaAllocation((short) 5);
Assert.assertFalse(replicaAlloc.isNotSet());
-
Assert.assertFalse(replicaAlloc.equals(ReplicaAllocation.DEFAULT_ALLOCATION));
+ Assert.assertNotEquals(replicaAlloc,
ReplicaAllocation.DEFAULT_ALLOCATION);
Assert.assertFalse(replicaAlloc.isEmpty());
Assert.assertEquals(5, replicaAlloc.getTotalReplicaNum());
Assert.assertEquals("tag.location.default: 5",
replicaAlloc.toCreateStmt());
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java
index d9d5aa264a..d6a81cdd88 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java
@@ -118,11 +118,11 @@ public class ReplicaTest {
// 3. Check equal
for (int i = 0; i < 11; i++) {
- Assert.assertTrue(list1.get(i).equals(list2.get(i)));
+ Assert.assertEquals(list1.get(i), list2.get(i));
}
- Assert.assertTrue(list1.get(1).equals(list1.get(1)));
- Assert.assertFalse(list1.get(1).equals(list1));
+ Assert.assertEquals(list1.get(1), list1.get(1));
+ Assert.assertNotEquals(list1.get(1), list1);
dis.close();
Files.deleteIfExists(path);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/TableTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/TableTest.java
index 1d622b4672..4b99790f19 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/TableTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/TableTest.java
@@ -163,7 +163,7 @@ public class TableTest {
DataInputStream dis = new DataInputStream(Files.newInputStream(path));
Table rFamily1 = Table.read(dis);
- Assert.assertTrue(table1.equals(rFamily1));
+ Assert.assertEquals(table1, rFamily1);
Assert.assertEquals(table1.getCreateTime(), rFamily1.getCreateTime());
Assert.assertEquals(table1.getIndexMetaByIndexId(2).getKeysType(),
KeysType.AGG_KEYS);
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java
b/fe/fe-core/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java
index 69a041ba0d..2553bba9f3 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/cluster/SystemInfoServiceTest.java
@@ -290,7 +290,7 @@ public class SystemInfoServiceTest {
Assert.assertEquals(checksum1, checksum2);
Assert.assertEquals(1, systemInfoService.getIdToBackend().size());
Backend back2 = systemInfoService.getBackend(1);
- Assert.assertTrue(back1.equals(back2));
+ Assert.assertEquals(back1, back2);
dis.close();
deleteDir(dir);
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/load/EtlJobStatusTest.java
b/fe/fe-core/src/test/java/org/apache/doris/load/EtlJobStatusTest.java
index c91abec263..0958312199 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/load/EtlJobStatusTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/load/EtlJobStatusTest.java
@@ -80,7 +80,7 @@ public class EtlJobStatusTest {
Assert.assertEquals(counters.get(countersKey), countersValue);
}
- Assert.assertTrue(etlJobStatus.equals(etlJobStatus1));
+ Assert.assertEquals(etlJobStatus, etlJobStatus1);
Assert.assertEquals(trackingUrl, etlJobStatus1.getTrackingUrl());
dis.close();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/FailMsgTest.java
b/fe/fe-core/src/test/java/org/apache/doris/load/FailMsgTest.java
index f0c88855ef..cef5389ce6 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/load/FailMsgTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/load/FailMsgTest.java
@@ -46,7 +46,7 @@ public class FailMsgTest {
Assert.assertEquals(failMsg1.getMsg(), "Job failed");
Assert.assertEquals(failMsg1.getCancelType(),
FailMsg.CancelType.ETL_QUALITY_UNSATISFIED);
- Assert.assertTrue(failMsg1.equals(failMsg));
+ Assert.assertEquals(failMsg1, failMsg);
dis.close();
file.delete();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/LoadJobTest.java
b/fe/fe-core/src/test/java/org/apache/doris/load/LoadJobTest.java
index 337734ee5f..bf8059706f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/load/LoadJobTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/load/LoadJobTest.java
@@ -171,11 +171,11 @@ public class LoadJobTest {
LoadJob rLoadJob3 = new LoadJob();
rLoadJob3.readFields(dis);
- Assert.assertTrue(loadJob0.equals(rLoadJob0));
- Assert.assertTrue(loadJob1.equals(rLoadJob1));
- Assert.assertTrue(loadJob3.equals(rLoadJob3));
+ Assert.assertEquals(loadJob0, rLoadJob0);
+ Assert.assertEquals(loadJob1, rLoadJob1);
+ Assert.assertEquals(loadJob3, rLoadJob3);
- Assert.assertFalse(loadJob0.equals(rLoadJob1));
+ Assert.assertNotEquals(loadJob0, rLoadJob1);
dis.close();
file.delete();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/load/PartitionLoadInfoTest.java
b/fe/fe-core/src/test/java/org/apache/doris/load/PartitionLoadInfoTest.java
index 51628b54fb..c6bd5086c3 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/load/PartitionLoadInfoTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/load/PartitionLoadInfoTest.java
@@ -80,9 +80,9 @@ public class PartitionLoadInfoTest {
Assert.assertEquals(sources1.get(1).getFileUrls().size(), 30);
Assert.assertEquals(sources1.get(1).getColumnNames().size(), 30);
- Assert.assertTrue(partitionLoadInfo1.equals(partitionLoadInfo));
- Assert.assertTrue(rPartitionLoadInfo0.equals(partitionLoadInfo0));
- Assert.assertFalse(partitionLoadInfo0.equals(partitionLoadInfo1));
+ Assert.assertEquals(partitionLoadInfo1, partitionLoadInfo);
+ Assert.assertEquals(rPartitionLoadInfo0, partitionLoadInfo0);
+ Assert.assertNotEquals(partitionLoadInfo0, partitionLoadInfo1);
dis.close();
file.delete();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/SourceTest.java
b/fe/fe-core/src/test/java/org/apache/doris/load/SourceTest.java
index 352b728cfb..ae4bd0f5fe 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/load/SourceTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/load/SourceTest.java
@@ -68,20 +68,20 @@ public class SourceTest {
Source rSource2 = new Source();
rSource2.readFields(dis);
- Assert.assertTrue(rSource0.equals(source0));
- Assert.assertTrue(source0.equals(source0));
- Assert.assertFalse(rSource0.equals(this));
- Assert.assertTrue(rSource1.equals(source1));
- Assert.assertFalse(rSource2.equals(source2));
- Assert.assertFalse(rSource0.equals(source1));
+ Assert.assertEquals(rSource0, source0);
+ Assert.assertEquals(source0, source0);
+ Assert.assertNotEquals(rSource0, this);
+ Assert.assertEquals(rSource1, source1);
+ Assert.assertNotEquals(rSource2, source2);
+ Assert.assertNotEquals(rSource0, source1);
rSource2.setFileUrls(null);
- Assert.assertFalse(rSource2.equals(source2));
+ Assert.assertNotEquals(rSource2, source2);
rSource2.setColumnNames(null);
rSource2.setFileUrls(new ArrayList<String>());
rSource2.setColumnNames(null);
rSource2.setFileUrls(null);
- Assert.assertTrue(rSource2.equals(source2));
+ Assert.assertEquals(rSource2, source2);
dis.close();
file.delete();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java
b/fe/fe-core/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java
index 41670e61fc..63cbf6bc68 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/load/TabletLoadInfoTest.java
@@ -61,9 +61,9 @@ public class TabletLoadInfoTest {
Assert.assertEquals("hdfs://host:port/dir",
tabletLoadInfo1.getFilePath());
Assert.assertEquals(1L, tabletLoadInfo1.getFileSize());
- Assert.assertTrue(tabletLoadInfo1.equals(tabletLoadInfo));
- Assert.assertTrue(rTabletLoadInfo0.equals(tabletLoadInfo0));
- Assert.assertFalse(rTabletLoadInfo0.equals(tabletLoadInfo1));
+ Assert.assertEquals(tabletLoadInfo1, tabletLoadInfo);
+ Assert.assertEquals(rTabletLoadInfo0, tabletLoadInfo0);
+ Assert.assertNotEquals(rTabletLoadInfo0, tabletLoadInfo1);
dis.close();
file.delete();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/AuthTest.java
b/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/AuthTest.java
index 3df1b4d1ed..50ecb8edec 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/AuthTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/AuthTest.java
@@ -212,7 +212,7 @@ public class AuthTest {
Assert.assertFalse(auth.checkPlainPasswordForTest(SystemInfoService.DEFAULT_CLUSTER
+ ":cmy", "192.168.0.1",
"123456", null));
Assert.assertFalse(auth.checkPlainPasswordForTest("other:cmy",
"192.168.0.1", "12345", null));
- Assert.assertTrue(currentUser.get(0).equals(userIdentity));
+ Assert.assertEquals(currentUser.get(0), userIdentity);
// 3. create another user: zhangsan@"192.%"
userIdentity = new UserIdentity("zhangsan", "192.%");
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FunctionRegistryTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FunctionRegistryTest.java
index 4108893cfa..487fae2c58 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FunctionRegistryTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FunctionRegistryTest.java
@@ -121,7 +121,7 @@ public class FunctionRegistryTest implements
PatternMatchSupported {
ImmutableList<Expression> arguments = ImmutableList.of(Literal.of(1));
FunctionBuilder functionBuilder =
functionRegistry.findFunctionBuilder("foo", arguments);
BoundFunction function = functionBuilder.build("foo", arguments);
-
Assertions.assertTrue(function.getClass().equals(ExtendFunction.class));
+ Assertions.assertEquals(function.getClass(), ExtendFunction.class);
Assertions.assertEquals(arguments, function.getArguments());
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java
b/fe/fe-core/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java
index d7ddccc6cb..810e84592d 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/persist/CreateTableInfoTest.java
@@ -105,8 +105,8 @@ public class CreateTableInfoTest {
DataInputStream dis = new DataInputStream(Files.newInputStream(path));
CreateTableInfo rInfo1 = CreateTableInfo.read(dis);
- Assert.assertTrue(rInfo1.getTable().equals(table));
- Assert.assertTrue(rInfo1.equals(info));
+ Assert.assertEquals(rInfo1.getTable(), table);
+ Assert.assertEquals(rInfo1, info);
Assert.assertEquals(rInfo1.getDbName(), "db1");
// 3. delete files
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/persist/DropAndRecoverInfoTest.java
b/fe/fe-core/src/test/java/org/apache/doris/persist/DropAndRecoverInfoTest.java
index 039488fe13..5b70ff4f80 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/persist/DropAndRecoverInfoTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/persist/DropAndRecoverInfoTest.java
@@ -54,21 +54,21 @@ public class DropAndRecoverInfoTest {
DataInputStream dis = new DataInputStream(new FileInputStream(file));
DropInfo rInfo1 = DropInfo.read(dis);
- Assert.assertTrue(rInfo1.equals(info1));
+ Assert.assertEquals(rInfo1, info1);
DropInfo rInfo2 = DropInfo.read(dis);
- Assert.assertTrue(rInfo2.equals(info2));
+ Assert.assertEquals(rInfo2, info2);
Assert.assertEquals(1, rInfo2.getDbId());
Assert.assertEquals(2, rInfo2.getTableId());
Assert.assertTrue(rInfo2.isForceDrop());
- Assert.assertTrue(rInfo2.equals(rInfo2));
- Assert.assertFalse(rInfo2.equals(this));
- Assert.assertFalse(info2.equals(new DropInfo(0, 2, -1L, true, 0)));
- Assert.assertFalse(info2.equals(new DropInfo(1, 0, -1L, true, 0)));
- Assert.assertFalse(info2.equals(new DropInfo(1, 2, -1L, false, 0)));
- Assert.assertTrue(info2.equals(new DropInfo(1, 2, -1L, true, 0)));
+ Assert.assertEquals(rInfo2, rInfo2);
+ Assert.assertNotEquals(rInfo2, this);
+ Assert.assertNotEquals(info2, new DropInfo(0, 2, -1L, true, 0));
+ Assert.assertNotEquals(info2, new DropInfo(1, 0, -1L, true, 0));
+ Assert.assertNotEquals(info2, new DropInfo(1, 2, -1L, false, 0));
+ Assert.assertEquals(info2, new DropInfo(1, 2, -1L, true, 0));
// 3. delete files
dis.close();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/persist/DropDbInfoTest.java
b/fe/fe-core/src/test/java/org/apache/doris/persist/DropDbInfoTest.java
index 775b81dc82..3548845169 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/persist/DropDbInfoTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/persist/DropDbInfoTest.java
@@ -54,19 +54,19 @@ public class DropDbInfoTest {
DataInputStream dis = new DataInputStream(new FileInputStream(file));
DropDbInfo rInfo1 = DropDbInfo.read(dis);
- Assert.assertTrue(rInfo1.equals(info1));
+ Assert.assertEquals(rInfo1, info1);
DropDbInfo rInfo2 = DropDbInfo.read(dis);
- Assert.assertTrue(rInfo2.equals(info2));
+ Assert.assertEquals(rInfo2, info2);
Assert.assertEquals("test_db", rInfo2.getDbName());
Assert.assertTrue(rInfo2.isForceDrop());
- Assert.assertTrue(rInfo2.equals(rInfo2));
- Assert.assertFalse(rInfo2.equals(this));
- Assert.assertFalse(info2.equals(new DropDbInfo("test_db1", true, 0)));
- Assert.assertFalse(info2.equals(new DropDbInfo("test_db", false, 0)));
- Assert.assertTrue(info2.equals(new DropDbInfo("test_db", true, 0)));
+ Assert.assertEquals(rInfo2, rInfo2);
+ Assert.assertNotEquals(rInfo2, this);
+ Assert.assertNotEquals(info2, new DropDbInfo("test_db1", true, 0));
+ Assert.assertNotEquals(info2, new DropDbInfo("test_db", false, 0));
+ Assert.assertEquals(info2, new DropDbInfo("test_db", true, 0));
// 3. delete files
dis.close();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/persist/DropPartitionInfoTest.java
b/fe/fe-core/src/test/java/org/apache/doris/persist/DropPartitionInfoTest.java
index 6158b9683a..9adb0ecb60 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/persist/DropPartitionInfoTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/persist/DropPartitionInfoTest.java
@@ -58,14 +58,14 @@ public class DropPartitionInfoTest {
Assert.assertFalse(rInfo1.isTempPartition());
Assert.assertTrue(rInfo1.isForceDrop());
- Assert.assertTrue(rInfo1.equals(info1));
- Assert.assertFalse(rInfo1.equals(this));
- Assert.assertFalse(info1.equals(new DropPartitionInfo(-1L, 2L,
"test_partition", false, true, 0)));
- Assert.assertFalse(info1.equals(new DropPartitionInfo(1L, -2L,
"test_partition", false, true, 0)));
- Assert.assertFalse(info1.equals(new DropPartitionInfo(1L, 2L,
"test_partition1", false, true, 0)));
- Assert.assertFalse(info1.equals(new DropPartitionInfo(1L, 2L,
"test_partition", true, true, 0)));
- Assert.assertFalse(info1.equals(new DropPartitionInfo(1L, 2L,
"test_partition", false, false, 0)));
- Assert.assertTrue(info1.equals(new DropPartitionInfo(1L, 2L,
"test_partition", false, true, 0)));
+ Assert.assertEquals(rInfo1, info1);
+ Assert.assertNotEquals(rInfo1, this);
+ Assert.assertNotEquals(info1, new DropPartitionInfo(-1L, 2L,
"test_partition", false, true, 0));
+ Assert.assertNotEquals(info1, new DropPartitionInfo(1L, -2L,
"test_partition", false, true, 0));
+ Assert.assertNotEquals(info1, new DropPartitionInfo(1L, 2L,
"test_partition1", false, true, 0));
+ Assert.assertNotEquals(info1, new DropPartitionInfo(1L, 2L,
"test_partition", true, true, 0));
+ Assert.assertNotEquals(info1, new DropPartitionInfo(1L, 2L,
"test_partition", false, false, 0));
+ Assert.assertEquals(info1, new DropPartitionInfo(1L, 2L,
"test_partition", false, true, 0));
// 3. delete files
dis.close();
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/persist/RefreshExternalTableInfoTest.java
b/fe/fe-core/src/test/java/org/apache/doris/persist/RefreshExternalTableInfoTest.java
index 14197596ec..b6ea1bd101 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/persist/RefreshExternalTableInfoTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/persist/RefreshExternalTableInfoTest.java
@@ -88,9 +88,9 @@ public class RefreshExternalTableInfoTest {
DataInputStream dis = new DataInputStream(new FileInputStream(file));
RefreshExternalTableInfo rInfo1 = RefreshExternalTableInfo.read(dis);
- Assert.assertTrue(rInfo1.getDbName().equals(info.getDbName()));
- Assert.assertTrue(rInfo1.getTableName().equals(info.getTableName()));
- Assert.assertTrue(rInfo1.getNewSchema().equals(info.getNewSchema()));
+ Assert.assertEquals(rInfo1.getDbName(), info.getDbName());
+ Assert.assertEquals(rInfo1.getTableName(), info.getTableName());
+ Assert.assertEquals(rInfo1.getNewSchema(), info.getNewSchema());
// 3. delete files
dis.close();
diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/StorageTest.java
b/fe/fe-core/src/test/java/org/apache/doris/persist/StorageTest.java
index 2610e0b8e3..78dd2bcb07 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/persist/StorageTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/persist/StorageTest.java
@@ -118,20 +118,20 @@ public class StorageTest {
Assert.assertEquals(5, storage.getLatestImageSeq());
Assert.assertEquals(4, storage.getLatestValidatedImageSeq());
Assert.assertEquals(10, Storage.getMetaSeq(new
File("storageTestDir/edits.10")));
- Assert.assertTrue(
- Storage.getCurrentEditsFile(new
File("storageTestDir")).equals(new File("storageTestDir/edits")));
+ Assert.assertEquals(
+ Storage.getCurrentEditsFile(new File("storageTestDir")), new
File("storageTestDir/edits"));
- Assert.assertTrue(storage.getCurrentImageFile().equals(new
File("storageTestDir/image.5")));
- Assert.assertTrue(storage.getImageFile(0).equals(new
File("storageTestDir/image.0")));
- Assert.assertTrue(
- Storage.getImageFile(new File("storageTestDir"), 0).equals(new
File("storageTestDir/image.0")));
+ Assert.assertEquals(storage.getCurrentImageFile(), new
File("storageTestDir/image.5"));
+ Assert.assertEquals(storage.getImageFile(0), new
File("storageTestDir/image.0"));
+ Assert.assertEquals(
+ Storage.getImageFile(new File("storageTestDir"), 0), new
File("storageTestDir/image.0"));
- Assert.assertTrue(storage.getCurrentEditsFile().equals(new
File("storageTestDir/edits")));
- Assert.assertTrue(storage.getEditsFile(5).equals(new
File("storageTestDir/edits.5")));
- Assert.assertTrue(
- Storage.getEditsFile(new File("storageTestDir"), 3).equals(new
File("storageTestDir/edits.3")));
+ Assert.assertEquals(storage.getCurrentEditsFile(), new
File("storageTestDir/edits"));
+ Assert.assertEquals(storage.getEditsFile(5), new
File("storageTestDir/edits.5"));
+ Assert.assertEquals(
+ Storage.getEditsFile(new File("storageTestDir"), 3), new
File("storageTestDir/edits.3"));
- Assert.assertTrue(storage.getVersionFile().equals(new
File("storageTestDir/VERSION")));
+ Assert.assertEquals(storage.getVersionFile(), new
File("storageTestDir/VERSION"));
Assert.assertEquals("storageTestDir", storage.getMetaDir());
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
index d790707a88..402e17bd21 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
@@ -684,7 +684,7 @@ public class QueryPlanTest extends TestWithFeService {
String castSql = "select * from test.baseall where k11 <
cast('2020-03-26' as date)";
SelectStmt selectStmt = (SelectStmt) parseAndAnalyzeStmt(castSql);
Expr rightExpr = selectStmt.getWhereClause().getChildren().get(1);
-
Assert.assertTrue(rightExpr.getType().equals(ScalarType.getDefaultDateType(Type.DATETIME)));
+ Assert.assertEquals(rightExpr.getType(),
ScalarType.getDefaultDateType(Type.DATETIME));
String castSql2 = "select str_to_date('11/09/2011', '%m/%d/%Y');";
String explainString = getSQLPlanOrErrorMsg("explain " + castSql2);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/qe/CoordinatorTest.java
b/fe/fe-core/src/test/java/org/apache/doris/qe/CoordinatorTest.java
index c6cc28bcb7..dd368ca4ba 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/qe/CoordinatorTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/qe/CoordinatorTest.java
@@ -828,21 +828,21 @@ public class CoordinatorTest extends Coordinator {
Assert.assertTrue(assignment.size() == 1);
for (Map.Entry<TNetworkAddress, Map<Integer, List<TScanRangeParams>>>
entry : assignment.entrySet()) {
TNetworkAddress host = entry.getKey();
- Assert.assertTrue(host.hostname.equals("0.0.0.0"));
+ Assert.assertEquals(host.hostname, "0.0.0.0");
}
FragmentScanRangeAssignment assignment2 =
fragmentExecParamsMap.get(fragment2.getFragmentId()).scanRangeAssignment;
Assert.assertTrue(assignment2.size() == 1);
for (Map.Entry<TNetworkAddress, Map<Integer, List<TScanRangeParams>>>
entry : assignment2.entrySet()) {
TNetworkAddress host = entry.getKey();
- Assert.assertTrue(host.hostname.equals("0.0.0.1"));
+ Assert.assertEquals(host.hostname, "0.0.0.1");
}
FragmentScanRangeAssignment assignment3 =
fragmentExecParamsMap.get(fragment3.getFragmentId()).scanRangeAssignment;
Assert.assertTrue(assignment3.size() == 1);
for (Map.Entry<TNetworkAddress, Map<Integer, List<TScanRangeParams>>>
entry : assignment3.entrySet()) {
TNetworkAddress host = entry.getKey();
- Assert.assertTrue(host.hostname.equals("0.0.0.2"));
+ Assert.assertEquals(host.hostname, "0.0.0.2");
}
}
}
diff --git
a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/SparkDppTest.java
b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/SparkDppTest.java
index 29478cfb18..28140f6ed3 100644
---
a/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/SparkDppTest.java
+++
b/fe/spark-dpp/src/test/java/org/apache/doris/load/loadv2/dpp/SparkDppTest.java
@@ -39,8 +39,8 @@ public class SparkDppTest {
DecimalParser decimalParser = new DecimalParser(etlColumn);
// test max/min
-
Assert.assertTrue(decimalParser.getMaxValue().toString().equals("9.99"));
-
Assert.assertTrue(decimalParser.getMinValue().toString().equals("-9.99"));
+ Assert.assertEquals(decimalParser.getMaxValue().toString(), "9.99");
+ Assert.assertEquals(decimalParser.getMinValue().toString(), "-9.99");
// normal
BigDecimal bigDecimal = new BigDecimal("1.21");
Assert.assertTrue(sparkDpp.validateData(bigDecimal, etlColumn,
decimalParser, RowFactory.create(bigDecimal)));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
