Skip to content

Commit

Permalink
upgrade module naocs-persistence from junit4 to junit5 (#12228)
Browse files Browse the repository at this point in the history
  • Loading branch information
@shalk
shalk committed Jun 17, 2024
1 parent 21bfac7 commit cd8e858
Show file tree
Hide file tree
Showing 16 changed files with 315 additions and 290 deletions.
31 changes: 16 additions & 15 deletions ...ibaba/nacos/persistence/configuration/condition/ConditionDistributedEmbedStorageTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,54 +18,55 @@

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;

@Mock
AnnotatedTypeMetadata metadata;

@Before
public void init() {
private ConditionDistributedEmbedStorage conditionDistributedEmbedStorage;

@BeforeEach
void init() {
conditionDistributedEmbedStorage = new ConditionDistributedEmbedStorage();

}

@Test
public void testMatches() {
MockedStatic<DatasourceConfiguration> propertyUtilMockedStatic = Mockito
.mockStatic(DatasourceConfiguration.class);
void testMatches() {
MockedStatic<DatasourceConfiguration> propertyUtilMockedStatic = Mockito.mockStatic(DatasourceConfiguration.class);
MockedStatic<EnvUtil> 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();
Expand Down
24 changes: 13 additions & 11 deletions ...com/alibaba/nacos/persistence/configuration/condition/ConditionOnEmbeddedStorageTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,40 @@
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;

@Mock
AnnotatedTypeMetadata metadata;

@Before
public void init() {
private ConditionOnEmbeddedStorage conditionOnEmbeddedStorage;

@BeforeEach
void init() {
conditionOnEmbeddedStorage = new ConditionOnEmbeddedStorage();
}

@Test
public void testMatches() {
void testMatches() {
MockedStatic<DatasourceConfiguration> 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();
}
Expand Down
24 changes: 13 additions & 11 deletions ...com/alibaba/nacos/persistence/configuration/condition/ConditionOnExternalStorageTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,39 +17,41 @@
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;

@Mock
AnnotatedTypeMetadata metadata;

@Before
public void init() {
private ConditionOnExternalStorage conditionOnExternalStorage;

@BeforeEach
void init() {
conditionOnExternalStorage = new ConditionOnExternalStorage();
}

@Test
public void testMatches() {
void testMatches() {
MockedStatic<DatasourceConfiguration> 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();
}
Expand Down
31 changes: 16 additions & 15 deletions ...libaba/nacos/persistence/configuration/condition/ConditionStandaloneEmbedStorageTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,51 +18,52 @@

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;

@Mock
AnnotatedTypeMetadata metadata;

@Before
public void init() {
private ConditionStandaloneEmbedStorage conditionStandaloneEmbedStorage;

@BeforeEach
void init() {
conditionStandaloneEmbedStorage = new ConditionStandaloneEmbedStorage();
}

@Test
public void testMatches() {
MockedStatic<DatasourceConfiguration> propertyUtilMockedStatic = Mockito
.mockStatic(DatasourceConfiguration.class);
void testMatches() {
MockedStatic<DatasourceConfiguration> propertyUtilMockedStatic = Mockito.mockStatic(DatasourceConfiguration.class);
MockedStatic<EnvUtil> 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();
Expand Down
62 changes: 32 additions & 30 deletions ...ce/src/test/java/com/alibaba/nacos/persistence/datasource/ClusterExternalStorageTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand All @@ -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, "");
Expand All @@ -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");
Expand All @@ -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");
Expand All @@ -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");
Expand All @@ -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);
}

}
Loading

0 comments on commit cd8e858

Please sign in to comment.