You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2023/02/26 10:53:03 UTC
[shardingsphere] branch master updated: Add junit 5' dependencies (#24351)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 120931d6c2b Add junit 5' dependencies (#24351)
120931d6c2b is described below
commit 120931d6c2bf4a4b3e2f47f31a20944694af3c94
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Feb 26 18:52:47 2023 +0800
Add junit 5' dependencies (#24351)
* Add junit 5' dependencies
---
agent/plugins/tracing/test/pom.xml | 15 ++++++++++
kernel/data-pipeline/cdc/core/pom.xml | 13 +++++++++
pom.xml | 33 +++++++++++++++++++++-
.../MySQLSetVariableAdminExecutorTest.java | 26 +++++++++++++----
...ostgreSQLDefaultSessionVariableHandlerTest.java | 2 +-
src/resources/checkstyle.xml | 4 +--
src/resources/checkstyle_ci.xml | 4 +--
test/fixture/infra/pom.xml | 5 ++++
test/fixture/jdbc/pom.xml | 5 ++++
test/it/parser/pom.xml | 17 +++++++++++
10 files changed, 113 insertions(+), 11 deletions(-)
diff --git a/agent/plugins/tracing/test/pom.xml b/agent/plugins/tracing/test/pom.xml
index 60422f33235..930ab64c195 100644
--- a/agent/plugins/tracing/test/pom.xml
+++ b/agent/plugins/tracing/test/pom.xml
@@ -55,10 +55,25 @@
<artifactId>junit-vintage-engine</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/kernel/data-pipeline/cdc/core/pom.xml b/kernel/data-pipeline/cdc/core/pom.xml
index 5559e4b263c..0fc9bcdf14f 100644
--- a/kernel/data-pipeline/cdc/core/pom.xml
+++ b/kernel/data-pipeline/cdc/core/pom.xml
@@ -38,9 +38,22 @@
<artifactId>shardingsphere-data-pipeline-cdc-protocol</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index dea6222fb12..e116601dd5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
<hikari-cp.version>4.0.3</hikari-cp.version>
<commons-dbcp2.version>2.9.0</commons-dbcp2.version>
- <junit5.version>5.9.1</junit5.version>
+ <junit5.version>5.9.2</junit5.version>
<junit4.version>4.13.2</junit4.version>
<hamcrest.version>1.3</hamcrest.version>
<mockito.version>4.8.0</mockito.version>
@@ -520,6 +520,18 @@
<version>${junit5.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
@@ -544,6 +556,12 @@
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.curator</groupId>
@@ -611,6 +629,15 @@
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
@@ -623,6 +650,10 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java
index 2ec045e7886..835ecb3236c 100644
--- a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java
+++ b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java
@@ -32,8 +32,10 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dal.VariableAssig
import org.apache.shardingsphere.sql.parser.sql.common.segment.dal.VariableSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dal.SetStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLSetStatement;
+import org.junit.After;
import org.junit.Test;
import org.mockito.MockedConstruction;
+import org.mockito.MockedStatic;
import java.sql.SQLException;
import java.util.Collections;
@@ -41,11 +43,19 @@ import java.util.Collections;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockConstruction;
+import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
public final class MySQLSetVariableAdminExecutorTest {
+ private final MockedStatic<ProxyContext> proxyContext = mockStatic(ProxyContext.class, RETURNS_DEEP_STUBS);
+
+ @After
+ public void tearDown() {
+ proxyContext.close();
+ }
+
@Test
public void assertExecute() throws SQLException {
SetStatement setStatement = prepareSetStatement();
@@ -55,11 +65,8 @@ public final class MySQLSetVariableAdminExecutorTest {
BackendConnection backendConnection = mock(BackendConnection.class);
when(connectionSession.getBackendConnection()).thenReturn(backendConnection);
when(backendConnection.getConnectionSession()).thenReturn(connectionSession);
- ProxyContext.init(mock(ContextManager.class, RETURNS_DEEP_STUBS));
- when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getDatabase("db")).thenReturn(mock(ShardingSphereDatabase.class));
- when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().containsDatabase("db")).thenReturn(true);
- when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData())
- .thenReturn(new ShardingSphereRuleMetaData(Collections.singletonList(new SQLParserRule(new SQLParserRuleConfiguration(false, new CacheOption(1, 1), new CacheOption(1, 1))))));
+ ContextManager contextManager = mockContextManager();
+ proxyContext.when(() -> ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
try (MockedConstruction<DatabaseConnector> mockConstruction = mockConstruction(DatabaseConnector.class)) {
executor.execute(connectionSession);
verify(mockConstruction.constructed().get(0)).execute();
@@ -84,4 +91,13 @@ public final class MySQLSetVariableAdminExecutorTest {
result.getVariableAssigns().add(setTestFixtureAssignSegment);
return result;
}
+
+ private ContextManager mockContextManager() {
+ ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
+ when(result.getMetaDataContexts().getMetaData().getDatabase("db")).thenReturn(mock(ShardingSphereDatabase.class));
+ when(result.getMetaDataContexts().getMetaData().containsDatabase("db")).thenReturn(true);
+ when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData())
+ .thenReturn(new ShardingSphereRuleMetaData(Collections.singleton(new SQLParserRule(new SQLParserRuleConfiguration(false, new CacheOption(1, 1), new CacheOption(1, 1))))));
+ return result;
+ }
}
diff --git a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLDefaultSessionVariableHandlerTest.java b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLDefaultSessionVariableHandlerTest.java
index 59b20dfafbd..71596691fc5 100644
--- a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLDefaultSessionVariableHandlerTest.java
+++ b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLDefaultSessionVariableHandlerTest.java
@@ -38,7 +38,7 @@ public final class PostgreSQLDefaultSessionVariableHandlerTest {
@Test
public void assertHandleDiscard() {
ConnectionSession connectionSession = mock(ConnectionSession.class);
- TypedSPILoader.getService(PostgreSQLSessionVariableHandler.class, null).handle(connectionSession, "", "");
+ new PostgreSQLDefaultSessionVariableHandler().handle(connectionSession, "", "");
verifyNoInteractions(connectionSession);
}
diff --git a/src/resources/checkstyle.xml b/src/resources/checkstyle.xml
index 85c0ae4039c..7149932bf3b 100644
--- a/src/resources/checkstyle.xml
+++ b/src/resources/checkstyle.xml
@@ -117,7 +117,7 @@
<!-- Imports -->
<module name="AvoidStarImport" />
<module name="AvoidStaticImport">
- <property name="excludes" value="org.junit.Assert.*,org.hamcrest.Matchers.*,org.hamcrest.CoreMatchers.*,org.hamcrest.MatcherAssert.*,org.mockito.Mockito.*,org.mockito.ArgumentMatchers.*" />
+ <property name="excludes" value="org.junit.jupiter.api.Assertions,org.junit.jupiter.api.Assumptions,org.junit.Assert.*,org.hamcrest.Matchers.*,org.hamcrest.CoreMatchers.*,org.hamcrest.MatcherAssert.*,org.mockito.Mockito.*,org.mockito.ArgumentMatchers.*" />
</module>
<module name="IllegalImport">
<property name="illegalClasses" value="org.mockito.junit.MockitoJUnitRunner.Silent" />
@@ -256,7 +256,7 @@
-->
<module name="JavadocMethod">
<property name="scope" value="public" />
- <property name="allowedAnnotations" value="Override, Test, Before, After, BeforeClass, AfterClass, Parameterized, Parameters" />
+ <property name="allowedAnnotations" value="Override, Test, Before, After, BeforeClass, AfterClass, Parameterized, Parameters, BeforeEach, AfterEach, BeforeAll, AfterAll, ParameterizedTest" />
<property name="ignoreMethodNamesRegex" value="^assert.*$|^verify.*$" />
<property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF" />
</module>
diff --git a/src/resources/checkstyle_ci.xml b/src/resources/checkstyle_ci.xml
index 2f3a08375a0..285eedc20a4 100644
--- a/src/resources/checkstyle_ci.xml
+++ b/src/resources/checkstyle_ci.xml
@@ -112,7 +112,7 @@
<!-- Imports -->
<module name="AvoidStarImport" />
<module name="AvoidStaticImport">
- <property name="excludes" value="org.junit.Assert.*,org.hamcrest.Matchers.*,org.hamcrest.CoreMatchers.*,org.hamcrest.MatcherAssert.*,org.mockito.Mockito.*,org.mockito.ArgumentMatchers.*" />
+ <property name="excludes" value="org.junit.jupiter.api.Assertions,org.junit.jupiter.api.Assumptions,org.junit.Assert.*,org.hamcrest.Matchers.*,org.hamcrest.CoreMatchers.*,org.hamcrest.MatcherAssert.*,org.mockito.Mockito.*,org.mockito.ArgumentMatchers.*" />
</module>
<module name="IllegalImport">
<property name="illegalClasses" value="org.mockito.junit.MockitoJUnitRunner.Silent" />
@@ -237,7 +237,7 @@
<module name="JavadocMethod">
<property name="scope" value="public" />
- <property name="allowedAnnotations" value="Override, Test, Before, After, BeforeClass, AfterClass, Parameterized, Parameters" />
+ <property name="allowedAnnotations" value="Override, Test, Before, After, BeforeClass, AfterClass, Parameterized, Parameters, BeforeEach, AfterEach, BeforeAll, AfterAll, ParameterizedTest" />
<property name="ignoreMethodNamesRegex" value="^assert.*$|^verify.*$" />
<property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF" />
</module>
diff --git a/test/fixture/infra/pom.xml b/test/fixture/infra/pom.xml
index 5b52d3076c1..8ca81499ab6 100644
--- a/test/fixture/infra/pom.xml
+++ b/test/fixture/infra/pom.xml
@@ -43,5 +43,10 @@
<artifactId>mockito-core</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/test/fixture/jdbc/pom.xml b/test/fixture/jdbc/pom.xml
index 4c144e7c189..7f4b23fdf65 100644
--- a/test/fixture/jdbc/pom.xml
+++ b/test/fixture/jdbc/pom.xml
@@ -37,5 +37,10 @@
<artifactId>mockito-core</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/test/it/parser/pom.xml b/test/it/parser/pom.xml
index 7dca9a7abde..543d730dad7 100644
--- a/test/it/parser/pom.xml
+++ b/test/it/parser/pom.xml
@@ -131,11 +131,28 @@
<artifactId>junit-vintage-engine</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockito.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>