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 29f4025 Use assertThat to instead of assertEquals. (#15387)
29f4025 is described below
commit 29f4025ccae72b8eed8f7d1955940533d2d735b4
Author: yx9o <[email protected]>
AuthorDate: Sun Feb 13 12:32:44 2022 +0800
Use assertThat to instead of assertEquals. (#15387)
---
.../NarayanaConfigurationFileGeneratorTest.java | 57 +++++++++++-----------
.../common/drop/DropTrafficRuleHandlerTest.java | 19 ++++----
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transaction-xa-narayana/src/test/java/org/apache/shardingsphere/transaction/xa/narayana/config/NarayanaConfigurationFileGeneratorTest.java
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transacti
[...]
index 895b762..c1d1f99 100644
---
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transaction-xa-narayana/src/test/java/org/apache/shardingsphere/transaction/xa/narayana/config/NarayanaConfigurationFileGeneratorTest.java
+++
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transaction-xa-narayana/src/test/java/org/apache/shardingsphere/transaction/xa/narayana/config/NarayanaConfigurationFileGeneratorTest.java
@@ -29,9 +29,6 @@ import
org.apache.shardingsphere.transaction.rule.TransactionRule;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
@@ -42,6 +39,10 @@ import java.io.InputStream;
import java.util.Optional;
import java.util.Properties;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
public final class NarayanaConfigurationFileGeneratorTest {
private final NarayanaConfigurationFileGenerator
narayanaConfigurationFileGenerator = new NarayanaConfigurationFileGenerator();
@@ -74,7 +75,7 @@ public final class NarayanaConfigurationFileGeneratorTest {
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
InputStream inputStream = new FileInputStream(new
File(ClassLoader.getSystemResource("").getPath(), "jbossts-properties.xml"));
NarayanaConfiguration narayanaConfiguration = (NarayanaConfiguration)
unmarshaller.unmarshal(inputStream);
- assertEquals(26, narayanaConfiguration.getEntries().size());
+ assertThat(narayanaConfiguration.getEntries().size(), is(26));
assertCommitOnePhase(narayanaConfiguration);
assertTransactionSync(narayanaConfiguration);
assertNodeIdentifier(narayanaConfiguration);
@@ -104,35 +105,35 @@ public final class NarayanaConfigurationFileGeneratorTest
{
private void assertCommitOnePhase(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"CoordinatorEnvironmentBean.commitOnePhase".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("YES"));
}
private void assertTransactionSync(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.transactionSync".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("NO"));
}
private void assertNodeIdentifier(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"CoreEnvironmentBean.nodeIdentifier".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("1"));
}
private void assertXaRecoveryNodes(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"JTAEnvironmentBean.xaRecoveryNodes".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("1"));
}
private void assertXaResourceOrphanFilterClassNames(final
NarayanaConfiguration configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"JTAEnvironmentBean.xaResourceOrphanFilterClassNames".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(3, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(3));
assertTrue(entry.get().getValue().contains(JTATransactionLogXAResourceOrphanFilter.class.getName()));
assertTrue(entry.get().getValue().contains(JTANodeNameXAResourceOrphanFilter.class.getName()));
assertTrue(entry.get().getValue().contains(JTAActionStatusServiceXAResourceOrphanFilter.class.getName()));
@@ -141,14 +142,14 @@ public final class NarayanaConfigurationFileGeneratorTest
{
private void assertSocketProcessIdPort(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"CoreEnvironmentBean.socketProcessIdPort".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("0"));
}
private void assertRecoveryModuleClassNames(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"RecoveryEnvironmentBean.recoveryModuleClassNames".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(2, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(2));
assertTrue(entry.get().getValue().contains(AtomicActionRecoveryModule.class.getName()));
assertTrue(entry.get().getValue().contains(XARecoveryModule.class.getName()));
}
@@ -156,119 +157,119 @@ public final class
NarayanaConfigurationFileGeneratorTest {
private void assertExpiryScannerClassNames(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"RecoveryEnvironmentBean.expiryScannerClassNames".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains(ExpiredTransactionStatusManagerScanner.class.getName()));
}
private void assertRecoveryPort(final NarayanaConfiguration configuration)
{
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"RecoveryEnvironmentBean.recoveryPort".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("4712"));
}
private void assertTransactionStatusManagerPort(final
NarayanaConfiguration configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"RecoveryEnvironmentBean.transactionStatusManagerPort".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("0"));
}
private void assertRecoveryListener(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"RecoveryEnvironmentBean.recoveryListener".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("NO"));
}
private void assertRecoveryBackoffPeriod(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"RecoveryEnvironmentBean.recoveryBackoffPeriod".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("1"));
}
private void assertObjectStoreType(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.objectStoreType".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains(JDBCStore.class.getName()));
}
private void assertJdbcAccess(final NarayanaConfiguration configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.jdbcAccess".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains(jdbcAccess));
}
private void assertTablePrefix(final NarayanaConfiguration configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.tablePrefix".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("Action"));
}
private void assertDropTable(final NarayanaConfiguration configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.dropTable".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("true"));
}
private void assertStateStoreJdbcAccess(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.stateStore.jdbcAccess".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains(jdbcAccess));
}
private void assertStateStoreObjectStoreType(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.stateStore.objectStoreType".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains(JDBCStore.class.getName()));
}
private void assertStateStoreTablePrefix(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.stateStore.tablePrefix".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("stateStore"));
}
private void assertStateStoreDropTable(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.stateStore.dropTable".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("true"));
}
private void assertCommunicationStoreObjectStoreType(final
NarayanaConfiguration configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.communicationStore.objectStoreType".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains(JDBCStore.class.getName()));
}
private void assertCommunicationStoreJdbcAccess(final
NarayanaConfiguration configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.communicationStore.jdbcAccess".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains(jdbcAccess));
}
private void assertCommunicationStoreTablePrefix(final
NarayanaConfiguration configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.communicationStore.tablePrefix".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("Communication"));
}
private void assertCommunicationStoreDropTable(final NarayanaConfiguration
configuration) {
Optional<NarayanaConfigEntry> entry =
configuration.getEntries().stream().filter(each ->
"ObjectStoreEnvironmentBean.communicationStore.dropTable".equals(each.getKey())).findFirst();
assertTrue(entry.isPresent());
- assertEquals(1, entry.get().getValue().size());
+ assertThat(entry.get().getValue().size(), is(1));
assertTrue(entry.get().getValue().contains("true"));
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/drop/DropTrafficRuleHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/drop/DropTrafficRuleHandlerTest.java
index aeaee69..6f809b1 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/drop/DropTrafficRuleHandlerTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/drop/DropTrafficRuleHandlerTest.java
@@ -37,7 +37,6 @@ import java.util.Optional;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -81,9 +80,9 @@ public class DropTrafficRuleHandlerTest {
Optional<TrafficRuleConfiguration> ruleConfiguration =
contextManager.getMetaDataContexts().getGlobalRuleMetaData().findRuleConfiguration(TrafficRuleConfiguration.class).stream().findAny();
assertTrue(ruleConfiguration.isPresent());
TrafficRuleConfiguration configuration = ruleConfiguration.get();
- assertEquals(1, configuration.getTrafficStrategies().size());
- assertEquals(1, configuration.getLoadBalancers().size());
- assertEquals(1, configuration.getTrafficAlgorithms().size());
+ assertThat(configuration.getTrafficStrategies().size(), is(1));
+ assertThat(configuration.getLoadBalancers().size(), is(1));
+ assertThat(configuration.getTrafficAlgorithms().size(), is(1));
assertThat(new
ArrayList<>(configuration.getTrafficStrategies()).get(0).getName(),
is("rule_name_2"));
assertNotNull(configuration.getTrafficAlgorithms().get("algorithm_2"));
assertNotNull(configuration.getLoadBalancers().get("load_balancer_2"));
@@ -98,9 +97,9 @@ public class DropTrafficRuleHandlerTest {
Optional<TrafficRuleConfiguration> ruleConfiguration =
contextManager.getMetaDataContexts().getGlobalRuleMetaData().findRuleConfiguration(TrafficRuleConfiguration.class).stream().findAny();
assertTrue(ruleConfiguration.isPresent());
TrafficRuleConfiguration configuration = ruleConfiguration.get();
- assertEquals(1, configuration.getTrafficStrategies().size());
- assertEquals(1, configuration.getLoadBalancers().size());
- assertEquals(1, configuration.getTrafficAlgorithms().size());
+ assertThat(configuration.getTrafficStrategies().size(), is(1));
+ assertThat(configuration.getLoadBalancers().size(), is(1));
+ assertThat(configuration.getTrafficAlgorithms().size(), is(1));
assertThat(new
ArrayList<>(configuration.getTrafficStrategies()).get(0).getName(),
is("rule_name_2"));
assertNotNull(configuration.getTrafficAlgorithms().get("algorithm_2"));
assertNotNull(configuration.getLoadBalancers().get("load_balancer_2"));
@@ -115,9 +114,9 @@ public class DropTrafficRuleHandlerTest {
Optional<TrafficRuleConfiguration> ruleConfiguration =
contextManager.getMetaDataContexts().getGlobalRuleMetaData().findRuleConfiguration(TrafficRuleConfiguration.class).stream().findAny();
assertTrue(ruleConfiguration.isPresent());
TrafficRuleConfiguration configuration = ruleConfiguration.get();
- assertEquals(2, configuration.getTrafficStrategies().size());
- assertEquals(2, configuration.getLoadBalancers().size());
- assertEquals(2, configuration.getTrafficAlgorithms().size());
+ assertThat(configuration.getTrafficStrategies().size(), is(2));
+ assertThat(configuration.getLoadBalancers().size(), is(2));
+ assertThat(configuration.getTrafficAlgorithms().size(), is(2));
}
private Collection<RuleConfiguration> createTrafficRule() {
