This is an automated email from the ASF dual-hosted git repository.
richox pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/auron.git
The following commit(s) were added to refs/heads/master by this push:
new 0d47711f [AURON#1396] Upgrade from JUnit 4 to JUnit 5. (#1397)
0d47711f is described below
commit 0d47711fe36d00fb90096e6e45134e3a75a0ec7a
Author: slfan1989 <[email protected]>
AuthorDate: Thu Oct 9 14:53:45 2025 +0800
[AURON#1396] Upgrade from JUnit 4 to JUnit 5. (#1397)
* [AURON#1396] Upgrade from JUnit 4 to JUnit 5.
* [AURON#1396] Upgrade Junit5 From 5.13.3 to 5.13.4.
---
auron-core/pom.xml | 6 +--
.../configuration/AuronConfigurationTest.java | 23 +++++-----
.../auron/configuration/ConfigOptionTest.java | 23 +++++-----
.../org/apache/auron/jni/AuronAdaptorTest.java | 6 +--
auron-flink-extension/pom.xml | 6 +--
.../auron/flink/table/AuronFlinkTableTestBase.java | 4 +-
.../flink/table/runtime/AuronFlinkCalcITCase.java | 2 +-
pom.xml | 51 ++++++++++++++++++++++
8 files changed, 87 insertions(+), 34 deletions(-)
diff --git a/auron-core/pom.xml b/auron-core/pom.xml
index d1d3da52..c1fd8053 100644
--- a/auron-core/pom.xml
+++ b/auron-core/pom.xml
@@ -76,9 +76,9 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/auron-core/src/test/java/org/apache/auron/configuration/AuronConfigurationTest.java
b/auron-core/src/test/java/org/apache/auron/configuration/AuronConfigurationTest.java
index 14c0b0b3..63e1427e 100644
---
a/auron-core/src/test/java/org/apache/auron/configuration/AuronConfigurationTest.java
+++
b/auron-core/src/test/java/org/apache/auron/configuration/AuronConfigurationTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.auron.configuration;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* This is a test class for {@link AuronConfiguration}.
@@ -27,7 +28,7 @@ public class AuronConfigurationTest {
private MockAuronConfiguration config;
- @Before
+ @BeforeEach
public void setUp() {
config = new MockAuronConfiguration();
config.addConfig(MockAuronConfiguration.STRING_WITHOUT_DEFAULT_CONFIG_OPTION.key(),
"str1");
@@ -40,12 +41,12 @@ public class AuronConfigurationTest {
@Test
public void testGetConfig() {
- Assert.assertEquals("str1",
config.get(MockAuronConfiguration.STRING_WITHOUT_DEFAULT_CONFIG_OPTION));
- Assert.assertEquals("zm",
config.get(MockAuronConfiguration.STRING_CONFIG_OPTION));
- Assert.assertEquals(100,
config.getInteger(MockAuronConfiguration.INT_CONFIG_OPTION));
- Assert.assertEquals(false,
config.get(MockAuronConfiguration.BOOLEAN_CONFIG_OPTION));
- Assert.assertEquals(99.9,
config.get(MockAuronConfiguration.DOUBLE_CONFIG_OPTION), 0.0000000001);
- Assert.assertEquals(10000000000L,
config.getLong(MockAuronConfiguration.LONG_CONFIG_OPTION));
- Assert.assertEquals(1.2f,
config.get(MockAuronConfiguration.FLOAT_CONFIG_OPTION), 0.0000000001);
+ assertEquals("str1",
config.get(MockAuronConfiguration.STRING_WITHOUT_DEFAULT_CONFIG_OPTION));
+ assertEquals("zm",
config.get(MockAuronConfiguration.STRING_CONFIG_OPTION));
+ assertEquals(100,
config.getInteger(MockAuronConfiguration.INT_CONFIG_OPTION));
+ assertEquals(false,
config.get(MockAuronConfiguration.BOOLEAN_CONFIG_OPTION));
+ assertEquals(99.9,
config.get(MockAuronConfiguration.DOUBLE_CONFIG_OPTION), 0.0000000001);
+ assertEquals(10000000000L,
config.getLong(MockAuronConfiguration.LONG_CONFIG_OPTION));
+ assertEquals(1.2f,
config.get(MockAuronConfiguration.FLOAT_CONFIG_OPTION), 0.0000000001);
}
}
diff --git
a/auron-core/src/test/java/org/apache/auron/configuration/ConfigOptionTest.java
b/auron-core/src/test/java/org/apache/auron/configuration/ConfigOptionTest.java
index 5866a777..0242974a 100644
---
a/auron-core/src/test/java/org/apache/auron/configuration/ConfigOptionTest.java
+++
b/auron-core/src/test/java/org/apache/auron/configuration/ConfigOptionTest.java
@@ -16,8 +16,9 @@
*/
package org.apache.auron.configuration;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
/** Tests for the {@link ConfigOption}. */
public class ConfigOptionTest {
@@ -25,12 +26,12 @@ public class ConfigOptionTest {
@Test
public void testConfigOption() {
ConfigOption<String> keyOption =
ConfigOptions.key("key").stringType().noDefaultValue();
- Assert.assertEquals("key", keyOption.key());
- Assert.assertEquals(null, keyOption.defaultValue());
- Assert.assertEquals(false, keyOption.hasDefaultValue());
+ assertEquals("key", keyOption.key());
+ assertEquals(null, keyOption.defaultValue());
+ assertEquals(false, keyOption.hasDefaultValue());
ConfigOption<Boolean> booleanOption =
ConfigOptions.key("boolean").booleanType().defaultValue(true);
- Assert.assertEquals(true, booleanOption.defaultValue());
+ assertEquals(true, booleanOption.defaultValue());
}
@Test
@@ -39,12 +40,12 @@ public class ConfigOptionTest {
.description("this is a description of the key")
.stringType()
.noDefaultValue();
- Assert.assertEquals("key", keyOption.key());
- Assert.assertEquals(null, keyOption.defaultValue());
- Assert.assertEquals(false, keyOption.hasDefaultValue());
+ assertEquals("key", keyOption.key());
+ assertEquals(null, keyOption.defaultValue());
+ assertEquals(false, keyOption.hasDefaultValue());
ConfigOption<Boolean> booleanOption =
ConfigOptions.key("boolean").booleanType().defaultValue(true);
- Assert.assertEquals(true, booleanOption.defaultValue());
- Assert.assertEquals("this is a description of the key",
keyOption.description());
+ assertEquals(true, booleanOption.defaultValue());
+ assertEquals("this is a description of the key",
keyOption.description());
}
}
diff --git
a/auron-core/src/test/java/org/apache/auron/jni/AuronAdaptorTest.java
b/auron-core/src/test/java/org/apache/auron/jni/AuronAdaptorTest.java
index 3383bfe3..90438acd 100644
--- a/auron-core/src/test/java/org/apache/auron/jni/AuronAdaptorTest.java
+++ b/auron-core/src/test/java/org/apache/auron/jni/AuronAdaptorTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.auron.jni;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.auron.configuration.AuronConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* This is a test class for {@link AuronAdaptor}.
diff --git a/auron-flink-extension/pom.xml b/auron-flink-extension/pom.xml
index c4626fd8..0943abcb 100644
--- a/auron-flink-extension/pom.xml
+++ b/auron-flink-extension/pom.xml
@@ -248,9 +248,9 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/auron-flink-extension/src/test/java/org/apache/auron/flink/table/AuronFlinkTableTestBase.java
b/auron-flink-extension/src/test/java/org/apache/auron/flink/table/AuronFlinkTableTestBase.java
index 579682d2..8b60e638 100644
---
a/auron-flink-extension/src/test/java/org/apache/auron/flink/table/AuronFlinkTableTestBase.java
+++
b/auron-flink-extension/src/test/java/org/apache/auron/flink/table/AuronFlinkTableTestBase.java
@@ -26,7 +26,7 @@ import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
import org.apache.flink.table.planner.factories.TestValuesTableFactory;
import org.apache.flink.types.Row;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
/**
* Base class for Flink Table Tests.
@@ -36,7 +36,7 @@ public class AuronFlinkTableTestBase {
protected StreamExecutionEnvironment environment;
protected StreamTableEnvironment tableEnvironment;
- @Before
+ @BeforeEach
public void before() {
environment = StreamExecutionEnvironment.getExecutionEnvironment();
Configuration configuration = new Configuration();
diff --git
a/auron-flink-extension/src/test/java/org/apache/auron/flink/table/runtime/AuronFlinkCalcITCase.java
b/auron-flink-extension/src/test/java/org/apache/auron/flink/table/runtime/AuronFlinkCalcITCase.java
index 49bfc2be..168d4ccf 100644
---
a/auron-flink-extension/src/test/java/org/apache/auron/flink/table/runtime/AuronFlinkCalcITCase.java
+++
b/auron-flink-extension/src/test/java/org/apache/auron/flink/table/runtime/AuronFlinkCalcITCase.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.auron.flink.table.AuronFlinkTableTestBase;
import org.apache.flink.types.Row;
import org.apache.flink.util.CollectionUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* IT case for Flink Calc Operator on Auron.
diff --git a/pom.xml b/pom.xml
index f44da643..e711403c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,9 +66,12 @@
<maven.plugin.shade.version>3.5.2</maven.plugin.shade.version>
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
<maven.plugin.templating.version>3.0.0</maven.plugin.templating.version>
+ <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<scalamacros.paradise.version>2.1.1</scalamacros.paradise.version>
<semanticdb.version>4.8.1</semanticdb.version>
+ <junit.jupiter.version>5.13.4</junit.jupiter.version>
+
<restrict-imports.enforcer.version>2.6.0</restrict-imports.enforcer.version>
<extraJavaTestArgs>-XX:+IgnoreUnrecognizedVMOptions
--add-opens=java.base/java.lang=ALL-UNNAMED
@@ -479,6 +482,54 @@
</execution>
</executions>
</plugin>
+
+ <!-- Configuring maven-enforcer-plugin to enforce Maven/Java versions
and restrict imports -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin.version}</version>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.0.2,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[1.8,)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>de.skuzzle.enforcer</groupId>
+ <artifactId>restrict-imports-enforcer-rule</artifactId>
+ <version>${restrict-imports.enforcer.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>banned-illegal-imports</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <rules>
+ <restrictImports>
+ <includeTestCode>true</includeTestCode>
+ <reason>Use JUnit5</reason>
+ <bannedImports>
+ <bannedImport>org.junit.**</bannedImport>
+ </bannedImports>
+ <allowedImports>
+ <allowedImport>org.junit.jupiter.**</allowedImport>
+ <allowedImport>org.junit.platform.**</allowedImport>
+ </allowedImports>
+ </restrictImports>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
