This is an automated email from the ASF dual-hosted git repository. domgarguilo pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push: new 2980e4e Migrate gc module tests to JUnit5 (#2587) 2980e4e is described below commit 2980e4e9cedea438072057a5c846253688623a8f Author: Dom G <dominic.gargu...@gmail.com> AuthorDate: Thu Mar 24 09:19:31 2022 -0400 Migrate gc module tests to JUnit5 (#2587) --- server/gc/pom.xml | 4 ++-- .../accumulo/gc/GarbageCollectWriteAheadLogsTest.java | 2 +- .../java/org/apache/accumulo/gc/GarbageCollectionTest.java | 8 ++++---- .../org/apache/accumulo/gc/SimpleGarbageCollectorTest.java | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/gc/pom.xml b/server/gc/pom.xml index d5630e7..d010f7e 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -96,8 +96,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java index 4e60332..675fe4d 100644 --- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java +++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java @@ -47,7 +47,7 @@ import org.apache.accumulo.server.manager.LiveTServerSet; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.easymock.EasyMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GarbageCollectWriteAheadLogsTest { diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java index 35acd89..6da3fca 100644 --- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java +++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectionTest.java @@ -18,9 +18,9 @@ */ package org.apache.accumulo.gc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.Collections; @@ -38,7 +38,7 @@ import java.util.stream.Stream; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.data.TableId; import org.apache.accumulo.server.replication.proto.Replication.Status; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GarbageCollectionTest { diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java index dd5b59c..9c7541f 100644 --- a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java +++ b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java @@ -25,10 +25,10 @@ import static org.easymock.EasyMock.getCurrentArguments; import static org.easymock.EasyMock.partialMockBuilder; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.FileNotFoundException; import java.util.ArrayList; @@ -51,8 +51,8 @@ import org.apache.accumulo.server.fs.VolumeManager; import org.apache.accumulo.server.gc.GcVolumeUtil; import org.apache.accumulo.server.security.SystemCredentials; import org.apache.hadoop.fs.Path; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class SimpleGarbageCollectorTest { private VolumeManager volMgr; @@ -62,7 +62,7 @@ public class SimpleGarbageCollectorTest { private ConfigurationCopy systemConfig; private static SiteConfiguration siteConfig = SiteConfiguration.auto(); - @Before + @BeforeEach public void setUp() { volMgr = createMock(VolumeManager.class); context = createMock(ServerContext.class);