[shardingsphere] branch master updated: Use assertThat to instead of assertEquals. (#21707)

[jianglongtao]

This is an automated email from the ASF dual-hosted git repository.

jianglongtao 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 57c9019e295 Use assertThat to instead of assertEquals. (#21707)
57c9019e295 is described below

commit 57c9019e295b924305b19ab1b538d0b6f7c6d50d
Author: yx9o <yangx_s...@163.com>
AuthorDate: Mon Oct 24 00:05:12 2022 +0800

    Use assertThat to instead of assertEquals. (#21707)
---
 .../standalone/jdbc/JDBCRepositoryTest.java        | 54 +++++++++++-----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git 
a/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java
 
b/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java
index f20d0e53168..b525b8ae740 100644
--- 
a/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java
+++ 
b/mode/type/standalone/repository/provider/jdbc/core/src/test/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/JDBCRepositoryTest.java
@@ -17,20 +17,7 @@
 
 package org.apache.shardingsphere.mode.repository.standalone.jdbc;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.mockConstruction;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import com.zaxxer.hikari.HikariDataSource;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Properties;
 import 
org.apache.shardingsphere.mode.repository.standalone.jdbc.fixture.JDBCRepositoryProviderFixture;
 import org.h2.jdbc.JdbcCallableStatement;
 import org.h2.jdbc.JdbcConnection;
@@ -44,6 +31,19 @@ import org.mockito.Mock;
 import org.mockito.MockedConstruction;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Properties;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mockConstruction;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @RunWith(MockitoJUnitRunner.class)
 public final class JDBCRepositoryTest {
     
@@ -73,7 +73,7 @@ public final class JDBCRepositoryTest {
         this.mockedConstruction = mockConstruction(HikariDataSource.class, 
(mock, context) -> when(mock.getConnection()).thenReturn(mockJdbcConnection));
         when(mockJdbcConnection.createStatement()).thenReturn(mockStatement);
         repository = new JDBCRepository();
-        repository.init(getHikariProperties());
+        repository.init(createProperties());
     }
     
     @After
@@ -95,16 +95,16 @@ public final class JDBCRepositoryTest {
         when(mockPreparedStatement.executeQuery()).thenReturn(mockResultSet);
         when(mockResultSet.next()).thenReturn(true);
         when(mockResultSet.getString(eq("value"))).thenReturn(value);
-        String actualResponse = repository.getDirectly(key);
+        String actual = repository.getDirectly(key);
         verify(mockPreparedStatement).setString(eq(1), eq(key));
-        assertEquals(value, actualResponse);
+        assertThat(actual, is(value));
     }
     
     @Test
     public void assertGetFailure() throws Exception {
         
when(mockJdbcConnection.prepareStatement(eq(fixture.selectByKeySQL()))).thenThrow(new
 SQLException());
-        String actualResponse = repository.getDirectly("key");
-        assertEquals("", actualResponse);
+        String actual = repository.getDirectly("key");
+        assertThat(actual, is(""));
     }
     
     @Test
@@ -128,8 +128,8 @@ public final class JDBCRepositoryTest {
     @Test
     public void assertPersistAndGetChildrenKeysFailure() throws Exception {
         
when(mockJdbcConnection.prepareStatement(eq(fixture.selectByParentKeySQL()))).thenThrow(new
 SQLException());
-        List<String> actualResponse = repository.getChildrenKeys("key");
-        assertEquals(0, actualResponse.size());
+        List<String> actual = repository.getChildrenKeys("key");
+        assertThat(actual.size(), is(0));
     }
     
     @Test
@@ -249,12 +249,12 @@ public final class JDBCRepositoryTest {
         verify(hikariDataSource).close();
     }
     
-    private Properties getHikariProperties() {
-        Properties props = new Properties();
-        props.setProperty("jdbc_url", 
"jdbc:h2:mem:config;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL");
-        props.setProperty("username", "sa");
-        props.setProperty("password", "");
-        props.setProperty("provider", "FIXTURE");
-        return props;
+    private Properties createProperties() {
+        Properties result = new Properties();
+        result.setProperty("jdbc_url", 
"jdbc:h2:mem:config;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL");
+        result.setProperty("username", "sa");
+        result.setProperty("password", "");
+        result.setProperty("provider", "FIXTURE");
+        return result;
     }
 }