This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 8014e7151e8 Unify assertThat equalTo to is (#36258)
8014e7151e8 is described below
commit 8014e7151e8019d5743e221ac695dfd20a04e831
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Aug 11 21:33:03 2025 +0800
Unify assertThat equalTo to is (#36258)
---
.../proxy/ExecuteLatencyHistogramAdviceTest.java | 4 +-
.../test/natived/commons/TestShardingService.java | 57 ++++++++++------------
.../test/natived/jdbc/features/EncryptTest.java | 18 +++----
.../test/natived/jdbc/features/MaskTest.java | 19 +++-----
.../test/natived/jdbc/features/ShadowTest.java | 15 +++---
5 files changed, 53 insertions(+), 60 deletions(-)
diff --git
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/proxy/ExecuteLatencyHistogramAdviceTest.java
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/proxy/ExecuteLatencyHistogramAdviceTest.java
index c28299228f0..d0723c94ec7 100644
---
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/proxy/ExecuteLatencyHistogramAdviceTest.java
+++
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/proxy/ExecuteLatencyHistogramAdviceTest.java
@@ -33,8 +33,8 @@ import java.util.Collections;
import java.util.concurrent.TimeUnit;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.is;
import static org.mockito.Mockito.mock;
class ExecuteLatencyHistogramAdviceTest {
@@ -67,6 +67,6 @@ class ExecuteLatencyHistogramAdviceTest {
advice.beforeMethod(targetObject, method, args, "FIXTURE");
Awaitility.await().pollDelay(20L, TimeUnit.MILLISECONDS).until(() ->
true);
advice.afterMethod(targetObject, method, args, null, "FIXTURE");
- assertThat(Double.parseDouble(MetricsCollectorRegistry.get(config,
"FIXTURE").toString()), equalTo(0D));
+ assertThat(Double.parseDouble(MetricsCollectorRegistry.get(config,
"FIXTURE").toString()), is(0D));
}
}
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/commons/TestShardingService.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/commons/TestShardingService.java
index db5713c4512..ca22ad7237d 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/commons/TestShardingService.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/commons/TestShardingService.java
@@ -30,17 +30,17 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.LongStream;
-import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.empty;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@Getter
public final class TestShardingService {
@@ -60,7 +60,7 @@ public final class TestShardingService {
/**
* Process success.
*
- * @throws SQLException An exception that provides information on a
database access error or other errors.
+ * @throws SQLException An exception that provides information on a
database access error or other errors
*/
public void processSuccess() throws SQLException {
processSuccessWithoutTransactions();
@@ -70,15 +70,15 @@ public final class TestShardingService {
/**
* Process success in ClickHouse. ClickHouse JDBC Driver does not support
the use of transactions.
*
- * @throws SQLException An exception that provides information on a
database access error or other errors.
+ * @throws SQLException An exception that provides information on a
database access error or other errors
*/
public void processSuccessInClickHouse() throws SQLException {
final Collection<Long> orderIds =
insertData(Statement.NO_GENERATED_KEYS);
extracted();
deleteDataInClickHouse(orderIds);
- assertThat(orderRepository.selectAll(),
equalTo(Collections.emptyList()));
- assertThat(orderItemRepository.selectAll(),
equalTo(Collections.emptyList()));
- assertThat(addressRepository.selectAll(),
equalTo(Collections.emptyList()));
+ assertTrue(orderRepository.selectAll().isEmpty());
+ assertTrue(orderItemRepository.selectAll().isEmpty());
+ assertTrue(addressRepository.selectAll().isEmpty());
}
private void extracted() throws SQLException {
@@ -91,18 +91,18 @@ public final class TestShardingService {
assertThat(orders.stream().map(Order::getAddressId).collect(Collectors.toList()),
containsInAnyOrder(1L, 2L, 3L, 4L, 5L, 6L, 7L, 8L, 9L, 10L));
assertThat(orders.stream().map(Order::getStatus).collect(Collectors.toList()),
- equalTo(IntStream.range(1, 11).mapToObj(i ->
"INSERT_TEST").collect(Collectors.toList())));
+ is(IntStream.range(1, 11).mapToObj(i ->
"INSERT_TEST").collect(Collectors.toList())));
Collection<OrderItem> orderItems = orderItemRepository.selectAll();
assertThat(orderItems.stream().map(OrderItem::getOrderItemId).collect(Collectors.toList()),
not(empty()));
assertThat(orderItems.stream().map(OrderItem::getOrderId).collect(Collectors.toList()),
not(empty()));
assertThat(orderItems.stream().map(OrderItem::getUserId).collect(Collectors.toList()),
containsInAnyOrder(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
assertThat(orderItems.stream().map(OrderItem::getPhone).collect(Collectors.toList()),
- equalTo(IntStream.range(1, 11).mapToObj(i ->
"13800000001").collect(Collectors.toList())));
+ is(IntStream.range(1, 11).mapToObj(i ->
"13800000001").collect(Collectors.toList())));
assertThat(orderItems.stream().map(OrderItem::getStatus).collect(Collectors.toList()),
- equalTo(IntStream.range(1, 11).mapToObj(i ->
"INSERT_TEST").collect(Collectors.toList())));
+ is(IntStream.range(1, 11).mapToObj(i ->
"INSERT_TEST").collect(Collectors.toList())));
assertThat(new HashSet<>(addressRepository.selectAll()),
- equalTo(LongStream.range(1L, 11L).mapToObj(each -> new
Address(each, "address_test_" + each)).collect(Collectors.toSet())));
+ is(LongStream.range(1L, 11L).mapToObj(each -> new
Address(each, "address_test_" + each)).collect(Collectors.toSet())));
}
/**
@@ -112,14 +112,14 @@ public final class TestShardingService {
* TODO It looks like HiveServer2 insert statements are inserted out of
order. Waiting for further investigation.
* The result of the insert is not currently asserted.
*
- * @throws SQLException An exception that provides information on a
database access error or other errors.
+ * @throws SQLException An exception that provides information on a
database access error or other errors
*/
public void processSuccessInHive() throws SQLException {
final Collection<Long> orderIds =
insertData(Statement.RETURN_GENERATED_KEYS);
deleteData(orderIds);
- assertThat(orderRepository.selectAll(),
equalTo(Collections.emptyList()));
- assertThat(orderItemRepository.selectAll(),
equalTo(Collections.emptyList()));
- assertThat(addressRepository.selectAll(),
equalTo(Collections.emptyList()));
+ assertTrue(orderRepository.selectAll().isEmpty());
+ assertTrue(orderItemRepository.selectAll().isEmpty());
+ assertTrue(addressRepository.selectAll().isEmpty());
}
/**
@@ -136,20 +136,17 @@ public final class TestShardingService {
final Collection<Long> orderIds =
insertData(Statement.RETURN_GENERATED_KEYS);
extracted();
deleteData(orderIds);
- assertThat(orderRepository.selectAll(),
equalTo(Collections.emptyList()));
- assertThat(orderItemRepository.selectAll(),
equalTo(Collections.emptyList()));
- assertThat(addressRepository.selectAll(),
equalTo(Collections.emptyList()));
+ assertTrue(orderRepository.selectAll().isEmpty());
+ assertTrue(orderItemRepository.selectAll().isEmpty());
+ assertTrue(addressRepository.selectAll().isEmpty());
}
/**
* Insert data.
*
- * @param autoGeneratedKeys a flag indicating whether auto-generated keys
- * should be returned; one of
- * {@code Statement.RETURN_GENERATED_KEYS} or
- * {@code Statement.NO_GENERATED_KEYS}
- * @return orderId of the insert statement.
- * @throws SQLException An exception that provides information on a
database access error or other errors.
+ * @param autoGeneratedKeys a flag indicating whether auto-generated keys
should be returned; one of {@code Statement.RETURN_GENERATED_KEYS} or {@code
Statement.NO_GENERATED_KEYS}
+ * @return orderId of the insert statement
+ * @throws SQLException An exception that provides information on a
database access error or other errors
*/
public Collection<Long> insertData(final int autoGeneratedKeys) throws
SQLException {
Collection<Long> result = new ArrayList<>(10);
@@ -176,8 +173,8 @@ public final class TestShardingService {
/**
* Delete data.
*
- * @param orderIds orderId of the insert statement.
- * @throws SQLException An exception that provides information on a
database access error or other errors.
+ * @param orderIds orderId of the insert statement
+ * @throws SQLException An exception that provides information on a
database access error or other errors
*/
public void deleteData(final Collection<Long> orderIds) throws
SQLException {
long count = 1L;
@@ -191,8 +188,8 @@ public final class TestShardingService {
/**
* Delete data in ClickHouse.
*
- * @param orderIds orderId of the insert statement.
- * @throws SQLException An exception that provides information on a
database access error or other errors.
+ * @param orderIds orderId of the insert statement
+ * @throws SQLException An exception that provides information on a
database access error or other errors
*/
public void deleteDataInClickHouse(final Collection<Long> orderIds) throws
SQLException {
long count = 1L;
@@ -206,7 +203,7 @@ public final class TestShardingService {
/**
* Clean environment.
*
- * @throws SQLException An exception that provides information on a
database access error or other errors.
+ * @throws SQLException An exception that provides information on a
database access error or other errors
*/
public void cleanEnvironment() throws SQLException {
orderRepository.dropTableInMySQL();
@@ -217,7 +214,7 @@ public final class TestShardingService {
/**
* Clean environment in Firebird.
*
- * @throws SQLException An exception that provides information on a
database access error or other errors.
+ * @throws SQLException An exception that provides information on a
database access error or other errors
*/
public void cleanEnvironmentInFirebird() throws SQLException {
orderRepository.dropTableInFirebird();
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/EncryptTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/EncryptTest.java
index 9319e9ed848..29f8319b5e5 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/EncryptTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/EncryptTest.java
@@ -37,8 +37,9 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.LongStream;
-import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
class EncryptTest {
@@ -80,16 +81,13 @@ class EncryptTest {
private void processSuccess() throws SQLException {
final Collection<Long> orderIds = insertData();
- assertThat(orderRepository.selectAll(),
- equalTo(IntStream.range(1, 11).mapToObj(each -> new
Order(each, each % 2, each, each,
"INSERT_TEST")).collect(Collectors.toList())));
- assertThat(orderItemRepository.selectAll(),
- equalTo(IntStream.range(1, 11).mapToObj(each -> new
OrderItem(each, each, each, "13800000001",
"INSERT_TEST")).collect(Collectors.toList())));
- assertThat(addressRepository.selectAll(),
- equalTo(LongStream.range(1L, 11L).mapToObj(each -> new
Address(each, "address_test_" + each)).collect(Collectors.toList())));
+ assertThat(orderRepository.selectAll(), is(IntStream.range(1,
11).mapToObj(each -> new Order(each, each % 2, each, each,
"INSERT_TEST")).collect(Collectors.toList())));
+ assertThat(orderItemRepository.selectAll(), is(IntStream.range(1,
11).mapToObj(each -> new OrderItem(each, each, each, "13800000001",
"INSERT_TEST")).collect(Collectors.toList())));
+ assertThat(addressRepository.selectAll(), is(LongStream.range(1L,
11L).mapToObj(each -> new Address(each, "address_test_" +
each)).collect(Collectors.toList())));
deleteData(orderIds);
- assertThat(orderRepository.selectAll(), equalTo(new ArrayList<>()));
- assertThat(orderItemRepository.selectAll(), equalTo(new
ArrayList<>()));
- assertThat(addressRepository.selectAll(), equalTo(new ArrayList<>()));
+ assertTrue(orderRepository.selectAll().isEmpty());
+ assertTrue(orderItemRepository.selectAll().isEmpty());
+ assertTrue(addressRepository.selectAll().isEmpty());
}
private Collection<Long> insertData() throws SQLException {
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/MaskTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/MaskTest.java
index a7d1bb57485..5aee0380a7a 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/MaskTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/MaskTest.java
@@ -33,13 +33,13 @@ import javax.sql.DataSource;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.LongStream;
-import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
class MaskTest {
@@ -81,16 +81,13 @@ class MaskTest {
private void processSuccess() throws SQLException {
final Collection<Long> orderIds = insertData();
- assertThat(orderRepository.selectAll(),
- equalTo(IntStream.range(1, 11).mapToObj(each -> new
Order(each, each % 2, each, each,
"INSERT_TEST")).collect(Collectors.toList())));
- assertThat(orderItemRepository.selectAll(),
- equalTo(IntStream.range(1, 11).mapToObj(each -> new
OrderItem(each, each, each, "138****0001",
"INSERT_TEST")).collect(Collectors.toList())));
- assertThat(addressRepository.selectAll(),
- equalTo(LongStream.range(1L, 11L).mapToObj(each -> new
Address(each, "address_test_" + each)).collect(Collectors.toList())));
+ assertThat(orderRepository.selectAll(), is(IntStream.range(1,
11).mapToObj(each -> new Order(each, each % 2, each, each,
"INSERT_TEST")).collect(Collectors.toList())));
+ assertThat(orderItemRepository.selectAll(), is(IntStream.range(1,
11).mapToObj(each -> new OrderItem(each, each, each, "138****0001",
"INSERT_TEST")).collect(Collectors.toList())));
+ assertThat(addressRepository.selectAll(), is(LongStream.range(1L,
11L).mapToObj(each -> new Address(each, "address_test_" +
each)).collect(Collectors.toList())));
deleteData(orderIds);
- assertThat(orderRepository.selectAll(),
equalTo(Collections.emptyList()));
- assertThat(orderItemRepository.selectAll(),
equalTo(Collections.emptyList()));
- assertThat(addressRepository.selectAll(),
equalTo(Collections.emptyList()));
+ assertTrue(orderRepository.selectAll().isEmpty());
+ assertTrue(orderItemRepository.selectAll().isEmpty());
+ assertTrue(addressRepository.selectAll().isEmpty());
}
private Collection<Long> insertData() throws SQLException {
diff --git
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShadowTest.java
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShadowTest.java
index 9d9ce64919e..405040bca69 100644
---
a/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShadowTest.java
+++
b/test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/features/ShadowTest.java
@@ -38,8 +38,9 @@ import java.util.Collections;
import java.util.stream.Collectors;
import java.util.stream.LongStream;
-import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
class ShadowTest {
@@ -83,7 +84,7 @@ class ShadowTest {
private void processSuccess() throws SQLException {
final Collection<Long> orderIds = insertData();
- assertThat(selectAll(), equalTo(Arrays.asList(
+ assertThat(selectAll(), is(Arrays.asList(
new Order(1L, 0, 2, 2L, "INSERT_TEST"),
new Order(2L, 0, 4, 4L, "INSERT_TEST"),
new Order(3L, 0, 6, 6L, "INSERT_TEST"),
@@ -94,7 +95,7 @@ class ShadowTest {
new Order(3L, 1, 5, 5L, "INSERT_TEST"),
new Order(4L, 1, 7, 7L, "INSERT_TEST"),
new Order(5L, 1, 9, 9L, "INSERT_TEST"))));
- assertThat(orderItemRepository.selectAll(), equalTo(Arrays.asList(
+ assertThat(orderItemRepository.selectAll(), is(Arrays.asList(
new OrderItem(1L, 1L, 1, "13800000001", "INSERT_TEST"),
new OrderItem(2L, 1L, 2, "13800000001", "INSERT_TEST"),
new OrderItem(3L, 2L, 3, "13800000001", "INSERT_TEST"),
@@ -106,11 +107,11 @@ class ShadowTest {
new OrderItem(9L, 5L, 9, "13800000001", "INSERT_TEST"),
new OrderItem(10L, 5L, 10, "13800000001", "INSERT_TEST"))));
assertThat(addressRepository.selectAll(),
- equalTo(LongStream.range(1L, 11L).mapToObj(each -> new
Address(each, "address_test_" + each)).collect(Collectors.toList())));
+ is(LongStream.range(1L, 11L).mapToObj(each -> new
Address(each, "address_test_" + each)).collect(Collectors.toList())));
deleteData(orderIds);
- assertThat(selectAll(), equalTo(Collections.singletonList(new
Order(1L, 0, 2, 2L, "INSERT_TEST"))));
- assertThat(orderItemRepository.selectAll(),
equalTo(Collections.emptyList()));
- assertThat(addressRepository.selectAll(),
equalTo(Collections.emptyList()));
+ assertThat(selectAll(), is(Collections.singletonList(new Order(1L, 0,
2, 2L, "INSERT_TEST"))));
+ assertTrue(orderItemRepository.selectAll().isEmpty());
+ assertTrue(addressRepository.selectAll().isEmpty());
}
private Collection<Long> insertData() throws SQLException {
