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 c1937a1757 HDDS-9935. Remove leftover JUnit4 imports from modules
already migrated (#5804)
c1937a1757 is described below
commit c1937a1757fa9ea5b141cc726742ff0118578cd0
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Dec 18 19:32:02 2023 +0100
HDDS-9935. Remove leftover JUnit4 imports from modules already migrated
(#5804)
---
.../ozone/container/keyvalue/TestKeyValueContainer.java | 5 ++---
.../ozone/container/replication/TestContainerImporter.java | 11 ++++++-----
.../hdds/scm/pipeline/TestWritableECContainerProvider.java | 2 --
.../hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java | 4 ++--
.../apache/hadoop/ozone/om/upgrade/TestOMVersionManager.java | 3 ---
.../ozone/om/upgrade/TestOmVersionManagerRequestFactory.java | 4 +---
.../org/apache/hadoop/ozone/security/acl/TestParentAcl.java | 4 +---
.../java/org/apache/hadoop/ozone/recon/ReconTestInjector.java | 9 ---------
pom.xml | 11 +++++++----
9 files changed, 19 insertions(+), 34 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
index d359634653..9e2e2de6db 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueContainer.java
@@ -59,7 +59,6 @@ import org.apache.hadoop.util.DiskChecker;
import org.assertj.core.api.Fail;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
-import org.junit.Assume;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;
@@ -97,6 +96,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.mock;
@@ -823,8 +823,7 @@ public class TestKeyValueContainer {
public void testAutoCompactionSmallSstFile(
ContainerTestVersionInfo versionInfo) throws Exception {
init(versionInfo);
- Assume.assumeTrue(
- isSameSchemaVersion(schemaVersion, OzoneConsts.SCHEMA_V3));
+ assumeTrue(isSameSchemaVersion(schemaVersion, OzoneConsts.SCHEMA_V3));
// Create a new HDDS volume
String volumeDirPath =
Files.createDirectory(folder.resolve("volumeDir")).toFile()
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestContainerImporter.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestContainerImporter.java
index 6b81acee77..3d168f5384 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestContainerImporter.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/replication/TestContainerImporter.java
@@ -44,7 +44,7 @@ import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.io.TempDir;
import static
org.apache.hadoop.ozone.container.replication.CopyContainerCompression.NO_COMPRESSION;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -57,6 +57,9 @@ import static org.mockito.Mockito.when;
*/
class TestContainerImporter {
+ @TempDir
+ private File tempDir;
+
private OzoneConfiguration conf;
@BeforeEach
@@ -136,13 +139,11 @@ class TestContainerImporter {
private File containerTarFile(
long containerId, ContainerData containerData) throws IOException {
- TemporaryFolder tempFolder = new TemporaryFolder();
- tempFolder.create();
- File yamlFile = tempFolder.newFile("container.yaml");
+ File yamlFile = new File(tempDir, "container.yaml");
ContainerDataYaml.createContainerFile(
ContainerProtos.ContainerType.KeyValueContainer, containerData,
yamlFile);
- File tarFile = tempFolder.newFile(
+ File tarFile = new File(tempDir,
ContainerUtils.getContainerTarName(containerId));
try (FileOutputStream output = new FileOutputStream(tarFile)) {
TarArchiveOutputStream archive = new TarArchiveOutputStream(output);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestWritableECContainerProvider.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestWritableECContainerProvider.java
index bbedb502fc..3ce3302088 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestWritableECContainerProvider.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestWritableECContainerProvider.java
@@ -43,7 +43,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.runners.Parameterized;
import org.mockito.Mockito;
import java.io.File;
@@ -91,7 +90,6 @@ public class TestWritableECContainerProvider {
private Map<ContainerID, ContainerInfo> containers;
private WritableECContainerProviderConfig providerConf;
- @Parameterized.Parameters
public static Collection<PipelineChoosePolicy> policies() {
Collection<PipelineChoosePolicy> policies = new ArrayList<>();
policies.add(new RandomPipelineChoosePolicy());
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java
index 7e5fab8a6f..38f5dee109 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMBlockProtocolServer.java
@@ -53,7 +53,6 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
-import org.junit.platform.commons.util.Preconditions;
import org.mockito.Mockito;
import java.io.File;
@@ -71,6 +70,7 @@ import static
org.apache.hadoop.fs.CommonConfigurationKeysPublic.NET_TOPOLOGY_NO
import static
org.apache.hadoop.hdds.protocol.MockDatanodeDetails.randomDatanodeDetails;
import static org.apache.hadoop.hdds.scm.net.NetConstants.ROOT_LEVEL;
import static org.apache.hadoop.ozone.OzoneConsts.MB;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test class for @{@link SCMBlockProtocolServer}.
@@ -93,7 +93,7 @@ public class TestSCMBlockProtocolServer {
private final List<DatanodeDetails> datanodes;
BlockManagerStub(List<DatanodeDetails> datanodes) {
- Preconditions.notNull(datanodes, "Datanodes cannot be null");
+ assertNotNull(datanodes, "Datanodes cannot be null");
this.datanodes = datanodes;
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMVersionManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMVersionManager.java
index 05fe911d04..792a79012b 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMVersionManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMVersionManager.java
@@ -46,11 +46,9 @@ import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.request.OMClientRequest;
import org.apache.hadoop.ozone.upgrade.LayoutFeature.UpgradeActionType;
-import org.apache.ozone.test.UnhealthyTest;
import org.apache.ozone.test.tag.Unhealthy;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.experimental.categories.Category;
/**
* Test OM layout version management.
@@ -106,7 +104,6 @@ public class TestOMVersionManager {
}
@Test
- @Category(UnhealthyTest.class)
@Unhealthy("Since there is no longer a need to enforce the getRequestType " +
"method in OM request classes, disabling the " +
"test. Potentially revisit later.")
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOmVersionManagerRequestFactory.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOmVersionManagerRequestFactory.java
index 5911eca948..46a71fc503 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOmVersionManagerRequestFactory.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOmVersionManagerRequestFactory.java
@@ -29,18 +29,16 @@ import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.request.OMClientRequest;
import org.apache.hadoop.ozone.om.request.key.OMKeyCreateRequest;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
-import org.apache.ozone.test.UnhealthyTest;
import org.apache.ozone.test.tag.Unhealthy;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.experimental.categories.Category;
import org.reflections.Reflections;
/**
* Test OmVersionFactory.
*/
-@Category(UnhealthyTest.class) @Unhealthy("Ignored since this is incompatible"
+
+@Unhealthy("Ignored since this is incompatible" +
" with HDDS-2939 work. Potentially revisit later.")
public class TestOmVersionManagerRequestFactory {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
index 4db1ccf877..143617450b 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestParentAcl.java
@@ -46,13 +46,11 @@ import
org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLType;
import org.apache.hadoop.security.UserGroupInformation;
import
org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ozone.test.UnhealthyTest;
import org.apache.ozone.test.tag.Unhealthy;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.experimental.categories.Category;
import java.io.File;
import java.io.IOException;
@@ -129,7 +127,7 @@ public class TestParentAcl {
}
@Test
- @Category(UnhealthyTest.class) @Unhealthy("HDDS-6335")
+ @Unhealthy("HDDS-6335")
public void testKeyAcl()
throws IOException {
OzoneObj keyObj;
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/ReconTestInjector.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/ReconTestInjector.java
index 86d5d676e9..6800604248 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/ReconTestInjector.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/ReconTestInjector.java
@@ -45,7 +45,6 @@ import
org.apache.hadoop.ozone.recon.spi.impl.ReconContainerMetadataManagerImpl;
import org.apache.hadoop.ozone.recon.spi.impl.ReconNamespaceSummaryManagerImpl;
import org.apache.hadoop.ozone.recon.spi.impl.ReconDBProvider;
import org.apache.ratis.util.Preconditions;
-import org.junit.rules.TemporaryFolder;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
@@ -74,10 +73,6 @@ public class ReconTestInjector {
private Map<Class, Object> extraInstanceBindings = new HashMap<>();
private Set<Class> extraClassBindings = new HashSet<>();
- public ReconTestInjector(TemporaryFolder temporaryFolder) throws IOException
{
- this.tmpDir = temporaryFolder.newFolder();
- }
-
public ReconTestInjector(File tmpDir) {
this.tmpDir = tmpDir;
}
@@ -238,10 +233,6 @@ public class ReconTestInjector {
public static class Builder {
private ReconTestInjector reconTestInjector;
- public Builder(TemporaryFolder temporaryFolder) throws IOException {
- reconTestInjector = new ReconTestInjector(temporaryFolder);
- }
-
public Builder(File tmpDir) {
reconTestInjector = new ReconTestInjector(tmpDir);
}
diff --git a/pom.xml b/pom.xml
index 4123ff38b5..164d2bbcd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,7 +271,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<maven-pdf-plugin.version>1.6.1</maven-pdf-plugin.version>
<maven-remote-resources-plugin.version>1.5</maven-remote-resources-plugin.version>
- <maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
+ <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
@@ -301,7 +301,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<aspectj.version>1.9.7</aspectj.version>
<aspectj-plugin.version>1.14.0</aspectj-plugin.version>
-
<restrict-imports.enforcer.version>2.0.0</restrict-imports.enforcer.version>
+
<restrict-imports.enforcer.version>2.4.0</restrict-imports.enforcer.version>
<awaitility.version>4.2.0</awaitility.version>
<bzip2.version>1.0.8</bzip2.version>
<zlib.version>1.2.13</zlib.version>
@@ -1817,11 +1817,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<rules>
<restrictImports>
<includeTestCode>true</includeTestCode>
+ <parseFullCompilationUnit>true</parseFullCompilationUnit>
<reason>Use JUnit5</reason>
<bannedImports>
- <bannedImport>org.junit.*</bannedImport>
- <bannedImport>static org.junit.*.*</bannedImport>
+ <bannedImport>org.junit.**</bannedImport>
</bannedImports>
+ <allowedImports>
+ <allowedImport>org.junit.jupiter.**</allowedImport>
+ </allowedImports>
</restrictImports>
</rules>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
