You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2021/02/03 20:42:35 UTC
[ozone] branch master updated: HDDS-4700. Add JUnit5 dependency for
integration tests (#1804)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 3f3d8fa HDDS-4700. Add JUnit5 dependency for integration tests (#1804)
3f3d8fa is described below
commit 3f3d8fa46ff95926a0b3551f66a69186448231ed
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Wed Feb 3 21:42:14 2021 +0100
HDDS-4700. Add JUnit5 dependency for integration tests (#1804)
---
hadoop-ozone/integration-test/pom.xml | 20 +++++++++++++++++++
.../hadoop/ozone/om/TestOMRatisSnapshots.java | 21 +++++++-------------
pom.xml | 23 ++++++++++++++++++++--
3 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index 7291540..dfe7dd0 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -104,6 +104,26 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<scope>test</scope>
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
index ac0beb6..54994d8 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java
@@ -43,19 +43,18 @@ import org.apache.ratis.server.protocol.TermIndex;
import static org.apache.hadoop.ozone.om.TestOzoneManagerHAWithData.createKey;
import static org.junit.Assert.assertTrue;
-import org.junit.After;
import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.slf4j.Logger;
import org.slf4j.event.Level;
/**
* Tests the Ratis snaphsots feature in OM.
*/
+@Timeout(500)
public class TestOMRatisSnapshots {
private MiniOzoneHAClusterImpl cluster = null;
@@ -72,12 +71,6 @@ public class TestOMRatisSnapshots {
private static final long SNAPSHOT_THRESHOLD = 50;
private static final int LOG_PURGE_GAP = 50;
- @Rule
- public ExpectedException exception = ExpectedException.none();
-
- @Rule
- public Timeout timeout = new Timeout(500_000);
-
/**
* Create a MiniOzoneCluster for testing. The cluster initially has one
* inactive OM. So at the start of the cluster, there will be 2 active and 1
@@ -85,7 +78,7 @@ public class TestOMRatisSnapshots {
*
* @throws IOException
*/
- @Before
+ @BeforeEach
public void init() throws Exception {
conf = new OzoneConfiguration();
clusterId = UUID.randomUUID().toString();
@@ -124,7 +117,7 @@ public class TestOMRatisSnapshots {
/**
* Shutdown MiniDFSCluster.
*/
- @After
+ @AfterEach
public void shutdown() {
if (cluster != null) {
cluster.shutdown();
diff --git a/pom.xml b/pom.xml
index 4035c85..828e1e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<hamcrest.version>1.3</hamcrest.version>
<powermock1.version>1.6.5</powermock1.version>
<powermock2.version>2.0.4</powermock2.version>
- <junit.jupiter.version>5.3.1</junit.jupiter.version>
+ <junit.jupiter.version>5.7.0</junit.jupiter.version>
+ <junit.platform.version>1.7.0</junit.platform.version>
<!-- Maven protoc compiler -->
<protobuf-maven-plugin.version>0.5.1</protobuf-maven-plugin.version>
@@ -1126,7 +1127,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.13.1</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -1135,6 +1136,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-launcher</artifactId>
+ <version>${junit.platform.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org