This is an automated email from the ASF dual-hosted git repository.
panjuan 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 3f901bf Revise #11476 (#11482)
3f901bf is described below
commit 3f901bfff156f705307278345e16ec860ad2edc1
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jul 24 18:18:02 2021 +0800
Revise #11476 (#11482)
---
.../database/impl/DatabaseDatetimeServiceTest.java | 46 +++++++++++-----------
.../database/impl/TimeServiceFactoryTest.java | 10 +++--
2 files changed, 29 insertions(+), 27 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/impl/DatabaseDatetimeServiceTest.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/impl/DatabaseDatetimeServiceTest.java
index ff3a977..1174471 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/impl/DatabaseDatetimeServiceTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/impl/DatabaseDatetimeServiceTest.java
@@ -18,9 +18,10 @@
package org.apache.shardingsphere.datetime.database.impl;
import org.apache.shardingsphere.infra.datetime.DatetimeService;
-import org.junit.Assert;
-import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -29,26 +30,25 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Date;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class DatabaseDatetimeServiceTest {
-
- private static DataSource dataSource;
-
- private static PreparedStatement preparedStatement;
-
- private static ResultSet resultSet;
-
- private static String sql = "SELECT NOW()";
-
- @BeforeClass
- public static void init() {
- dataSource = mock(DataSource.class);
- preparedStatement = mock(PreparedStatement.class);
- resultSet = mock(ResultSet.class);
- }
-
+
+ @Mock
+ private DataSource dataSource;
+
+ @Mock
+ private PreparedStatement preparedStatement;
+
+ @Mock
+ private ResultSet resultSet;
+
+ private final String sql = "SELECT NOW()";
+
@Test
public void assertMySQLDateTime() throws SQLException {
Connection connection = mock(Connection.class);
@@ -57,17 +57,17 @@ public final class DatabaseDatetimeServiceTest {
when(preparedStatement.executeQuery()).thenReturn(resultSet);
when((Date) resultSet.getObject(1)).thenReturn(new Date());
DatetimeService datetimeService = new
DatabaseDatetimeService(dataSource, sql);
- Assert.assertFalse(datetimeService.isDefault());
- Assert.assertNotNull(datetimeService.getDatetime());
+ assertFalse(datetimeService.isDefault());
+ assertNotNull(datetimeService.getDatetime());
}
-
+
@Test
public void assertNoExceptionInDateTimeService() throws SQLException {
Connection connection = mock(Connection.class);
when(dataSource.getConnection()).thenReturn(connection);
when(connection.prepareStatement(sql)).thenThrow(new SQLException());
DatetimeService datetimeService = new
DatabaseDatetimeService(dataSource, sql);
- Assert.assertFalse(datetimeService.isDefault());
- Assert.assertNotNull(datetimeService.getDatetime());
+ assertFalse(datetimeService.isDefault());
+ assertNotNull(datetimeService.getDatetime());
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/impl/TimeServiceFactoryTest.java
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/impl/TimeServiceFactoryTest.java
index d5859e5..b653411 100644
---
a/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/impl/TimeServiceFactoryTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-datetime/shardingsphere-infra-datetime-type/shardingsphere-database-datetime/src/test/java/org/apache/shardingsphere/datetime/database/impl/TimeServiceFactoryTest.java
@@ -19,16 +19,18 @@ package org.apache.shardingsphere.datetime.database.impl;
import org.apache.shardingsphere.datetime.database.PropertiesUtils;
import org.apache.shardingsphere.infra.datetime.DatetimeService;
-import org.junit.Assert;
import org.junit.Test;
-public final class TimeServiceFactoryTest {
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+public final class TimeServiceFactoryTest {
+
@Test
public void assertCreateDateTimeService() {
PropertiesUtils.createProperties("com.mysql.jdbc.Driver", null);
DatetimeService datetimeService =
TimeServiceFactory.createTimeService();
- Assert.assertFalse(datetimeService.isDefault());
- Assert.assertTrue(PropertiesUtils.remove());
+ assertFalse(datetimeService.isDefault());
+ assertTrue(PropertiesUtils.remove());
}
}
