You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2021/08/10 07:58:49 UTC
[shardingsphere] branch master updated: Use assertThat to instead
of assertEquals (#11738)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 5c35601 Use assertThat to instead of assertEquals (#11738)
5c35601 is described below
commit 5c356010de8ecfbc8c704710ce0a766a16b4e292
Author: yx9o <ya...@163.com>
AuthorDate: Tue Aug 10 15:58:23 2021 +0800
Use assertThat to instead of assertEquals (#11738)
---
.../ProcessRegistrySubscriberTestNoMock.java | 32 +++++++++++-----------
.../sql/federate/FederateJDBCExecutorTest.java | 5 ++--
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/process/ProcessRegistrySubscriberTestNoMock.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/process/ProcessRegistrySubscriberTestNoMock.java
index 8339639..d5d3eb7 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/process/ProcessRegistrySubscriberTestNoMock.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/process/ProcessRegistrySubscriberTestNoMock.java
@@ -41,9 +41,10 @@ import org.apache.shardingsphere.infra.metadata.user.Grantee;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public final class ProcessRegistrySubscriberTestNoMock {
@@ -92,19 +93,19 @@ public final class ProcessRegistrySubscriberTestNoMock {
String executeProcessText = repository.get(ProcessNode.getExecutionPath(executionID));
assertNotNull(executeProcessText);
YamlExecuteProcessContext yamlExecuteProcessContext = YamlEngine.unmarshal(executeProcessText, YamlExecuteProcessContext.class);
- assertEquals(executionID, yamlExecuteProcessContext.getExecutionID());
+ assertThat(yamlExecuteProcessContext.getExecutionID(), is(executionID));
assertNotNull(yamlExecuteProcessContext.getStartTimeMillis());
- assertEquals(executeProcessContext.getStartTimeMillis(), yamlExecuteProcessContext.getStartTimeMillis().longValue());
- assertEquals("sharding_db", yamlExecuteProcessContext.getSchemaName());
- assertEquals("sharding", yamlExecuteProcessContext.getUsername());
- assertEquals("127.0.0.1", yamlExecuteProcessContext.getHostname());
- assertEquals("sql1", yamlExecuteProcessContext.getSql());
+ assertThat(yamlExecuteProcessContext.getStartTimeMillis().longValue(), is(executeProcessContext.getStartTimeMillis()));
+ assertThat(yamlExecuteProcessContext.getSchemaName(), is("sharding_db"));
+ assertThat(yamlExecuteProcessContext.getUsername(), is("sharding"));
+ assertThat(yamlExecuteProcessContext.getHostname(), is("127.0.0.1"));
+ assertThat(yamlExecuteProcessContext.getSql(), is("sql1"));
Collection<YamlExecuteProcessUnit> unitStatuses = yamlExecuteProcessContext.getUnitStatuses();
- assertEquals(1, unitStatuses.size());
+ assertThat(unitStatuses.size(), is(1));
YamlExecuteProcessUnit yamlExecuteProcessUnit = unitStatuses.iterator().next();
- assertEquals(ExecuteProcessConstants.EXECUTE_STATUS_START, yamlExecuteProcessUnit.getStatus());
+ assertThat(yamlExecuteProcessUnit.getStatus(), is(ExecuteProcessConstants.EXECUTE_STATUS_START));
}
-
+
private void assertReportExecuteProcessUnit(final ExecuteProcessConstants processConstants) {
String executionID = executeProcessContext.getExecutionID();
ExecuteProcessUnitReportEvent event = new ExecuteProcessUnitReportEvent(executionID, new ExecuteProcessUnit(executionUnit, processConstants));
@@ -112,9 +113,9 @@ public final class ProcessRegistrySubscriberTestNoMock {
String executeProcessText = repository.get(ProcessNode.getExecutionPath(executionID));
assertNotNull(executeProcessText);
YamlExecuteProcessContext yamlExecuteProcessContext = YamlEngine.unmarshal(executeProcessText, YamlExecuteProcessContext.class);
- assertEquals(executionID, yamlExecuteProcessContext.getExecutionID());
+ assertThat(yamlExecuteProcessContext.getExecutionID(), is(executionID));
YamlExecuteProcessUnit yamlExecuteProcessUnit = yamlExecuteProcessContext.getUnitStatuses().iterator().next();
- assertEquals(processConstants, yamlExecuteProcessUnit.getStatus());
+ assertThat(yamlExecuteProcessUnit.getStatus(), is(processConstants));
}
private void assertReportExecuteProcess(final ExecuteProcessConstants processConstants) {
@@ -122,15 +123,14 @@ public final class ProcessRegistrySubscriberTestNoMock {
ExecuteProcessReportEvent event = new ExecuteProcessReportEvent(executionID);
subscriber.reportExecuteProcess(event);
String executeProcessText = repository.get(ProcessNode.getExecutionPath(executionID));
- if (processConstants == ExecuteProcessConstants.EXECUTE_STATUS_DONE) {
+ if (ExecuteProcessConstants.EXECUTE_STATUS_DONE == processConstants) {
assertNull(executeProcessText);
} else {
assertNotNull(executeProcessText);
YamlExecuteProcessContext yamlExecuteProcessContext = YamlEngine.unmarshal(executeProcessText, YamlExecuteProcessContext.class);
- assertEquals(executionID, yamlExecuteProcessContext.getExecutionID());
+ assertThat(yamlExecuteProcessContext.getExecutionID(), is(executionID));
YamlExecuteProcessUnit yamlExecuteProcessUnit = yamlExecuteProcessContext.getUnitStatuses().iterator().next();
- assertEquals(processConstants, yamlExecuteProcessUnit.getStatus());
+ assertThat(yamlExecuteProcessUnit.getStatus(), is(processConstants));
}
}
-
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java
index e141b51..da152d4 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java
@@ -55,7 +55,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
@RunWith(MockitoJUnitRunner.class)
public final class FederateJDBCExecutorTest {
@@ -92,7 +93,7 @@ public final class FederateJDBCExecutorTest {
+ " EnumerableTableScan(table=[[federate_jdbc,t_user_info]])";
String expected = temp.replaceAll("\\s*", "");
String actual = relNode.explain().replaceAll("\\s*", "");
- assertEquals(expected, actual);
+ assertThat(actual, is(expected));
}
private Map<String, List<String>> initializeTableMap() {