From cd8e8583d80f003a59695df9824ad938d3370073 Mon Sep 17 00:00:00 2001 From: "shalk(xiao kun)" Date: Mon, 17 Jun 2024 14:18:32 +0800 Subject: [PATCH] upgrade module naocs-persistence from junit4 to junit5 (#12228) --- .../ConditionDistributedEmbedStorageTest.java | 31 ++--- .../ConditionOnEmbeddedStorageTest.java | 24 ++-- .../ConditionOnExternalStorageTest.java | 24 ++-- .../ConditionStandaloneEmbedStorageTest.java | 31 ++--- .../ClusterExternalStorageTest.java | 62 +++++----- .../DataSourcePoolPropertiesTest.java | 14 +-- .../datasource/DynamicDataSourceTest.java | 25 +++-- .../ExternalDataSourcePropertiesTest.java | 93 ++++++++------- .../ExternalDataSourceServiceImplTest.java | 53 ++++----- .../LocalDataSourceServiceImplTest.java | 33 +++--- .../StandaloneExternalStorageTest.java | 62 +++++----- .../embedded/operate/MockConfigInfo.java | 4 +- .../StandaloneDatabaseOperateImplTest.java | 106 +++++++++--------- .../utils/ConnectionCheckUtilTest.java | 21 ++-- .../persistence/utils/DerbyUtilsTest.java | 11 +- .../utils/PersistenceExecutorTest.java | 11 +- 16 files changed, 315 insertions(+), 290 deletions(-) diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionDistributedEmbedStorageTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionDistributedEmbedStorageTest.java index 37f7eb95391..6c1e62a96e1 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionDistributedEmbedStorageTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionDistributedEmbedStorageTest.java @@ -18,18 +18,18 @@ import com.alibaba.nacos.persistence.configuration.DatasourceConfiguration; import com.alibaba.nacos.sys.env.EnvUtil; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.Mockito; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; -public class ConditionDistributedEmbedStorageTest { - - private ConditionDistributedEmbedStorage conditionDistributedEmbedStorage; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class ConditionDistributedEmbedStorageTest { @Mock ConditionContext context; @@ -37,35 +37,36 @@ public class ConditionDistributedEmbedStorageTest { @Mock AnnotatedTypeMetadata metadata; - @Before - public void init() { + private ConditionDistributedEmbedStorage conditionDistributedEmbedStorage; + + @BeforeEach + void init() { conditionDistributedEmbedStorage = new ConditionDistributedEmbedStorage(); } @Test - public void testMatches() { - MockedStatic propertyUtilMockedStatic = Mockito - .mockStatic(DatasourceConfiguration.class); + void testMatches() { + MockedStatic propertyUtilMockedStatic = Mockito.mockStatic(DatasourceConfiguration.class); MockedStatic envUtilMockedStatic = Mockito.mockStatic(EnvUtil.class); propertyUtilMockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(true); envUtilMockedStatic.when(EnvUtil::getStandaloneMode).thenReturn(true); - Assert.assertFalse(conditionDistributedEmbedStorage.matches(context, metadata)); + assertFalse(conditionDistributedEmbedStorage.matches(context, metadata)); Mockito.when(DatasourceConfiguration.isEmbeddedStorage()).thenReturn(true); Mockito.when(EnvUtil.getStandaloneMode()).thenReturn(false); propertyUtilMockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(true); envUtilMockedStatic.when(EnvUtil::getStandaloneMode).thenReturn(false); - Assert.assertTrue(conditionDistributedEmbedStorage.matches(context, metadata)); + assertTrue(conditionDistributedEmbedStorage.matches(context, metadata)); propertyUtilMockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(false); envUtilMockedStatic.when(EnvUtil::getStandaloneMode).thenReturn(true); - Assert.assertFalse(conditionDistributedEmbedStorage.matches(context, metadata)); + assertFalse(conditionDistributedEmbedStorage.matches(context, metadata)); propertyUtilMockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(false); envUtilMockedStatic.when(EnvUtil::getStandaloneMode).thenReturn(false); - Assert.assertFalse(conditionDistributedEmbedStorage.matches(context, metadata)); + assertFalse(conditionDistributedEmbedStorage.matches(context, metadata)); propertyUtilMockedStatic.close(); envUtilMockedStatic.close(); diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionOnEmbeddedStorageTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionOnEmbeddedStorageTest.java index 6aa9523bb4b..2d16e8b9e2f 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionOnEmbeddedStorageTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionOnEmbeddedStorageTest.java @@ -17,18 +17,18 @@ package com.alibaba.nacos.persistence.configuration.condition; import com.alibaba.nacos.persistence.configuration.DatasourceConfiguration; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.Mockito; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; -public class ConditionOnEmbeddedStorageTest { - - private ConditionOnEmbeddedStorage conditionOnEmbeddedStorage; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class ConditionOnEmbeddedStorageTest { @Mock ConditionContext context; @@ -36,19 +36,21 @@ public class ConditionOnEmbeddedStorageTest { @Mock AnnotatedTypeMetadata metadata; - @Before - public void init() { + private ConditionOnEmbeddedStorage conditionOnEmbeddedStorage; + + @BeforeEach + void init() { conditionOnEmbeddedStorage = new ConditionOnEmbeddedStorage(); } @Test - public void testMatches() { + void testMatches() { MockedStatic mockedStatic = Mockito.mockStatic(DatasourceConfiguration.class); mockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(true); - Assert.assertTrue(conditionOnEmbeddedStorage.matches(context, metadata)); + assertTrue(conditionOnEmbeddedStorage.matches(context, metadata)); mockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(false); - Assert.assertFalse(conditionOnEmbeddedStorage.matches(context, metadata)); + assertFalse(conditionOnEmbeddedStorage.matches(context, metadata)); mockedStatic.close(); } diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionOnExternalStorageTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionOnExternalStorageTest.java index b4f0b7b585f..a281341ff86 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionOnExternalStorageTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionOnExternalStorageTest.java @@ -17,18 +17,18 @@ package com.alibaba.nacos.persistence.configuration.condition; import com.alibaba.nacos.persistence.configuration.DatasourceConfiguration; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.Mockito; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; -public class ConditionOnExternalStorageTest { - - private ConditionOnExternalStorage conditionOnExternalStorage; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class ConditionOnExternalStorageTest { @Mock ConditionContext context; @@ -36,20 +36,22 @@ public class ConditionOnExternalStorageTest { @Mock AnnotatedTypeMetadata metadata; - @Before - public void init() { + private ConditionOnExternalStorage conditionOnExternalStorage; + + @BeforeEach + void init() { conditionOnExternalStorage = new ConditionOnExternalStorage(); } @Test - public void testMatches() { + void testMatches() { MockedStatic mockedStatic = Mockito.mockStatic(DatasourceConfiguration.class); mockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(true); - Assert.assertFalse(conditionOnExternalStorage.matches(context, metadata)); + assertFalse(conditionOnExternalStorage.matches(context, metadata)); mockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(false); - Assert.assertTrue(conditionOnExternalStorage.matches(context, metadata)); + assertTrue(conditionOnExternalStorage.matches(context, metadata)); mockedStatic.close(); } diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionStandaloneEmbedStorageTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionStandaloneEmbedStorageTest.java index dd88bcd45a0..bb3f7541c94 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionStandaloneEmbedStorageTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConditionStandaloneEmbedStorageTest.java @@ -18,18 +18,18 @@ import com.alibaba.nacos.persistence.configuration.DatasourceConfiguration; import com.alibaba.nacos.sys.env.EnvUtil; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.Mockito; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; -public class ConditionStandaloneEmbedStorageTest { - - private ConditionStandaloneEmbedStorage conditionStandaloneEmbedStorage; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class ConditionStandaloneEmbedStorageTest { @Mock ConditionContext context; @@ -37,32 +37,33 @@ public class ConditionStandaloneEmbedStorageTest { @Mock AnnotatedTypeMetadata metadata; - @Before - public void init() { + private ConditionStandaloneEmbedStorage conditionStandaloneEmbedStorage; + + @BeforeEach + void init() { conditionStandaloneEmbedStorage = new ConditionStandaloneEmbedStorage(); } @Test - public void testMatches() { - MockedStatic propertyUtilMockedStatic = Mockito - .mockStatic(DatasourceConfiguration.class); + void testMatches() { + MockedStatic propertyUtilMockedStatic = Mockito.mockStatic(DatasourceConfiguration.class); MockedStatic envUtilMockedStatic = Mockito.mockStatic(EnvUtil.class); propertyUtilMockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(true); envUtilMockedStatic.when(EnvUtil::getStandaloneMode).thenReturn(true); - Assert.assertTrue(conditionStandaloneEmbedStorage.matches(context, metadata)); + assertTrue(conditionStandaloneEmbedStorage.matches(context, metadata)); propertyUtilMockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(true); envUtilMockedStatic.when(EnvUtil::getStandaloneMode).thenReturn(false); - Assert.assertFalse(conditionStandaloneEmbedStorage.matches(context, metadata)); + assertFalse(conditionStandaloneEmbedStorage.matches(context, metadata)); propertyUtilMockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(false); envUtilMockedStatic.when(EnvUtil::getStandaloneMode).thenReturn(true); - Assert.assertFalse(conditionStandaloneEmbedStorage.matches(context, metadata)); + assertFalse(conditionStandaloneEmbedStorage.matches(context, metadata)); propertyUtilMockedStatic.when(DatasourceConfiguration::isEmbeddedStorage).thenReturn(false); envUtilMockedStatic.when(EnvUtil::getStandaloneMode).thenReturn(false); - Assert.assertFalse(conditionStandaloneEmbedStorage.matches(context, metadata)); + assertFalse(conditionStandaloneEmbedStorage.matches(context, metadata)); propertyUtilMockedStatic.close(); envUtilMockedStatic.close(); diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ClusterExternalStorageTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ClusterExternalStorageTest.java index 439cf6042e0..be9b78a7177 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ClusterExternalStorageTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ClusterExternalStorageTest.java @@ -20,27 +20,31 @@ import com.alibaba.nacos.persistence.constants.PersistenceConstant; import com.alibaba.nacos.sys.env.Constants; import com.alibaba.nacos.sys.env.EnvUtil; -import org.junit.Assert; -import org.junit.Before; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.MethodSorters; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.MethodName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.mock.env.MockEnvironment; import org.springframework.test.util.ReflectionTestUtils; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * ClusterExternalStorage unit test. * * @author Long Yu * @since 2.2.0 */ -@RunWith(MockitoJUnitRunner.class) -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class ClusterExternalStorageTest { +@ExtendWith(MockitoExtension.class) +@TestMethodOrder(MethodName.class) +class ClusterExternalStorageTest { + + DatasourceConfiguration datasourceConfig; @InjectMocks private DynamicDataSource dataSource; @@ -53,10 +57,8 @@ public class ClusterExternalStorageTest { @Mock private ExternalDataSourceServiceImpl basicDataSourceService; - DatasourceConfiguration datasourceConfig; - - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() throws Exception { environment = new MockEnvironment(); EnvUtil.setEnvironment(environment); datasourceConfig = new DatasourceConfiguration(); @@ -67,7 +69,7 @@ public void setUp() throws Exception { } @Test - public void test005WithClusterAndNullDatabase() { + void test005WithClusterAndNullDatabase() { // 模拟设置环境05：指定集群，未指定数据库，UseExternalDB是true，数据库类型是"" System.setProperty(Constants.STANDALONE_MODE_PROPERTY_NAME, "false"); environment.setProperty(PersistenceConstant.DATASOURCE_PLATFORM_PROPERTY_OLD, ""); @@ -77,13 +79,13 @@ public void test005WithClusterAndNullDatabase() { // 模拟初始化 datasourceConfig.initialize(null); - Assert.assertFalse(EnvUtil.getStandaloneMode()); - Assert.assertTrue(DatasourceConfiguration.isUseExternalDB()); - Assert.assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); + assertFalse(EnvUtil.getStandaloneMode()); + assertTrue(DatasourceConfiguration.isUseExternalDB()); + assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); } @Test - public void test006WithClusterAndMysqlDatabase() { + void test006WithClusterAndMysqlDatabase() { // 模拟设置环境06：指定集群，指定数据库mysql，UseExternalDB是true，数据库类型是mysql System.setProperty(Constants.STANDALONE_MODE_PROPERTY_NAME, "false"); environment.setProperty(PersistenceConstant.DATASOURCE_PLATFORM_PROPERTY_OLD, "mysql"); @@ -93,13 +95,13 @@ public void test006WithClusterAndMysqlDatabase() { // 模拟初始化 datasourceConfig.initialize(null); - Assert.assertFalse(EnvUtil.getStandaloneMode()); - Assert.assertTrue(DatasourceConfiguration.isUseExternalDB()); - Assert.assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); + assertFalse(EnvUtil.getStandaloneMode()); + assertTrue(DatasourceConfiguration.isUseExternalDB()); + assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); } @Test - public void test007WithClusterAndDerbyDatabase() { + void test007WithClusterAndDerbyDatabase() { // 模拟设置环境07：指定集群，指定数据库derby，UseExternalDB是false，数据库类型是derby System.setProperty(Constants.STANDALONE_MODE_PROPERTY_NAME, "false"); environment.setProperty(PersistenceConstant.DATASOURCE_PLATFORM_PROPERTY_OLD, "derby"); @@ -109,13 +111,13 @@ public void test007WithClusterAndDerbyDatabase() { // 模拟初始化 datasourceConfig.initialize(null); - Assert.assertFalse(EnvUtil.getStandaloneMode()); - Assert.assertFalse(DatasourceConfiguration.isUseExternalDB()); - Assert.assertTrue(dataSource.getDataSource() instanceof LocalDataSourceServiceImpl); + assertFalse(EnvUtil.getStandaloneMode()); + assertFalse(DatasourceConfiguration.isUseExternalDB()); + assertTrue(dataSource.getDataSource() instanceof LocalDataSourceServiceImpl); } @Test - public void test008WithClusterAndOtherDatabase() { + void test008WithClusterAndOtherDatabase() { // 模拟设置环境08: 指定集群，指定数据库其他，UseExternalDB是true，数据库类型是其他 System.setProperty(Constants.STANDALONE_MODE_PROPERTY_NAME, "false"); environment.setProperty(PersistenceConstant.DATASOURCE_PLATFORM_PROPERTY_OLD, "postgresql"); @@ -125,9 +127,9 @@ public void test008WithClusterAndOtherDatabase() { // 模拟初始化 datasourceConfig.initialize(null); - Assert.assertFalse(EnvUtil.getStandaloneMode()); - Assert.assertTrue(DatasourceConfiguration.isUseExternalDB()); - Assert.assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); + assertFalse(EnvUtil.getStandaloneMode()); + assertTrue(DatasourceConfiguration.isUseExternalDB()); + assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); } } diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/DataSourcePoolPropertiesTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/DataSourcePoolPropertiesTest.java index 923f897888f..253e0de6862 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/DataSourcePoolPropertiesTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/DataSourcePoolPropertiesTest.java @@ -17,13 +17,13 @@ package com.alibaba.nacos.persistence.datasource; import com.zaxxer.hikari.HikariDataSource; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.mock.env.MockEnvironment; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class DataSourcePoolPropertiesTest { +class DataSourcePoolPropertiesTest { private static final String JDBC_URL = "jdbc:derby://127.0.0.1:3306/nacos_devtest?characterEncoding=utf8&serverTimezone=UTC"; @@ -39,8 +39,8 @@ public class DataSourcePoolPropertiesTest { private MockEnvironment environment; - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() throws Exception { environment = new MockEnvironment(); environment.setProperty("db.user", USERNAME); environment.setProperty("db.password", PASSWORD); @@ -49,7 +49,7 @@ public void setUp() throws Exception { } @Test - public void testBuild() { + void testBuild() { DataSourcePoolProperties poolProperties = DataSourcePoolProperties.build(environment); poolProperties.setJdbcUrl(JDBC_URL); poolProperties.setDriverClassName(JDBC_DRIVER_CLASS_NAME); diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/DynamicDataSourceTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/DynamicDataSourceTest.java index b9e3a1acc3a..6bf4c37c669 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/DynamicDataSourceTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/DynamicDataSourceTest.java @@ -17,17 +17,18 @@ package com.alibaba.nacos.persistence.datasource; import com.alibaba.nacos.persistence.configuration.DatasourceConfiguration; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.test.util.ReflectionTestUtils; -@RunWith(MockitoJUnitRunner.class) -public class DynamicDataSourceTest { +import static org.junit.jupiter.api.Assertions.assertTrue; + +@ExtendWith(MockitoExtension.class) +class DynamicDataSourceTest { @InjectMocks private DynamicDataSource dataSource; @@ -38,20 +39,20 @@ public class DynamicDataSourceTest { @Mock private ExternalDataSourceServiceImpl basicDataSourceService; - @Before - public void setUp() { + @BeforeEach + void setUp() { dataSource = DynamicDataSource.getInstance(); ReflectionTestUtils.setField(dataSource, "localDataSourceService", localDataSourceService); ReflectionTestUtils.setField(dataSource, "basicDataSourceService", basicDataSourceService); } @Test - public void testGetDataSource() { + void testGetDataSource() { DatasourceConfiguration.setEmbeddedStorage(true); - Assert.assertTrue(dataSource.getDataSource() instanceof LocalDataSourceServiceImpl); + assertTrue(dataSource.getDataSource() instanceof LocalDataSourceServiceImpl); DatasourceConfiguration.setEmbeddedStorage(false); - Assert.assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); + assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); } } diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ExternalDataSourcePropertiesTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ExternalDataSourcePropertiesTest.java index f9e51274288..9680b8f508f 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ExternalDataSourcePropertiesTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ExternalDataSourcePropertiesTest.java @@ -17,12 +17,14 @@ package com.alibaba.nacos.persistence.datasource; import com.zaxxer.hikari.HikariDataSource; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.mock.env.MockEnvironment; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class ExternalDataSourcePropertiesTest { @SuppressWarnings("checkstyle:linelength") @@ -33,7 +35,7 @@ public class ExternalDataSourcePropertiesTest { public static final String USERNAME = "nacos_devtest"; @Test - public void externalDatasourceNormally() { + void externalDatasourceNormally() { HikariDataSource expectedDataSource = new HikariDataSource(); expectedDataSource.setJdbcUrl(JDBC_URL); expectedDataSource.setUsername(USERNAME); @@ -44,16 +46,16 @@ public void externalDatasourceNormally() { environment.setProperty("db.password", PASSWORD); environment.setProperty("db.url.0", JDBC_URL); List dataSources = new ExternalDataSourceProperties().build(environment, (dataSource -> { - Assert.assertEquals(dataSource.getJdbcUrl(), expectedDataSource.getJdbcUrl()); - Assert.assertEquals(dataSource.getUsername(), expectedDataSource.getUsername()); - Assert.assertEquals(dataSource.getPassword(), expectedDataSource.getPassword()); + assertEquals(dataSource.getJdbcUrl(), expectedDataSource.getJdbcUrl()); + assertEquals(dataSource.getUsername(), expectedDataSource.getUsername()); + assertEquals(dataSource.getPassword(), expectedDataSource.getPassword()); })); - Assert.assertEquals(dataSources.size(), 1); + assertEquals(1, dataSources.size()); } @Test - public void externalDatasourceToAssertMultiJdbcUrl() { + void externalDatasourceToAssertMultiJdbcUrl() { HikariDataSource expectedDataSource = new HikariDataSource(); expectedDataSource.setJdbcUrl(JDBC_URL); @@ -66,16 +68,16 @@ public void externalDatasourceToAssertMultiJdbcUrl() { environment.setProperty("db.url.0", JDBC_URL); environment.setProperty("db.url.1", JDBC_URL); List dataSources = new ExternalDataSourceProperties().build(environment, (dataSource -> { - Assert.assertEquals(dataSource.getJdbcUrl(), expectedDataSource.getJdbcUrl()); - Assert.assertEquals(dataSource.getUsername(), expectedDataSource.getUsername()); - Assert.assertEquals(dataSource.getPassword(), expectedDataSource.getPassword()); + assertEquals(dataSource.getJdbcUrl(), expectedDataSource.getJdbcUrl()); + assertEquals(dataSource.getUsername(), expectedDataSource.getUsername()); + assertEquals(dataSource.getPassword(), expectedDataSource.getPassword()); })); - Assert.assertEquals(dataSources.size(), 2); + assertEquals(2, dataSources.size()); } @Test - public void externalDatasourceToAssertMultiPasswordAndUsername() { + void externalDatasourceToAssertMultiPasswordAndUsername() { HikariDataSource expectedDataSource = new HikariDataSource(); expectedDataSource.setJdbcUrl(JDBC_URL); @@ -90,16 +92,16 @@ public void externalDatasourceToAssertMultiPasswordAndUsername() { environment.setProperty("db.url.0", JDBC_URL); environment.setProperty("db.url.1", JDBC_URL); List dataSources = new ExternalDataSourceProperties().build(environment, (dataSource -> { - Assert.assertEquals(dataSource.getJdbcUrl(), expectedDataSource.getJdbcUrl()); - Assert.assertEquals(dataSource.getUsername(), expectedDataSource.getUsername()); - Assert.assertEquals(dataSource.getPassword(), expectedDataSource.getPassword()); + assertEquals(dataSource.getJdbcUrl(), expectedDataSource.getJdbcUrl()); + assertEquals(dataSource.getUsername(), expectedDataSource.getUsername()); + assertEquals(dataSource.getPassword(), expectedDataSource.getPassword()); })); - Assert.assertEquals(dataSources.size(), 2); + assertEquals(2, dataSources.size()); } @Test - public void externalDatasourceToAssertMinIdle() { + void externalDatasourceToAssertMinIdle() { MockEnvironment environment = new MockEnvironment(); environment.setProperty("db.num", "1"); environment.setProperty("db.user", USERNAME); @@ -107,38 +109,43 @@ public void externalDatasourceToAssertMinIdle() { environment.setProperty("db.url.0", JDBC_URL); List dataSources = new ExternalDataSourceProperties().build(environment, (dataSource -> { dataSource.validate(); - Assert.assertEquals(dataSource.getMinimumIdle(), DataSourcePoolProperties.DEFAULT_MINIMUM_IDLE); + assertEquals(DataSourcePoolProperties.DEFAULT_MINIMUM_IDLE, dataSource.getMinimumIdle()); })); - Assert.assertEquals(dataSources.size(), 1); + assertEquals(1, dataSources.size()); } - @Test(expected = IllegalArgumentException.class) - public void externalDatasourceFailureWithLarkInfo() { - - MockEnvironment environment = new MockEnvironment(); - new ExternalDataSourceProperties().build(environment, null); + @Test + void externalDatasourceFailureWithLarkInfo() { + assertThrows(IllegalArgumentException.class, () -> { + + MockEnvironment environment = new MockEnvironment(); + new ExternalDataSourceProperties().build(environment, null); + + }); } - @Test(expected = IllegalArgumentException.class) - public void externalDatasourceFailureWithErrorInfo() { - - HikariDataSource expectedDataSource = new HikariDataSource(); - expectedDataSource.setJdbcUrl(JDBC_URL); - expectedDataSource.setUsername(USERNAME); - expectedDataSource.setPassword(PASSWORD); - MockEnvironment environment = new MockEnvironment(); - // error num of db - environment.setProperty("db.num", "2"); - environment.setProperty("db.user", USERNAME); - environment.setProperty("db.password", PASSWORD); - environment.setProperty("db.url.0", JDBC_URL); - List dataSources = new ExternalDataSourceProperties().build(environment, (dataSource -> { - Assert.assertEquals(dataSource.getJdbcUrl(), expectedDataSource.getJdbcUrl()); - Assert.assertEquals(dataSource.getUsername(), expectedDataSource.getUsername()); - Assert.assertEquals(dataSource.getPassword(), expectedDataSource.getPassword()); + @Test + void externalDatasourceFailureWithErrorInfo() { + assertThrows(IllegalArgumentException.class, () -> { - })); + HikariDataSource expectedDataSource = new HikariDataSource(); + expectedDataSource.setJdbcUrl(JDBC_URL); + expectedDataSource.setUsername(USERNAME); + expectedDataSource.setPassword(PASSWORD); + MockEnvironment environment = new MockEnvironment(); + // error num of db + environment.setProperty("db.num", "2"); + environment.setProperty("db.user", USERNAME); + environment.setProperty("db.password", PASSWORD); + environment.setProperty("db.url.0", JDBC_URL); + List dataSources = new ExternalDataSourceProperties().build(environment, (dataSource -> { + assertEquals(dataSource.getJdbcUrl(), expectedDataSource.getJdbcUrl()); + assertEquals(dataSource.getUsername(), expectedDataSource.getUsername()); + assertEquals(dataSource.getPassword(), expectedDataSource.getPassword()); + + })); + }); } } diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ExternalDataSourceServiceImplTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ExternalDataSourceServiceImplTest.java index 1781a6cacaa..5c41a0ca991 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ExternalDataSourceServiceImplTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/ExternalDataSourceServiceImplTest.java @@ -17,13 +17,12 @@ package com.alibaba.nacos.persistence.datasource; import com.zaxxer.hikari.HikariDataSource; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.UncategorizedSQLException; import org.springframework.jdbc.core.JdbcTemplate; @@ -35,12 +34,15 @@ import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) -public class ExternalDataSourceServiceImplTest { +@ExtendWith(MockitoExtension.class) +class ExternalDataSourceServiceImplTest { @InjectMocks private ExternalDataSourceServiceImpl service; @@ -60,8 +62,8 @@ public class ExternalDataSourceServiceImplTest { @Mock private JdbcTemplate testMasterWritableJT; - @Before - public void setUp() { + @BeforeEach + void setUp() { service = new ExternalDataSourceServiceImpl(); ReflectionTestUtils.setField(service, "jt", jt); ReflectionTestUtils.setField(service, "tm", tm); @@ -74,32 +76,32 @@ public void setUp() { } @Test - public void testCheckMasterWritable() { + void testCheckMasterWritable() { when(testMasterWritableJT.queryForObject(eq(" SELECT @@read_only "), eq(Integer.class))).thenReturn(0); - Assert.assertTrue(service.checkMasterWritable()); + assertTrue(service.checkMasterWritable()); } @Test - public void testGetCurrentDbUrl() { + void testGetCurrentDbUrl() { HikariDataSource bds = new HikariDataSource(); bds.setJdbcUrl("test.jdbc.url"); when(jt.getDataSource()).thenReturn(bds); - Assert.assertEquals("test.jdbc.url", service.getCurrentDbUrl()); + assertEquals("test.jdbc.url", service.getCurrentDbUrl()); } @Test - public void testGetHealth() { + void testGetHealth() { List isHealthList = new ArrayList<>(); ReflectionTestUtils.setField(service, "isHealthList", isHealthList); - Assert.assertEquals("UP", service.getHealth()); + assertEquals("UP", service.getHealth()); } @Test - public void testCheckDbHealthTaskRun() { + void testCheckDbHealthTaskRun() { List testJtList = new ArrayList<>(); testJtList.add(jt); @@ -110,12 +112,12 @@ public void testCheckDbHealthTaskRun() { ReflectionTestUtils.setField(service, "isHealthList", isHealthList); service.new CheckDbHealthTask().run(); - Assert.assertEquals(1, isHealthList.size()); - Assert.assertTrue(isHealthList.get(0)); + assertEquals(1, isHealthList.size()); + assertTrue(isHealthList.get(0)); } @Test - public void testCheckDbHealthTaskRunWhenEmptyResult() { + void testCheckDbHealthTaskRunWhenEmptyResult() { List testJtList = new ArrayList<>(); testJtList.add(jt); ReflectionTestUtils.setField(service, "testJtList", testJtList); @@ -126,12 +128,12 @@ public void testCheckDbHealthTaskRunWhenEmptyResult() { when(jt.queryForMap(anyString())).thenThrow(new EmptyResultDataAccessException("Expected exception", 1)); service.new CheckDbHealthTask().run(); - Assert.assertEquals(1, isHealthList.size()); - Assert.assertTrue(isHealthList.get(0)); + assertEquals(1, isHealthList.size()); + assertTrue(isHealthList.get(0)); } @Test - public void testCheckDbHealthTaskRunWhenSqlException() { + void testCheckDbHealthTaskRunWhenSqlException() { List testJtList = new ArrayList<>(); testJtList.add(jt); ReflectionTestUtils.setField(service, "testJtList", testJtList); @@ -140,11 +142,10 @@ public void testCheckDbHealthTaskRunWhenSqlException() { isHealthList.add(Boolean.FALSE); ReflectionTestUtils.setField(service, "isHealthList", isHealthList); - when(jt.queryForMap(anyString())).thenThrow( - new UncategorizedSQLException("Expected exception", "", new SQLException())); + when(jt.queryForMap(anyString())).thenThrow(new UncategorizedSQLException("Expected exception", "", new SQLException())); service.new CheckDbHealthTask().run(); - Assert.assertEquals(1, isHealthList.size()); - Assert.assertFalse(isHealthList.get(0)); + assertEquals(1, isHealthList.size()); + assertFalse(isHealthList.get(0)); } } diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/LocalDataSourceServiceImplTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/LocalDataSourceServiceImplTest.java index 123d7b33aa1..dd8dd298fc4 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/LocalDataSourceServiceImplTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/LocalDataSourceServiceImplTest.java @@ -17,21 +17,22 @@ package com.alibaba.nacos.persistence.datasource; import com.zaxxer.hikari.HikariDataSource; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.transaction.support.TransactionTemplate; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) -public class LocalDataSourceServiceImplTest { +@ExtendWith(MockitoExtension.class) +class LocalDataSourceServiceImplTest { @InjectMocks private LocalDataSourceServiceImpl service; @@ -42,35 +43,35 @@ public class LocalDataSourceServiceImplTest { @Mock private TransactionTemplate tjt; - @Before - public void setUp() { + @BeforeEach + void setUp() { service = new LocalDataSourceServiceImpl(); ReflectionTestUtils.setField(service, "jt", jt); ReflectionTestUtils.setField(service, "tjt", tjt); } @Test - public void testGetDataSource() { + void testGetDataSource() { HikariDataSource dataSource = new HikariDataSource(); dataSource.setJdbcUrl("test.jdbc.url"); when(jt.getDataSource()).thenReturn(dataSource); - Assert.assertEquals(dataSource.getJdbcUrl(), ((HikariDataSource) service.getDatasource()).getJdbcUrl()); + assertEquals(dataSource.getJdbcUrl(), ((HikariDataSource) service.getDatasource()).getJdbcUrl()); } @Test - public void testCheckMasterWritable() { + void testCheckMasterWritable() { - Assert.assertTrue(service.checkMasterWritable()); + assertTrue(service.checkMasterWritable()); } @Test - public void testSetAndGetHealth() { + void testSetAndGetHealth() { service.setHealthStatus("DOWN"); - Assert.assertEquals("DOWN", service.getHealth()); + assertEquals("DOWN", service.getHealth()); service.setHealthStatus("UP"); - Assert.assertEquals("UP", service.getHealth()); + assertEquals("UP", service.getHealth()); } } diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/StandaloneExternalStorageTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/StandaloneExternalStorageTest.java index e8240c4b821..c3d03144c2f 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/StandaloneExternalStorageTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/datasource/StandaloneExternalStorageTest.java @@ -20,27 +20,31 @@ import com.alibaba.nacos.persistence.constants.PersistenceConstant; import com.alibaba.nacos.sys.env.Constants; import com.alibaba.nacos.sys.env.EnvUtil; -import org.junit.Assert; -import org.junit.Before; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.MethodSorters; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.MethodName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.mock.env.MockEnvironment; import org.springframework.test.util.ReflectionTestUtils; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * StandaloneExternalStorage unit test. * * @author Long Yu * @since 2.2.0 */ -@RunWith(MockitoJUnitRunner.class) -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class StandaloneExternalStorageTest { +@ExtendWith(MockitoExtension.class) +@TestMethodOrder(MethodName.class) +class StandaloneExternalStorageTest { + + DatasourceConfiguration datasourceConfig; @InjectMocks private DynamicDataSource dataSource; @@ -53,10 +57,8 @@ public class StandaloneExternalStorageTest { @Mock private ExternalDataSourceServiceImpl basicDataSourceService; - DatasourceConfiguration datasourceConfig; - - @Before - public void setUp() throws Exception { + @BeforeEach + void setUp() throws Exception { environment = new MockEnvironment(); EnvUtil.setEnvironment(environment); datasourceConfig = new DatasourceConfiguration(); @@ -66,7 +68,7 @@ public void setUp() throws Exception { } @Test - public void test001WithStandaloneAndNullDatabase() { + void test001WithStandaloneAndNullDatabase() { // 模拟设置环境01：指定单例，未指定数据库，UseExternalDB是false System.setProperty(Constants.STANDALONE_MODE_PROPERTY_NAME, "true"); environment.setProperty(PersistenceConstant.DATASOURCE_PLATFORM_PROPERTY_OLD, ""); @@ -76,13 +78,13 @@ public void test001WithStandaloneAndNullDatabase() { // 模拟初始化 datasourceConfig.initialize(null); - Assert.assertTrue(EnvUtil.getStandaloneMode()); - Assert.assertTrue(dataSource.getDataSource() instanceof LocalDataSourceServiceImpl); - Assert.assertFalse(DatasourceConfiguration.isUseExternalDB()); + assertTrue(EnvUtil.getStandaloneMode()); + assertTrue(dataSource.getDataSource() instanceof LocalDataSourceServiceImpl); + assertFalse(DatasourceConfiguration.isUseExternalDB()); } @Test - public void test002WithStandaloneAndDerbyDatabase() { + void test002WithStandaloneAndDerbyDatabase() { // 模拟设置环境02：指定单例，指定数据库derby，UseExternalDB是false System.setProperty(Constants.STANDALONE_MODE_PROPERTY_NAME, "true"); environment.setProperty(PersistenceConstant.DATASOURCE_PLATFORM_PROPERTY_OLD, "derby"); @@ -92,13 +94,13 @@ public void test002WithStandaloneAndDerbyDatabase() { datasourceConfig.initialize(null); - Assert.assertTrue(EnvUtil.getStandaloneMode()); - Assert.assertTrue(dataSource.getDataSource() instanceof LocalDataSourceServiceImpl); - Assert.assertFalse(DatasourceConfiguration.isUseExternalDB()); + assertTrue(EnvUtil.getStandaloneMode()); + assertTrue(dataSource.getDataSource() instanceof LocalDataSourceServiceImpl); + assertFalse(DatasourceConfiguration.isUseExternalDB()); } @Test - public void test003WithStandaloneAndMysqlDatabase() { + void test003WithStandaloneAndMysqlDatabase() { // 模拟设置环境03：指定单例，指定数据库为mysql， UseExternalDB是true System.setProperty(Constants.STANDALONE_MODE_PROPERTY_NAME, "true"); environment.setProperty(PersistenceConstant.DATASOURCE_PLATFORM_PROPERTY_OLD, "mysql"); @@ -108,13 +110,13 @@ public void test003WithStandaloneAndMysqlDatabase() { datasourceConfig.initialize(null); - Assert.assertTrue(EnvUtil.getStandaloneMode()); - Assert.assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); - Assert.assertTrue(DatasourceConfiguration.isUseExternalDB()); + assertTrue(EnvUtil.getStandaloneMode()); + assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); + assertTrue(DatasourceConfiguration.isUseExternalDB()); } @Test - public void test004WithStandaloneAndOtherDatabase() { + void test004WithStandaloneAndOtherDatabase() { // 模拟设置环境04：指定单例，指定数据库为其他， UseExternalDB是true System.setProperty(Constants.STANDALONE_MODE_PROPERTY_NAME, "true"); environment.setProperty(PersistenceConstant.DATASOURCE_PLATFORM_PROPERTY_OLD, "postgresql"); @@ -124,9 +126,9 @@ public void test004WithStandaloneAndOtherDatabase() { datasourceConfig.initialize(null); - Assert.assertTrue(EnvUtil.getStandaloneMode()); - Assert.assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); - Assert.assertTrue(DatasourceConfiguration.isUseExternalDB()); + assertTrue(EnvUtil.getStandaloneMode()); + assertTrue(dataSource.getDataSource() instanceof ExternalDataSourceServiceImpl); + assertTrue(DatasourceConfiguration.isUseExternalDB()); } } diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/repository/embedded/operate/MockConfigInfo.java b/persistence/src/test/java/com/alibaba/nacos/persistence/repository/embedded/operate/MockConfigInfo.java index 56c6a70a3a0..0247ae5a9f2 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/repository/embedded/operate/MockConfigInfo.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/repository/embedded/operate/MockConfigInfo.java @@ -69,8 +69,8 @@ public boolean equals(Object o) { return false; } MockConfigInfo that = (MockConfigInfo) o; - return id == that.id && Objects.equals(dataId, that.dataId) && Objects.equals(group, that.group) && Objects - .equals(content, that.content); + return id == that.id && Objects.equals(dataId, that.dataId) && Objects.equals(group, that.group) && Objects.equals(content, + that.content); } @Override diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/repository/embedded/operate/StandaloneDatabaseOperateImplTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/repository/embedded/operate/StandaloneDatabaseOperateImplTest.java index 5bfefbae1f3..cca27319895 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/repository/embedded/operate/StandaloneDatabaseOperateImplTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/repository/embedded/operate/StandaloneDatabaseOperateImplTest.java @@ -19,14 +19,13 @@ import com.alibaba.nacos.common.model.RestResult; import com.alibaba.nacos.persistence.repository.embedded.EmbeddedStorageContextHolder; import com.alibaba.nacos.persistence.repository.embedded.sql.ModifyRequest; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.test.util.ReflectionTestUtils; @@ -41,14 +40,16 @@ import java.util.concurrent.ExecutionException; import java.util.function.BiConsumer; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) -public class StandaloneDatabaseOperateImplTest { +@ExtendWith(MockitoExtension.class) +class StandaloneDatabaseOperateImplTest { @Spy @InjectMocks @@ -72,24 +73,24 @@ public class StandaloneDatabaseOperateImplTest { @Mock private TransactionTemplate transactionTemplate; - @Before - public void setUp() { + @BeforeEach + void setUp() { ReflectionTestUtils.setField(operate, "jdbcTemplate", jdbcTemplate); ReflectionTestUtils.setField(operate, "transactionTemplate", transactionTemplate); } @Test - public void testQueryOne1() { + void testQueryOne1() { String sql = "SELECT 1"; Class clazz = Long.class; Long num = 1L; when(jdbcTemplate.queryForObject(sql, clazz)).thenReturn(num); - Assert.assertEquals(operate.queryOne(sql, clazz), (Long) 1L); + assertEquals(operate.queryOne(sql, clazz), (Long) 1L); } @Test - public void testQueryOne2() { + void testQueryOne2() { final String sql = "SELECT * FROM config_info WHERE id = ? AND data_id = ? AND group_id = ?"; MockConfigInfo configInfo = new MockConfigInfo(); configInfo.setId(1L); @@ -97,11 +98,11 @@ public void testQueryOne2() { configInfo.setGroup("test"); Object[] args = new Object[] {configInfo.getId(), configInfo.getDataId(), configInfo.getGroup()}; when(jdbcTemplate.queryForObject(sql, args, MockConfigInfo.class)).thenReturn(configInfo); - Assert.assertEquals(operate.queryOne(sql, args, MockConfigInfo.class), configInfo); + assertEquals(operate.queryOne(sql, args, MockConfigInfo.class), configInfo); } @Test - public void testQueryOne3() { + void testQueryOne3() { final String sql = "SELECT * FROM config_info WHERE id = ? AND data_id = ? AND group_id = ?"; MockConfigInfo configInfo = new MockConfigInfo(); configInfo.setId(1L); @@ -109,20 +110,20 @@ public void testQueryOne3() { configInfo.setGroup("test"); Object[] args = new Object[] {configInfo.getId(), configInfo.getDataId(), configInfo.getGroup()}; when(jdbcTemplate.queryForObject(eq(sql), eq(args), any(RowMapper.class))).thenReturn(configInfo); - Assert.assertEquals(operate.queryOne(sql, args, rowMapper), configInfo); + assertEquals(operate.queryOne(sql, args, rowMapper), configInfo); } @Test - public void testQueryOne4() { + void testQueryOne4() { String sql = "SELECT 1"; Class clazz = Long.class; Long result = 1L; when(tempJdbcTemplate.queryForObject(sql, clazz)).thenReturn(result); - Assert.assertEquals(operate.queryOne(tempJdbcTemplate, sql, clazz), result); + assertEquals(operate.queryOne(tempJdbcTemplate, sql, clazz), result); } @Test - public void testQueryOne5() { + void testQueryOne5() { final String sql = "SELECT * FROM config_info WHERE id = ? AND data_id = ? AND group_id = ?"; MockConfigInfo configInfo = new MockConfigInfo(); configInfo.setId(1L); @@ -130,11 +131,11 @@ public void testQueryOne5() { configInfo.setGroup("test"); Object[] args = new Object[] {configInfo.getId(), configInfo.getDataId(), configInfo.getGroup()}; when(tempJdbcTemplate.queryForObject(sql, args, MockConfigInfo.class)).thenReturn(configInfo); - Assert.assertEquals(operate.queryOne(tempJdbcTemplate, sql, args, MockConfigInfo.class), configInfo); + assertEquals(operate.queryOne(tempJdbcTemplate, sql, args, MockConfigInfo.class), configInfo); } @Test - public void testQueryOne6() { + void testQueryOne6() { final String sql = "SELECT * FROM config_info WHERE id = ? AND data_id = ? AND group_id = ?"; MockConfigInfo configInfo = new MockConfigInfo(); configInfo.setId(1L); @@ -142,11 +143,11 @@ public void testQueryOne6() { configInfo.setGroup("test"); Object[] args = new Object[] {configInfo.getId(), configInfo.getDataId(), configInfo.getGroup()}; when(tempJdbcTemplate.queryForObject(eq(sql), eq(args), any(RowMapper.class))).thenReturn(configInfo); - Assert.assertEquals(operate.queryOne(tempJdbcTemplate, sql, args, rowMapper), configInfo); + assertEquals(operate.queryOne(tempJdbcTemplate, sql, args, rowMapper), configInfo); } @Test - public void testQueryMany1() { + void testQueryMany1() { final String sql = "SELECT * FROM config_info WHERE id >= ? AND id <= ?"; final Object[] args = new Object[] {1, 2}; MockConfigInfo configInfo1 = new MockConfigInfo(); @@ -157,11 +158,11 @@ public void testQueryMany1() { configInfos.add(configInfo1); configInfos.add(configInfo2); when(jdbcTemplate.query(eq(sql), eq(args), any(RowMapper.class))).thenReturn(configInfos); - Assert.assertEquals(configInfos, operate.queryMany(sql, args, rowMapper)); + assertEquals(configInfos, operate.queryMany(sql, args, rowMapper)); } @Test - public void testQueryMany2() { + void testQueryMany2() { final String sql = "SELECT id, data_id, group_id FROM config_info WHERE id >= ? AND id <= ?"; final Object[] args = new Object[] {1, 2}; @@ -180,11 +181,11 @@ public void testQueryMany2() { resultList.add(map2); when(jdbcTemplate.queryForList(sql, args)).thenReturn(resultList); - Assert.assertEquals(operate.queryMany(sql, args), resultList); + assertEquals(operate.queryMany(sql, args), resultList); } @Test - public void testQueryMany3() { + void testQueryMany3() { String sql = "SELECT data_id FROM config_info WHERE id >= ? AND id <= ?"; Object[] args = new Object[] {1, 2}; String dataId1 = "test1"; @@ -194,11 +195,11 @@ public void testQueryMany3() { resultList.add(dataId2); Class clazz = dataId1.getClass(); when(jdbcTemplate.queryForList(sql, args, clazz)).thenReturn(resultList); - Assert.assertEquals(operate.queryMany(sql, args, clazz), resultList); + assertEquals(operate.queryMany(sql, args, clazz), resultList); } @Test - public void testQueryMany4() { + void testQueryMany4() { final String sql = "SELECT data_id FROM config_info WHERE id >= ? AND id <= ?"; final Object[] args = new Object[] {1, 2}; final List> resultList = new ArrayList<>(); @@ -216,11 +217,11 @@ public void testQueryMany4() { resultList.add(map2); when(tempJdbcTemplate.queryForList(sql, args)).thenReturn(resultList); - Assert.assertEquals(operate.queryMany(tempJdbcTemplate, sql, args), resultList); + assertEquals(operate.queryMany(tempJdbcTemplate, sql, args), resultList); } @Test - public void testQueryMany5() { + void testQueryMany5() { String sql = "SELECT data_id FROM config_info WHERE id >= ? AND id <= ?"; Object[] args = new Object[] {1, 2}; String dataId1 = "test1"; @@ -230,11 +231,11 @@ public void testQueryMany5() { resultList.add(dataId2); Class clazz = dataId1.getClass(); when(operate.queryMany(jdbcTemplate, sql, args, clazz)).thenReturn(resultList); - Assert.assertEquals(operate.queryMany(jdbcTemplate, sql, args, clazz), resultList); + assertEquals(operate.queryMany(jdbcTemplate, sql, args, clazz), resultList); } @Test - public void testQueryMany6() { + void testQueryMany6() { final String sql = "SELECT * FROM config_info WHERE id >= ? AND id <= ?"; final Object[] args = new Object[] {1, 2}; MockConfigInfo configInfo1 = new MockConfigInfo(); @@ -245,21 +246,20 @@ public void testQueryMany6() { configInfos.add(configInfo1); configInfos.add(configInfo2); when(tempJdbcTemplate.query(eq(sql), eq(args), any(RowMapper.class))).thenReturn(configInfos); - Assert.assertEquals(operate.queryMany(tempJdbcTemplate, sql, args, rowMapper), configInfos); + assertEquals(operate.queryMany(tempJdbcTemplate, sql, args, rowMapper), configInfos); } @Test - public void testDataImport() throws ExecutionException, InterruptedException { - RestResult errorResult = RestResult.builder().withCode(500).withMsg("null").withData(null) - .build(); + void testDataImport() throws ExecutionException, InterruptedException { + RestResult errorResult = RestResult.builder().withCode(500).withMsg("null").withData(null).build(); CompletableFuture> errorFuture = new CompletableFuture<>(); errorFuture.complete(errorResult); doReturn(errorFuture).when(operate).dataImport(null); - Assert.assertEquals(operate.dataImport(null).get(), errorResult); + assertEquals(operate.dataImport(null).get(), errorResult); } @Test - public void testUpdate1() { + void testUpdate1() { List modifyRequests = new ArrayList<>(); ModifyRequest modifyRequest1 = new ModifyRequest(); String sql = "UPDATE config_info SET data_id = 'test' WHERE id = ?;"; @@ -268,11 +268,11 @@ public void testUpdate1() { modifyRequest1.setArgs(args); modifyRequests.add(modifyRequest1); when(transactionTemplate.execute(any(TransactionCallback.class))).thenReturn(true); - Assert.assertTrue(operate.update(modifyRequests)); + assertTrue(operate.update(modifyRequests)); } @Test - public void testUpdate2() { + void testUpdate2() { List modifyRequests = new ArrayList<>(); ModifyRequest modifyRequest1 = new ModifyRequest(); String sql = "UPDATE config_info SET data_id = 'test' WHERE id = ?;"; @@ -281,11 +281,11 @@ public void testUpdate2() { modifyRequest1.setArgs(args); modifyRequests.add(modifyRequest1); when(transactionTemplate.execute(any(TransactionCallback.class))).thenReturn(true); - Assert.assertTrue(operate.update(modifyRequests, biConsumer)); + assertTrue(operate.update(modifyRequests, biConsumer)); } @Test - public void testUpdate3() { + void testUpdate3() { List modifyRequests = new ArrayList<>(); ModifyRequest modifyRequest1 = new ModifyRequest(); String sql = "UPDATE config_info SET data_id = 'test' WHERE id = ?;"; @@ -294,11 +294,11 @@ public void testUpdate3() { modifyRequest1.setArgs(args); modifyRequests.add(modifyRequest1); when(transactionTemplate.execute(any(TransactionCallback.class))).thenReturn(true); - Assert.assertTrue(operate.update(transactionTemplate, jdbcTemplate, modifyRequests)); + assertTrue(operate.update(transactionTemplate, jdbcTemplate, modifyRequests)); } @Test - public void testUpdate4() { + void testUpdate4() { List modifyRequests = new ArrayList<>(); ModifyRequest modifyRequest1 = new ModifyRequest(); String sql = "UPDATE config_info SET data_id = 'test' WHERE id = ?;"; @@ -307,27 +307,27 @@ public void testUpdate4() { modifyRequest1.setArgs(args); modifyRequests.add(modifyRequest1); when(transactionTemplate.execute(any(TransactionCallback.class))).thenReturn(true); - Assert.assertTrue(operate.update(transactionTemplate, jdbcTemplate, modifyRequests, biConsumer)); + assertTrue(operate.update(transactionTemplate, jdbcTemplate, modifyRequests, biConsumer)); } @Test - public void testBlockUpdate1() { + void testBlockUpdate1() { String sql = "UPDATE config_info SET data_id = 'test' WHERE id = 1;"; EmbeddedStorageContextHolder.addSqlContext(sql); when(transactionTemplate.execute(any(TransactionCallback.class))).thenReturn(true); - Assert.assertTrue(operate.blockUpdate()); + assertTrue(operate.blockUpdate()); } @Test - public void testBlockUpdate2() { + void testBlockUpdate2() { String sql = "UPDATE config_info SET data_id = 'test' WHERE id = 1;"; EmbeddedStorageContextHolder.addSqlContext(sql); when(transactionTemplate.execute(any(TransactionCallback.class))).thenReturn(true); - Assert.assertTrue(operate.blockUpdate(biConsumer)); + assertTrue(operate.blockUpdate(biConsumer)); } @Test - public void testDoDataImport() { + void testDoDataImport() { List modifyRequests = new ArrayList<>(); ModifyRequest modifyRequest1 = new ModifyRequest(); String sql = "UPDATE config_info SET data_id = 'test' WHERE id = ?;"; @@ -336,17 +336,17 @@ public void testDoDataImport() { modifyRequest1.setArgs(args); modifyRequests.add(modifyRequest1); when(tempJdbcTemplate.batchUpdate(sql)).thenReturn(new int[] {1}); - Assert.assertTrue(operate.doDataImport(tempJdbcTemplate, modifyRequests)); + assertTrue(operate.doDataImport(tempJdbcTemplate, modifyRequests)); } @Test - public void testFutureUpdate() throws ExecutionException, InterruptedException { + void testFutureUpdate() throws ExecutionException, InterruptedException { String sql = "SELECT 1"; EmbeddedStorageContextHolder.addSqlContext(sql); CompletableFuture future = new CompletableFuture<>(); future.complete(true); doAnswer((invocationOnMock) -> null).when(operate).futureUpdate(); when(operate.futureUpdate()).thenReturn(future); - Assert.assertTrue(operate.futureUpdate().get()); + assertTrue(operate.futureUpdate().get()); } } \ No newline at end of file diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/utils/ConnectionCheckUtilTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/utils/ConnectionCheckUtilTest.java index 63a94fb4671..a3c8922aaa9 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/utils/ConnectionCheckUtilTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/utils/ConnectionCheckUtilTest.java @@ -17,11 +17,12 @@ package com.alibaba.nacos.persistence.utils; import com.zaxxer.hikari.HikariDataSource; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Connection; import java.sql.SQLException; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,18 +32,20 @@ * * @author Long Yu */ -public class ConnectionCheckUtilTest { +class ConnectionCheckUtilTest { - @Test(expected = RuntimeException.class) - public void testCheckConnectionThrowException() throws SQLException { - HikariDataSource ds = mock(HikariDataSource.class); - when(ds.getConnection()).thenThrow(new RuntimeException()); - ConnectionCheckUtil.checkDataSourceConnection(ds); - verify(ds).getConnection(); + @Test + void testCheckConnectionThrowException() throws SQLException { + assertThrows(RuntimeException.class, () -> { + HikariDataSource ds = mock(HikariDataSource.class); + when(ds.getConnection()).thenThrow(new RuntimeException()); + ConnectionCheckUtil.checkDataSourceConnection(ds); + verify(ds).getConnection(); + }); } @Test - public void testCheckConnectionNormal() throws SQLException { + void testCheckConnectionNormal() throws SQLException { HikariDataSource ds = mock(HikariDataSource.class); Connection connection = mock(Connection.class); when(ds.getConnection()).thenReturn(connection); diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/utils/DerbyUtilsTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/utils/DerbyUtilsTest.java index 271a78802e8..cc7682b25d5 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/utils/DerbyUtilsTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/utils/DerbyUtilsTest.java @@ -16,19 +16,20 @@ package com.alibaba.nacos.persistence.utils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; @SuppressWarnings("checkstyle:linelength") -public class DerbyUtilsTest { +class DerbyUtilsTest { @Test - public void testDerbySqlCorrect() { + void testDerbySqlCorrect() { final String testSql = "INSERT INTO `config_info` (`id`, `data_id`, `group_id`, `content`, `md5`, `gmt_create`, `gmt_modified`, `src_user`, `src_ip`, `app_name`, `tenant_id`, `c_desc`, `c_use`, `effect`, `type`, `c_schema`) VALUES (1,'boot-test','ALIBABA','dept:123123123\\ngroup:123123123','2ca50d002a7dabf81497f666a7967e15','2020-04-13 13:44:43','2020-04-30 10:45:21',NULL,'127.0.0.1','','',NULL,NULL,NULL,NULL,NULL);"; final String result = DerbyUtils.insertStatementCorrection(testSql); final String expect = "INSERT INTO CONFIG_INFO (ID, DATA_ID, GROUP_ID, CONTENT, MD5, GMT_CREATE, GMT_MODIFIED, SRC_USER, SRC_IP, APP_NAME, TENANT_ID, C_DESC, C_USE, EFFECT, TYPE, C_SCHEMA) VALUES (1,'boot-test','ALIBABA','dept:123123123\\ngroup:123123123','2ca50d002a7dabf81497f666a7967e15','2020-04-13 13:44:43','2020-04-30 10:45:21',NULL,'127.0.0.1','','',NULL,NULL,NULL,NULL,NULL)"; - Assert.assertEquals(expect, result); + assertEquals(expect, result); } } diff --git a/persistence/src/test/java/com/alibaba/nacos/persistence/utils/PersistenceExecutorTest.java b/persistence/src/test/java/com/alibaba/nacos/persistence/utils/PersistenceExecutorTest.java index 300aa221258..0aaa90a6518 100644 --- a/persistence/src/test/java/com/alibaba/nacos/persistence/utils/PersistenceExecutorTest.java +++ b/persistence/src/test/java/com/alibaba/nacos/persistence/utils/PersistenceExecutorTest.java @@ -16,16 +16,17 @@ package com.alibaba.nacos.persistence.utils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -public class PersistenceExecutorTest { +import static org.junit.jupiter.api.Assertions.assertEquals; + +class PersistenceExecutorTest { @Test - public void testExecuteEmbeddedDump() throws InterruptedException { + void testExecuteEmbeddedDump() throws InterruptedException { AtomicInteger atomicInteger = new AtomicInteger(); @@ -35,7 +36,7 @@ public void testExecuteEmbeddedDump() throws InterruptedException { TimeUnit.MILLISECONDS.sleep(20); - Assert.assertEquals(1, atomicInteger.get()); + assertEquals(1, atomicInteger.get()); }