You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/02/28 09:41:52 UTC
[shardingsphere] branch master updated: Use AutoMockExtension on test modules (#24383)
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 7e6f7004a56 Use AutoMockExtension on test modules (#24383)
7e6f7004a56 is described below
commit 7e6f7004a5685142948612511cdb5f5d95979feb
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Feb 28 17:41:45 2023 +0800
Use AutoMockExtension on test modules (#24383)
---
test/it/pipeline/pom.xml | 8 +++-
.../migration/api/impl/MigrationJobAPITest.java | 53 ++++++++++------------
2 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/test/it/pipeline/pom.xml b/test/it/pipeline/pom.xml
index ff01a69a7bf..f03a701db3b 100644
--- a/test/it/pipeline/pom.xml
+++ b/test/it/pipeline/pom.xml
@@ -68,7 +68,13 @@
<artifactId>shardingsphere-cluster-mode-repository-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-test-util</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-test-fixture-jdbc</artifactId>
diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
index f44ff7cfdc2..c62bc32c71a 100644
--- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
+++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
@@ -52,12 +52,12 @@ import org.apache.shardingsphere.migration.distsql.statement.MigrateTableStateme
import org.apache.shardingsphere.migration.distsql.statement.pojo.SourceTargetEntry;
import org.apache.shardingsphere.test.it.data.pipeline.core.util.JobConfigurationBuilder;
import org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockedStatic;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.apache.shardingsphere.test.mock.AutoMockExtension;
+import org.apache.shardingsphere.test.mock.StaticMockSettings;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -74,21 +74,22 @@ import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(AutoMockExtension.class)
+@StaticMockSettings(PipelineDistributedBarrier.class)
public final class MigrationJobAPITest {
private static MigrationJobAPI jobAPI;
private static DatabaseType databaseType;
- @BeforeClass
+ @BeforeAll
public static void beforeClass() {
PipelineContextUtil.mockModeConfigAndContextManager();
jobAPI = new MigrationJobAPI();
@@ -101,7 +102,7 @@ public final class MigrationJobAPITest {
jobAPI.addMigrationSourceResources(Collections.singletonMap("ds_0", new DataSourceProperties("com.zaxxer.hikari.HikariDataSource", props)));
}
- @AfterClass
+ @AfterAll
public static void afterClass() {
jobAPI.dropMigrationSourceResources(Collections.singletonList("ds_0"));
}
@@ -125,13 +126,11 @@ public final class MigrationJobAPITest {
assertTrue(jobId.isPresent());
assertFalse(getJobConfigurationPOJO(jobId.get()).isDisabled());
PipelineDistributedBarrier mockBarrier = mock(PipelineDistributedBarrier.class);
- try (MockedStatic<PipelineDistributedBarrier> distributedBarrierMock = mockStatic(PipelineDistributedBarrier.class)) {
- distributedBarrierMock.when(PipelineDistributedBarrier::getInstance).thenReturn(mockBarrier);
- jobAPI.stop(jobId.get());
- assertTrue(getJobConfigurationPOJO(jobId.get()).isDisabled());
- jobAPI.startDisabledJob(jobId.get());
- assertFalse(getJobConfigurationPOJO(jobId.get()).isDisabled());
- }
+ when(PipelineDistributedBarrier.getInstance()).thenReturn(mockBarrier);
+ jobAPI.stop(jobId.get());
+ assertTrue(getJobConfigurationPOJO(jobId.get()).isDisabled());
+ jobAPI.startDisabledJob(jobId.get());
+ assertFalse(getJobConfigurationPOJO(jobId.get()).isDisabled());
}
@Test
@@ -141,10 +140,8 @@ public final class MigrationJobAPITest {
MigrationJobConfiguration jobConfig = jobAPI.getJobConfiguration(jobId.get());
initTableData(jobConfig);
PipelineDistributedBarrier mockBarrier = mock(PipelineDistributedBarrier.class);
- try (MockedStatic<PipelineDistributedBarrier> distributedBarrierMock = mockStatic(PipelineDistributedBarrier.class)) {
- distributedBarrierMock.when(PipelineDistributedBarrier::getInstance).thenReturn(mockBarrier);
- jobAPI.rollback(jobId.get());
- }
+ when(PipelineDistributedBarrier.getInstance()).thenReturn(mockBarrier);
+ jobAPI.rollback(jobId.get());
assertNull(getJobConfigurationPOJO(jobId.get()));
}
@@ -155,10 +152,8 @@ public final class MigrationJobAPITest {
MigrationJobConfiguration jobConfig = jobAPI.getJobConfiguration(jobId.get());
initTableData(jobConfig);
PipelineDistributedBarrier mockBarrier = mock(PipelineDistributedBarrier.class);
- try (MockedStatic<PipelineDistributedBarrier> distributedBarrierMock = mockStatic(PipelineDistributedBarrier.class)) {
- distributedBarrierMock.when(PipelineDistributedBarrier::getInstance).thenReturn(mockBarrier);
- jobAPI.commit(jobId.get());
- }
+ when(PipelineDistributedBarrier.getInstance()).thenReturn(mockBarrier);
+ jobAPI.commit(jobId.get());
assertNull(getJobConfigurationPOJO(jobId.get()));
}