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 19dd9c8142 HDDS-9498. Migrate tests with TemporaryFolder in
ozone-recon to JUnit5 (#5556)
19dd9c8142 is described below
commit 19dd9c81423a45ac6b4694e9cfcf5de8162f1b8d
Author: Raju Balpande <[email protected]>
AuthorDate: Wed Nov 15 01:46:00 2023 +0530
HDDS-9498. Migrate tests with TemporaryFolder in ozone-recon to JUnit5
(#5556)
---
hadoop-ozone/recon/pom.xml | 5 +
.../hadoop/ozone/recon/api/TestBlocksEndPoint.java | 22 ++--
.../ozone/recon/api/TestContainerEndpoint.java | 100 +++++++-------
.../ozone/recon/api/TestContainerStateCounts.java | 13 +-
.../hadoop/ozone/recon/api/TestEndpoints.java | 12 +-
.../ozone/recon/api/TestFeaturesEndPoint.java | 23 ++--
.../recon/api/TestNSSummaryEndpointWithFSO.java | 141 ++++++++++----------
.../recon/api/TestNSSummaryEndpointWithLegacy.java | 145 +++++++++++----------
.../ozone/recon/api/TestOmDBInsightEndPoint.java | 20 ++-
.../ozone/recon/api/TestOpenContainerCount.java | 30 +++--
.../ozone/recon/api/TestTriggerDBSyncEndpoint.java | 29 +++--
.../ozone/recon/heatmap/TestHeatMapInfo.java | 22 ++--
.../recon/persistence/AbstractReconSqlDBTest.java | 26 ++--
.../persistence/TestReconWithDifferentSqlDBs.java | 58 ++++-----
.../recovery/TestReconOmMetadataManagerImpl.java | 57 ++++----
.../ozone/recon/scm/TestReconNodeManager.java | 21 ++-
.../ozone/recon/scm/TestReconPipelineManager.java | 28 ++--
.../TestReconContainerMetadataManagerImpl.java | 41 +++---
.../ozone/recon/spi/impl/TestReconDBProvider.java | 17 ++-
.../impl/TestReconNamespaceSummaryManagerImpl.java | 54 ++++----
.../recon/tasks/TestContainerKeyMapperTask.java | 25 ++--
.../ozone/recon/tasks/TestOMDBUpdatesHandler.java | 38 +++---
.../ozone/recon/tasks/TestOmTableInsightTask.java | 11 +-
.../recon/tasks/TestOmUpdateEventValidator.java | 22 ++--
24 files changed, 500 insertions(+), 460 deletions(-)
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 959655e459..31c520d9d5 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -305,6 +305,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java
index 385345a5e8..b1dfed9929 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java
@@ -37,14 +37,15 @@ import
org.apache.hadoop.ozone.recon.scm.ReconStorageContainerManagerFacade;
import org.apache.hadoop.ozone.recon.spi.StorageContainerServiceProvider;
import org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl;
import
org.apache.hadoop.ozone.recon.spi.impl.StorageContainerServiceProviderImpl;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Assertions;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.io.TempDir;
import javax.ws.rs.core.Response;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -62,8 +63,8 @@ import static org.mockito.Mockito.mock;
*/
public class TestBlocksEndPoint {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private ReconStorageContainerManagerFacade reconStorageContainerManager;
private ReconContainerManager reconContainerManager;
@@ -75,11 +76,12 @@ public class TestBlocksEndPoint {
private void initializeInjector() throws Exception {
reconOMMetadataManager = getTestReconOmMetadataManager(
- initializeNewOmMetadataManager(temporaryFolder.newFolder()),
- temporaryFolder.newFolder());
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("JunitOmDBDir")).toFile()),
+ Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(mock(OzoneManagerServiceProviderImpl.class))
@@ -105,7 +107,7 @@ public class TestBlocksEndPoint {
scmDBStore = reconStorageContainerManager.getScmDBStore();
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// The following setup runs only once
if (!isSetupDone) {
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
index 8b585da6ba..38522a7b82 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java
@@ -68,18 +68,17 @@ import
org.apache.hadoop.ozone.recon.spi.impl.StorageContainerServiceProviderImp
import org.apache.hadoop.ozone.recon.tasks.ContainerKeyMapperTask;
import
org.hadoop.ozone.recon.schema.ContainerSchemaDefinition.UnHealthyContainerStates;
import org.hadoop.ozone.recon.schema.tables.pojos.UnhealthyContainers;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -100,12 +99,12 @@ import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getTestRe
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.initializeNewOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.writeDataToOm;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.writeKeyToOm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -114,8 +113,8 @@ import static org.mockito.Mockito.when;
*/
public class TestContainerEndpoint {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private static final Logger LOG =
LoggerFactory.getLogger(TestContainerEndpoint.class);
@@ -167,11 +166,12 @@ public class TestContainerEndpoint {
private void initializeInjector() throws Exception {
reconOMMetadataManager = getTestReconOmMetadataManager(
- initializeNewOmMetadataManager(temporaryFolder.newFolder()),
- temporaryFolder.newFolder());
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("JunitOmDBDir")).toFile()),
+ Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(mock(OzoneManagerServiceProviderImpl.class))
@@ -205,7 +205,7 @@ public class TestContainerEndpoint {
.getContainerStateManager();
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// The following setup runs only once
if (!isSetupDone) {
@@ -759,7 +759,7 @@ public class TestContainerEndpoint {
new HashSet<>(Arrays.asList("host2", "host3", "host4")));
List<ContainerHistory> containerReplicas = container.getReplicas();
containerReplicas.forEach(history -> {
- Assert.assertTrue(datanodes.contains(history.getDatanodeHost()));
+ assertTrue(datanodes.contains(history.getDatanodeHost()));
});
}
@@ -838,7 +838,7 @@ public class TestContainerEndpoint {
new HashSet<>(Arrays.asList("host2", "host3", "host4")));
List<ContainerHistory> containerReplicas = missing.get(0).getReplicas();
containerReplicas.forEach(history -> {
- Assert.assertTrue(datanodes.contains(history.getDatanodeHost()));
+ assertTrue(datanodes.contains(history.getDatanodeHost()));
});
List<UnhealthyContainerMetadata> overRep = records
@@ -997,23 +997,23 @@ public class TestContainerEndpoint {
Set<String> datanodes = Collections.unmodifiableSet(
new HashSet<>(Arrays.asList(
u1.toString(), u2.toString(), u3.toString(), u4.toString())));
- Assert.assertEquals(4, histories.size());
+ assertEquals(4, histories.size());
histories.forEach(history -> {
- Assert.assertTrue(datanodes.contains(history.getDatanodeUuid()));
+ assertTrue(datanodes.contains(history.getDatanodeUuid()));
if (history.getDatanodeUuid().equals(u1.toString())) {
- Assert.assertEquals("host1", history.getDatanodeHost());
- Assert.assertEquals(1L, history.getFirstSeenTime());
- Assert.assertEquals(5L, history.getLastSeenTime());
+ assertEquals("host1", history.getDatanodeHost());
+ assertEquals(1L, history.getFirstSeenTime());
+ assertEquals(5L, history.getLastSeenTime());
}
});
// Check getLatestContainerHistory
List<ContainerHistory> hist1 = reconContainerManager
.getLatestContainerHistory(1L, 10);
- Assert.assertTrue(hist1.size() <= 10);
+ assertTrue(hist1.size() <= 10);
// Descending order by last report timestamp
for (int i = 0; i < hist1.size() - 1; i++) {
- Assert.assertTrue(hist1.get(i).getLastSeenTime()
+ assertTrue(hist1.get(i).getLastSeenTime()
>= hist1.get(i + 1).getLastSeenTime());
}
}
@@ -1116,7 +1116,7 @@ public class TestContainerEndpoint {
HddsProtos.LifeCycleEvent.CLEANUP);
Set<ContainerID> containerIDs = containerStateManager
.getContainerIDs(HddsProtos.LifeCycleState.DELETED);
- Assertions.assertEquals(1, containerIDs.size());
+ assertEquals(1, containerIDs.size());
reconContainerManager.updateContainerState(ContainerID.valueOf(103L),
HddsProtos.LifeCycleEvent.FINALIZE);
@@ -1132,23 +1132,21 @@ public class TestContainerEndpoint {
HddsProtos.LifeCycleEvent.CLEANUP);
containerIDs = containerStateManager
.getContainerIDs(HddsProtos.LifeCycleState.DELETED);
- Assertions.assertEquals(2, containerIDs.size());
+ assertEquals(2, containerIDs.size());
Response scmDeletedContainers =
containerEndpoint.getSCMDeletedContainers(2, 0);
List<DeletedContainerInfo> deletedContainerInfoList =
(List<DeletedContainerInfo>) scmDeletedContainers.getEntity();
- Assertions.assertEquals(2, deletedContainerInfoList.size());
+ assertEquals(2, deletedContainerInfoList.size());
DeletedContainerInfo deletedContainerInfo =
deletedContainerInfoList.get(0);
- Assertions.assertEquals(102, deletedContainerInfo.getContainerID());
- Assertions.assertEquals("DELETED",
- deletedContainerInfo.getContainerState());
+ assertEquals(102, deletedContainerInfo.getContainerID());
+ assertEquals("DELETED", deletedContainerInfo.getContainerState());
deletedContainerInfo = deletedContainerInfoList.get(1);
- Assertions.assertEquals(103, deletedContainerInfo.getContainerID());
- Assertions.assertEquals("DELETED",
- deletedContainerInfo.getContainerState());
+ assertEquals(103, deletedContainerInfo.getContainerID());
+ assertEquals("DELETED", deletedContainerInfo.getContainerState());
}
@Test
@@ -1169,7 +1167,7 @@ public class TestContainerEndpoint {
HddsProtos.LifeCycleEvent.CLEANUP);
Set<ContainerID> containerIDs = containerStateManager
.getContainerIDs(HddsProtos.LifeCycleState.DELETED);
- Assertions.assertEquals(1, containerIDs.size());
+ assertEquals(1, containerIDs.size());
reconContainerManager.updateContainerState(ContainerID.valueOf(105L),
HddsProtos.LifeCycleEvent.FINALIZE);
@@ -1183,18 +1181,17 @@ public class TestContainerEndpoint {
HddsProtos.LifeCycleEvent.CLEANUP);
containerIDs = containerStateManager
.getContainerIDs(HddsProtos.LifeCycleState.DELETED);
- Assertions.assertEquals(2, containerIDs.size());
+ assertEquals(2, containerIDs.size());
Response scmDeletedContainers =
containerEndpoint.getSCMDeletedContainers(1, 0);
List<DeletedContainerInfo> deletedContainerInfoList =
(List<DeletedContainerInfo>) scmDeletedContainers.getEntity();
- Assertions.assertEquals(1, deletedContainerInfoList.size());
+ assertEquals(1, deletedContainerInfoList.size());
DeletedContainerInfo deletedContainerInfo =
deletedContainerInfoList.get(0);
- Assertions.assertEquals(104, deletedContainerInfo.getContainerID());
- Assertions.assertEquals("DELETED",
- deletedContainerInfo.getContainerState());
+ assertEquals(104, deletedContainerInfo.getContainerID());
+ assertEquals("DELETED", deletedContainerInfo.getContainerState());
}
@Test
@@ -1216,7 +1213,7 @@ public class TestContainerEndpoint {
HddsProtos.LifeCycleEvent.CLEANUP);
Set<ContainerID> containerIDs = containerStateManager
.getContainerIDs(HddsProtos.LifeCycleState.DELETED);
- Assertions.assertEquals(1, containerIDs.size());
+ assertEquals(1, containerIDs.size());
reconContainerManager.updateContainerState(ContainerID.valueOf(107L),
HddsProtos.LifeCycleEvent.FINALIZE);
@@ -1230,18 +1227,17 @@ public class TestContainerEndpoint {
HddsProtos.LifeCycleEvent.CLEANUP);
containerIDs = containerStateManager
.getContainerIDs(HddsProtos.LifeCycleState.DELETED);
- Assertions.assertEquals(2, containerIDs.size());
+ assertEquals(2, containerIDs.size());
Response scmDeletedContainers =
containerEndpoint.getSCMDeletedContainers(2, 106L);
List<DeletedContainerInfo> deletedContainerInfoList =
(List<DeletedContainerInfo>) scmDeletedContainers.getEntity();
- Assertions.assertEquals(1, deletedContainerInfoList.size());
+ assertEquals(1, deletedContainerInfoList.size());
DeletedContainerInfo deletedContainerInfo =
deletedContainerInfoList.get(0);
- Assertions.assertEquals(107, deletedContainerInfo.getContainerID());
- Assertions.assertEquals("DELETED",
- deletedContainerInfo.getContainerState());
+ assertEquals(107, deletedContainerInfo.getContainerID());
+ assertEquals("DELETED", deletedContainerInfo.getContainerState());
}
private void updateContainerStateToDeleted(long containerId)
@@ -1513,14 +1509,14 @@ public class TestContainerEndpoint {
HddsProtos.LifeCycleEvent.DELETE);
Set<ContainerID> containerIDs = containerStateManager
.getContainerIDs(HddsProtos.LifeCycleState.DELETING);
- Assert.assertEquals(1, containerIDs.size());
+ assertEquals(1, containerIDs.size());
reconContainerManager
.updateContainerState(ContainerID.valueOf(1),
HddsProtos.LifeCycleEvent.CLEANUP);
containerIDs = containerStateManager
.getContainerIDs(HddsProtos.LifeCycleState.DELETED);
- Assert.assertEquals(1, containerIDs.size());
+ assertEquals(1, containerIDs.size());
List<ContainerInfo> deletedSCMContainers =
reconContainerManager.getContainers(HddsProtos.LifeCycleState.DELETED);
@@ -1562,7 +1558,7 @@ public class TestContainerEndpoint {
Set<ContainerID> containerIDs = containerStateManager
.getContainerIDs(HddsProtos.LifeCycleState.DELETED);
- Assert.assertEquals(1, containerIDs.size());
+ assertEquals(1, containerIDs.size());
List<ContainerInfo> deletedSCMContainers =
reconContainerManager.getContainers(HddsProtos.LifeCycleState.DELETED);
@@ -1606,7 +1602,7 @@ public class TestContainerEndpoint {
Set<ContainerID> containerIDs = containerStateManager
.getContainerIDs(HddsProtos.LifeCycleState.DELETED);
- Assert.assertEquals(2, containerIDs.size());
+ assertEquals(2, containerIDs.size());
List<ContainerInfo> deletedSCMContainers =
reconContainerManager.getContainers(HddsProtos.LifeCycleState.DELETED);
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerStateCounts.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerStateCounts.java
index 78db1b5ab8..b9f0d99266 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerStateCounts.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerStateCounts.java
@@ -41,9 +41,12 @@ import
org.hadoop.ozone.recon.schema.tables.daos.GlobalStatsDao;
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 javax.ws.rs.core.Response;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.concurrent.TimeoutException;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getRandomPipeline;
@@ -55,7 +58,8 @@ import static org.mockito.Mockito.mock;
* Unit test for ClusterStateEndpoint ContainerStateCounts.
*/
public class TestContainerStateCounts extends AbstractReconSqlDBTest {
-
+ @TempDir
+ private Path temporaryFolder;
private OzoneStorageContainerManager ozoneStorageContainerManager;
private ContainerHealthSchemaManager containerHealthSchemaManager;
private ClusterStateEndpoint clusterStateEndpoint;
@@ -74,10 +78,11 @@ public class TestContainerStateCounts extends
AbstractReconSqlDBTest {
@BeforeEach
public void setUp() throws Exception {
reconOMMetadataManager = getTestReconOmMetadataManager(
- initializeNewOmMetadataManager(temporaryFolder.newFolder()),
- temporaryFolder.newFolder());
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("JunitOmDBDir")).toFile()),
+ Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(mock(OzoneManagerServiceProviderImpl.class))
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
index 9c00ae64f4..7ac29e5d0f 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestEndpoints.java
@@ -100,6 +100,7 @@ import org.jooq.DSLContext;
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 static
org.apache.hadoop.hdds.protocol.MockDatanodeDetails.randomDatanodeDetails;
import static
org.apache.hadoop.ozone.container.upgrade.UpgradeUtils.defaultLayoutVersionProto;
@@ -133,6 +134,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -145,6 +148,8 @@ import java.util.concurrent.atomic.AtomicInteger;
* Test for Recon API endpoints.
*/
public class TestEndpoints extends AbstractReconSqlDBTest {
+ @TempDir
+ private Path temporaryFolder;
private NodeEndpoint nodeEndpoint;
private PipelineEndpoint pipelineEndpoint;
private ClusterStateEndpoint clusterStateEndpoint;
@@ -181,8 +186,9 @@ public class TestEndpoints extends AbstractReconSqlDBTest {
private void initializeInjector() throws Exception {
reconOMMetadataManager = getTestReconOmMetadataManager(
- initializeNewOmMetadataManager(temporaryFolder.newFolder()),
- temporaryFolder.newFolder());
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("JunitOmDBDir")).toFile()),
+ Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
datanodeDetails = randomDatanodeDetails();
datanodeDetails2 = randomDatanodeDetails();
datanodeDetails.setHostName(HOST1);
@@ -235,7 +241,7 @@ public class TestEndpoints extends AbstractReconSqlDBTest {
any(OzoneConfiguration.class))).thenReturn(
commonUtils.getReconNodeDetails());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(mock(OzoneManagerServiceProviderImpl.class))
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
index 6790befca7..00732561a5 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestFeaturesEndPoint.java
@@ -27,14 +27,14 @@ import
org.apache.hadoop.ozone.recon.scm.ReconStorageContainerManagerFacade;
import org.apache.hadoop.ozone.recon.spi.StorageContainerServiceProvider;
import org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl;
import
org.apache.hadoop.ozone.recon.spi.impl.StorageContainerServiceProviderImpl;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Assertions;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.io.TempDir;
import javax.ws.rs.core.Response;
-
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.List;
import static
org.apache.hadoop.hdds.recon.ReconConfigKeys.OZONE_RECON_HEATMAP_ENABLE_KEY;
@@ -48,8 +48,8 @@ import static org.mockito.Mockito.mock;
*/
public class TestFeaturesEndPoint {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private FeaturesEndpoint featuresEndPoint;
private boolean isSetupDone = false;
private ReconOMMetadataManager reconOMMetadataManager;
@@ -58,11 +58,12 @@ public class TestFeaturesEndPoint {
private void initializeInjector() throws Exception {
ozoneConfiguration = new OzoneConfiguration();
reconOMMetadataManager = getTestReconOmMetadataManager(
- initializeNewOmMetadataManager(temporaryFolder.newFolder()),
- temporaryFolder.newFolder());
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("JunitOmDBDir")).toFile()),
+ Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(mock(OzoneManagerServiceProviderImpl.class))
@@ -80,7 +81,7 @@ public class TestFeaturesEndPoint {
FeaturesEndpoint.class);
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// The following setup runs only once
if (!isSetupDone) {
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithFSO.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithFSO.java
index 4830b0e6e0..d3bee19ba6 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithFSO.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithFSO.java
@@ -57,16 +57,16 @@ import
org.apache.hadoop.ozone.recon.spi.StorageContainerServiceProvider;
import org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl;
import
org.apache.hadoop.ozone.recon.spi.impl.StorageContainerServiceProviderImpl;
import org.apache.hadoop.ozone.recon.tasks.NSSummaryTaskWithFSO;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import javax.ws.rs.core.Response;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -74,6 +74,8 @@ import java.util.ArrayList;
import java.util.Set;
import java.util.HashSet;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static
org.apache.hadoop.hdds.protocol.MockDatanodeDetails.randomDatanodeDetails;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_DB_DIRS;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.writeDirToOm;
@@ -108,8 +110,8 @@ import static org.mockito.Mockito.when;
* so there is no need to test process() on DB's updates
*/
public class TestNSSummaryEndpointWithFSO {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private ReconOMMetadataManager reconOMMetadataManager;
private NSSummaryEndpoint nsSummaryEndpoint;
@@ -348,20 +350,21 @@ public class TestNSSummaryEndpointWithFSO {
private static final long DIR_ONE_DATA_SIZE = KEY_TWO_SIZE +
KEY_THREE_SIZE + KEY_SIX_SIZE;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
ozoneConfiguration = new OzoneConfiguration();
ozoneConfiguration.setLong(OZONE_RECON_NSSUMMARY_FLUSH_TO_DB_MAX_THRESHOLD,
10);
OMMetadataManager omMetadataManager = initializeNewOmMetadataManager(
- temporaryFolder.newFolder());
+ Files.createDirectory(temporaryFolder.resolve("JunitOmDBDir"))
+ .toFile());
OzoneManagerServiceProviderImpl ozoneManagerServiceProvider =
getMockOzoneManagerServiceProviderWithFSO();
reconOMMetadataManager = getTestReconOmMetadataManager(omMetadataManager,
- temporaryFolder.newFolder());
+
Files.createDirectory(temporaryFolder.resolve("OmMetataDir")).toFile());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(ozoneManagerServiceProvider)
.withReconSqlDb()
@@ -388,11 +391,11 @@ public class TestNSSummaryEndpointWithFSO {
@Test
public void testUtility() {
String[] names = EntityHandler.parseRequestPath(TEST_PATH_UTILITY);
- Assert.assertArrayEquals(TEST_NAMES, names);
+ assertArrayEquals(TEST_NAMES, names);
String keyName = BucketHandler.getKeyName(names);
- Assert.assertEquals(TEST_KEY_NAMES, keyName);
+ assertEquals(TEST_KEY_NAMES, keyName);
String subpath = BucketHandler.buildSubpath(PARENT_DIR, "file1.txt");
- Assert.assertEquals(TEST_PATH_UTILITY, subpath);
+ assertEquals(TEST_PATH_UTILITY, subpath);
}
@Test
@@ -448,17 +451,17 @@ public class TestNSSummaryEndpointWithFSO {
Response rootResponse = nsSummaryEndpoint.getDiskUsage(ROOT_PATH,
false, false);
DUResponse duRootRes = (DUResponse) rootResponse.getEntity();
- Assert.assertEquals(2, duRootRes.getCount());
+ assertEquals(2, duRootRes.getCount());
List<DUResponse.DiskUsage> duRootData = duRootRes.getDuData();
// sort based on subpath
Collections.sort(duRootData,
Comparator.comparing(DUResponse.DiskUsage::getSubpath));
DUResponse.DiskUsage duVol1 = duRootData.get(0);
DUResponse.DiskUsage duVol2 = duRootData.get(1);
- Assert.assertEquals(VOL_PATH, duVol1.getSubpath());
- Assert.assertEquals(VOL_TWO_PATH, duVol2.getSubpath());
- Assert.assertEquals(VOL_DATA_SIZE, duVol1.getSize());
- Assert.assertEquals(VOL_TWO_DATA_SIZE, duVol2.getSize());
+ assertEquals(VOL_PATH, duVol1.getSubpath());
+ assertEquals(VOL_TWO_PATH, duVol2.getSubpath());
+ assertEquals(VOL_DATA_SIZE, duVol1.getSize());
+ assertEquals(VOL_TWO_DATA_SIZE, duVol2.getSize());
}
@Test
public void testDiskUsageVolume() throws Exception {
@@ -466,17 +469,17 @@ public class TestNSSummaryEndpointWithFSO {
Response volResponse = nsSummaryEndpoint.getDiskUsage(VOL_PATH,
false, false);
DUResponse duVolRes = (DUResponse) volResponse.getEntity();
- Assert.assertEquals(2, duVolRes.getCount());
+ assertEquals(2, duVolRes.getCount());
List<DUResponse.DiskUsage> duData = duVolRes.getDuData();
// sort based on subpath
Collections.sort(duData,
Comparator.comparing(DUResponse.DiskUsage::getSubpath));
DUResponse.DiskUsage duBucket1 = duData.get(0);
DUResponse.DiskUsage duBucket2 = duData.get(1);
- Assert.assertEquals(BUCKET_ONE_PATH, duBucket1.getSubpath());
- Assert.assertEquals(BUCKET_TWO_PATH, duBucket2.getSubpath());
- Assert.assertEquals(BUCKET_ONE_DATA_SIZE, duBucket1.getSize());
- Assert.assertEquals(BUCKET_TWO_DATA_SIZE, duBucket2.getSize());
+ assertEquals(BUCKET_ONE_PATH, duBucket1.getSubpath());
+ assertEquals(BUCKET_TWO_PATH, duBucket2.getSubpath());
+ assertEquals(BUCKET_ONE_DATA_SIZE, duBucket1.getSize());
+ assertEquals(BUCKET_TWO_DATA_SIZE, duBucket2.getSize());
}
@Test
@@ -485,10 +488,10 @@ public class TestNSSummaryEndpointWithFSO {
Response bucketResponse = nsSummaryEndpoint.getDiskUsage(BUCKET_ONE_PATH,
false, false);
DUResponse duBucketResponse = (DUResponse) bucketResponse.getEntity();
- Assert.assertEquals(1, duBucketResponse.getCount());
+ assertEquals(1, duBucketResponse.getCount());
DUResponse.DiskUsage duDir1 = duBucketResponse.getDuData().get(0);
- Assert.assertEquals(DIR_ONE_PATH, duDir1.getSubpath());
- Assert.assertEquals(DIR_ONE_DATA_SIZE, duDir1.getSize());
+ assertEquals(DIR_ONE_PATH, duDir1.getSubpath());
+ assertEquals(DIR_ONE_DATA_SIZE, duDir1.getSize());
}
@Test
@@ -497,21 +500,21 @@ public class TestNSSummaryEndpointWithFSO {
Response dirResponse = nsSummaryEndpoint.getDiskUsage(DIR_ONE_PATH,
false, false);
DUResponse duDirReponse = (DUResponse) dirResponse.getEntity();
- Assert.assertEquals(3, duDirReponse.getCount());
+ assertEquals(3, duDirReponse.getCount());
List<DUResponse.DiskUsage> duSubDir = duDirReponse.getDuData();
Collections.sort(duSubDir,
Comparator.comparing(DUResponse.DiskUsage::getSubpath));
DUResponse.DiskUsage duDir2 = duSubDir.get(0);
DUResponse.DiskUsage duDir3 = duSubDir.get(1);
DUResponse.DiskUsage duDir4 = duSubDir.get(2);
- Assert.assertEquals(DIR_TWO_PATH, duDir2.getSubpath());
- Assert.assertEquals(KEY_TWO_SIZE, duDir2.getSize());
+ assertEquals(DIR_TWO_PATH, duDir2.getSubpath());
+ assertEquals(KEY_TWO_SIZE, duDir2.getSize());
- Assert.assertEquals(DIR_THREE_PATH, duDir3.getSubpath());
- Assert.assertEquals(KEY_THREE_SIZE, duDir3.getSize());
+ assertEquals(DIR_THREE_PATH, duDir3.getSubpath());
+ assertEquals(KEY_THREE_SIZE, duDir3.getSize());
- Assert.assertEquals(DIR_FOUR_PATH, duDir4.getSubpath());
- Assert.assertEquals(KEY_SIX_SIZE, duDir4.getSize());
+ assertEquals(DIR_FOUR_PATH, duDir4.getSubpath());
+ assertEquals(KEY_SIX_SIZE, duDir4.getSize());
}
@Test
@@ -520,8 +523,8 @@ public class TestNSSummaryEndpointWithFSO {
Response keyResponse = nsSummaryEndpoint.getDiskUsage(KEY_PATH,
false, false);
DUResponse keyObj = (DUResponse) keyResponse.getEntity();
- Assert.assertEquals(0, keyObj.getCount());
- Assert.assertEquals(KEY_FOUR_SIZE, keyObj.getSize());
+ assertEquals(0, keyObj.getCount());
+ assertEquals(KEY_FOUR_SIZE, keyObj.getSize());
}
@Test
@@ -530,7 +533,7 @@ public class TestNSSummaryEndpointWithFSO {
Response invalidResponse = nsSummaryEndpoint.getDiskUsage(INVALID_PATH,
false, false);
DUResponse invalidObj = (DUResponse) invalidResponse.getEntity();
- Assert.assertEquals(ResponseStatus.PATH_NOT_FOUND,
+ assertEquals(ResponseStatus.PATH_NOT_FOUND,
invalidObj.getStatus());
}
@@ -540,8 +543,8 @@ public class TestNSSummaryEndpointWithFSO {
Response keyResponse = nsSummaryEndpoint.getDiskUsage(MULTI_BLOCK_KEY_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) keyResponse.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_KEY_SIZE_WITH_REPLICA,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_KEY_SIZE_WITH_REPLICA,
replicaDUResponse.getSizeWithReplica());
}
@@ -552,10 +555,10 @@ public class TestNSSummaryEndpointWithFSO {
Response rootResponse = nsSummaryEndpoint.getDiskUsage(ROOT_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) rootResponse.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_ROOT,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_ROOT,
replicaDUResponse.getSizeWithReplica());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_VOL,
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_VOL,
replicaDUResponse.getDuData().get(0).getSizeWithReplica());
}
@@ -566,10 +569,10 @@ public class TestNSSummaryEndpointWithFSO {
Response volResponse = nsSummaryEndpoint.getDiskUsage(VOL_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) volResponse.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_VOL,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_VOL,
replicaDUResponse.getSizeWithReplica());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_BUCKET1,
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_BUCKET1,
replicaDUResponse.getDuData().get(0).getSizeWithReplica());
}
@@ -579,10 +582,10 @@ public class TestNSSummaryEndpointWithFSO {
Response bucketResponse = nsSummaryEndpoint.getDiskUsage(BUCKET_ONE_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) bucketResponse.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_BUCKET1,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_BUCKET1,
replicaDUResponse.getSizeWithReplica());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR1,
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR1,
replicaDUResponse.getDuData().get(0).getSizeWithReplica());
}
@@ -598,10 +601,10 @@ public class TestNSSummaryEndpointWithFSO {
Response dir1Response = nsSummaryEndpoint.getDiskUsage(DIR_ONE_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) dir1Response.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR1,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR1,
replicaDUResponse.getSizeWithReplica());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR2,
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR2,
replicaDUResponse.getDuData().get(0).getSizeWithReplica());
}
@@ -611,8 +614,8 @@ public class TestNSSummaryEndpointWithFSO {
Response keyResponse = nsSummaryEndpoint.getDiskUsage(KEY_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) keyResponse.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_KEY,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_KEY,
replicaDUResponse.getSizeWithReplica());
}
@@ -622,45 +625,45 @@ public class TestNSSummaryEndpointWithFSO {
Response rootResponse = nsSummaryEndpoint.getQuotaUsage(ROOT_PATH);
QuotaUsageResponse quRootRes =
(QuotaUsageResponse) rootResponse.getEntity();
- Assert.assertEquals(ROOT_QUOTA, quRootRes.getQuota());
- Assert.assertEquals(ROOT_DATA_SIZE, quRootRes.getQuotaUsed());
+ assertEquals(ROOT_QUOTA, quRootRes.getQuota());
+ assertEquals(ROOT_DATA_SIZE, quRootRes.getQuotaUsed());
// volume level quota usage
Response volResponse = nsSummaryEndpoint.getQuotaUsage(VOL_PATH);
QuotaUsageResponse quVolRes = (QuotaUsageResponse) volResponse.getEntity();
- Assert.assertEquals(VOL_QUOTA, quVolRes.getQuota());
- Assert.assertEquals(VOL_DATA_SIZE, quVolRes.getQuotaUsed());
+ assertEquals(VOL_QUOTA, quVolRes.getQuota());
+ assertEquals(VOL_DATA_SIZE, quVolRes.getQuotaUsed());
// bucket level quota usage
Response bucketRes = nsSummaryEndpoint.getQuotaUsage(BUCKET_ONE_PATH);
QuotaUsageResponse quBucketRes = (QuotaUsageResponse)
bucketRes.getEntity();
- Assert.assertEquals(BUCKET_ONE_QUOTA, quBucketRes.getQuota());
- Assert.assertEquals(BUCKET_ONE_DATA_SIZE, quBucketRes.getQuotaUsed());
+ assertEquals(BUCKET_ONE_QUOTA, quBucketRes.getQuota());
+ assertEquals(BUCKET_ONE_DATA_SIZE, quBucketRes.getQuotaUsed());
Response bucketRes2 = nsSummaryEndpoint.getQuotaUsage(BUCKET_TWO_PATH);
QuotaUsageResponse quBucketRes2 =
(QuotaUsageResponse) bucketRes2.getEntity();
- Assert.assertEquals(BUCKET_TWO_QUOTA, quBucketRes2.getQuota());
- Assert.assertEquals(BUCKET_TWO_DATA_SIZE, quBucketRes2.getQuotaUsed());
+ assertEquals(BUCKET_TWO_QUOTA, quBucketRes2.getQuota());
+ assertEquals(BUCKET_TWO_DATA_SIZE, quBucketRes2.getQuotaUsed());
// other level not applicable
Response naResponse1 = nsSummaryEndpoint.getQuotaUsage(DIR_ONE_PATH);
QuotaUsageResponse quotaUsageResponse1 =
(QuotaUsageResponse) naResponse1.getEntity();
- Assert.assertEquals(ResponseStatus.TYPE_NOT_APPLICABLE,
+ assertEquals(ResponseStatus.TYPE_NOT_APPLICABLE,
quotaUsageResponse1.getResponseCode());
Response naResponse2 = nsSummaryEndpoint.getQuotaUsage(KEY_PATH);
QuotaUsageResponse quotaUsageResponse2 =
(QuotaUsageResponse) naResponse2.getEntity();
- Assert.assertEquals(ResponseStatus.TYPE_NOT_APPLICABLE,
+ assertEquals(ResponseStatus.TYPE_NOT_APPLICABLE,
quotaUsageResponse2.getResponseCode());
// invalid path request
Response invalidRes = nsSummaryEndpoint.getQuotaUsage(INVALID_PATH);
QuotaUsageResponse invalidResObj =
(QuotaUsageResponse) invalidRes.getEntity();
- Assert.assertEquals(ResponseStatus.PATH_NOT_FOUND,
+ assertEquals(ResponseStatus.PATH_NOT_FOUND,
invalidResObj.getResponseCode());
}
@@ -679,12 +682,12 @@ public class TestNSSummaryEndpointWithFSO {
FileSizeDistributionResponse fileSizeDistResObj =
(FileSizeDistributionResponse) res.getEntity();
int[] fileSizeDist = fileSizeDistResObj.getFileSizeDist();
- Assert.assertEquals(bin0, fileSizeDist[0]);
- Assert.assertEquals(bin1, fileSizeDist[1]);
- Assert.assertEquals(bin2, fileSizeDist[2]);
- Assert.assertEquals(bin3, fileSizeDist[3]);
+ assertEquals(bin0, fileSizeDist[0]);
+ assertEquals(bin1, fileSizeDist[1]);
+ assertEquals(bin2, fileSizeDist[2]);
+ assertEquals(bin3, fileSizeDist[3]);
for (int i = 4; i < ReconConstants.NUM_OF_FILE_SIZE_BINS; ++i) {
- Assert.assertEquals(0, fileSizeDist[i]);
+ assertEquals(0, fileSizeDist[i]);
}
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithLegacy.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithLegacy.java
index 01517d296c..b324bd6b42 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithLegacy.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpointWithLegacy.java
@@ -58,16 +58,15 @@ import
org.apache.hadoop.ozone.recon.spi.StorageContainerServiceProvider;
import org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl;
import
org.apache.hadoop.ozone.recon.spi.impl.StorageContainerServiceProviderImpl;
import org.apache.hadoop.ozone.recon.tasks.NSSummaryTaskWithLegacy;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import javax.ws.rs.core.Response;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -75,6 +74,8 @@ import java.util.ArrayList;
import java.util.Set;
import java.util.HashSet;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static
org.apache.hadoop.hdds.protocol.MockDatanodeDetails.randomDatanodeDetails;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_DB_DIRS;
import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
@@ -109,8 +110,8 @@ import static org.mockito.Mockito.when;
* so there is no need to test process() on DB's updates
*/
public class TestNSSummaryEndpointWithLegacy {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private ReconOMMetadataManager reconOMMetadataManager;
private NSSummaryEndpoint nsSummaryEndpoint;
@@ -351,18 +352,20 @@ public class TestNSSummaryEndpointWithLegacy {
private static final long DIR_ONE_DATA_SIZE = KEY_TWO_SIZE +
KEY_THREE_SIZE + KEY_SIX_SIZE;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
conf = new OzoneConfiguration();
OMMetadataManager omMetadataManager = initializeNewOmMetadataManager(
- temporaryFolder.newFolder(), conf);
+ Files.createDirectory(temporaryFolder.resolve(
+ "JunitOmDBDir")).toFile(), conf);
OzoneManagerServiceProviderImpl ozoneManagerServiceProvider =
getMockOzoneManagerServiceProvider();
- reconOMMetadataManager = getTestReconOmMetadataManager(omMetadataManager,
- temporaryFolder.newFolder());
+ reconOMMetadataManager = getTestReconOmMetadataManager(omMetadataManager,
+ Files.createDirectory(temporaryFolder.resolve(
+ "omMetadatDir")).toFile());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(ozoneManagerServiceProvider)
.withReconSqlDb()
@@ -389,11 +392,11 @@ public class TestNSSummaryEndpointWithLegacy {
@Test
public void testUtility() {
String[] names = EntityHandler.parseRequestPath(TEST_PATH_UTILITY);
- Assert.assertArrayEquals(TEST_NAMES, names);
+ assertArrayEquals(TEST_NAMES, names);
String keyName = BucketHandler.getKeyName(names);
- Assert.assertEquals(TEST_KEY_NAMES, keyName);
+ assertEquals(TEST_KEY_NAMES, keyName);
String subpath = BucketHandler.buildSubpath(PARENT_DIR, "file1.txt");
- Assert.assertEquals(TEST_PATH_UTILITY, subpath);
+ assertEquals(TEST_PATH_UTILITY, subpath);
}
@Test
@@ -448,17 +451,17 @@ public class TestNSSummaryEndpointWithLegacy {
Response rootResponse = nsSummaryEndpoint.getDiskUsage(ROOT_PATH,
false, false);
DUResponse duRootRes = (DUResponse) rootResponse.getEntity();
- Assert.assertEquals(2, duRootRes.getCount());
+ assertEquals(2, duRootRes.getCount());
List<DUResponse.DiskUsage> duRootData = duRootRes.getDuData();
// sort based on subpath
Collections.sort(duRootData,
Comparator.comparing(DUResponse.DiskUsage::getSubpath));
DUResponse.DiskUsage duVol1 = duRootData.get(0);
DUResponse.DiskUsage duVol2 = duRootData.get(1);
- Assert.assertEquals(VOL_PATH, duVol1.getSubpath());
- Assert.assertEquals(VOL_TWO_PATH, duVol2.getSubpath());
- Assert.assertEquals(VOL_DATA_SIZE, duVol1.getSize());
- Assert.assertEquals(VOL_TWO_DATA_SIZE, duVol2.getSize());
+ assertEquals(VOL_PATH, duVol1.getSubpath());
+ assertEquals(VOL_TWO_PATH, duVol2.getSubpath());
+ assertEquals(VOL_DATA_SIZE, duVol1.getSize());
+ assertEquals(VOL_TWO_DATA_SIZE, duVol2.getSize());
}
@Test
@@ -467,17 +470,17 @@ public class TestNSSummaryEndpointWithLegacy {
Response volResponse = nsSummaryEndpoint.getDiskUsage(VOL_PATH,
false, false);
DUResponse duVolRes = (DUResponse) volResponse.getEntity();
- Assert.assertEquals(2, duVolRes.getCount());
+ assertEquals(2, duVolRes.getCount());
List<DUResponse.DiskUsage> duData = duVolRes.getDuData();
// sort based on subpath
Collections.sort(duData,
Comparator.comparing(DUResponse.DiskUsage::getSubpath));
DUResponse.DiskUsage duBucket1 = duData.get(0);
DUResponse.DiskUsage duBucket2 = duData.get(1);
- Assert.assertEquals(BUCKET_ONE_PATH, duBucket1.getSubpath());
- Assert.assertEquals(BUCKET_TWO_PATH, duBucket2.getSubpath());
- Assert.assertEquals(BUCKET_ONE_DATA_SIZE, duBucket1.getSize());
- Assert.assertEquals(BUCKET_TWO_DATA_SIZE, duBucket2.getSize());
+ assertEquals(BUCKET_ONE_PATH, duBucket1.getSubpath());
+ assertEquals(BUCKET_TWO_PATH, duBucket2.getSubpath());
+ assertEquals(BUCKET_ONE_DATA_SIZE, duBucket1.getSize());
+ assertEquals(BUCKET_TWO_DATA_SIZE, duBucket2.getSize());
}
@Test
@@ -486,10 +489,10 @@ public class TestNSSummaryEndpointWithLegacy {
Response bucketResponse = nsSummaryEndpoint.getDiskUsage(BUCKET_ONE_PATH,
false, false);
DUResponse duBucketResponse = (DUResponse) bucketResponse.getEntity();
- Assert.assertEquals(1, duBucketResponse.getCount());
+ assertEquals(1, duBucketResponse.getCount());
DUResponse.DiskUsage duDir1 = duBucketResponse.getDuData().get(0);
- Assert.assertEquals(DIR_ONE_PATH, duDir1.getSubpath());
- Assert.assertEquals(DIR_ONE_DATA_SIZE, duDir1.getSize());
+ assertEquals(DIR_ONE_PATH, duDir1.getSubpath());
+ assertEquals(DIR_ONE_DATA_SIZE, duDir1.getSize());
}
@Test
@@ -498,21 +501,21 @@ public class TestNSSummaryEndpointWithLegacy {
Response dirResponse = nsSummaryEndpoint.getDiskUsage(DIR_ONE_PATH,
false, false);
DUResponse duDirReponse = (DUResponse) dirResponse.getEntity();
- Assert.assertEquals(3, duDirReponse.getCount());
+ assertEquals(3, duDirReponse.getCount());
List<DUResponse.DiskUsage> duSubDir = duDirReponse.getDuData();
Collections.sort(duSubDir,
Comparator.comparing(DUResponse.DiskUsage::getSubpath));
DUResponse.DiskUsage duDir2 = duSubDir.get(0);
DUResponse.DiskUsage duDir3 = duSubDir.get(1);
DUResponse.DiskUsage duDir4 = duSubDir.get(2);
- Assert.assertEquals(DIR_TWO_PATH, duDir2.getSubpath());
- Assert.assertEquals(KEY_TWO_SIZE, duDir2.getSize());
+ assertEquals(DIR_TWO_PATH, duDir2.getSubpath());
+ assertEquals(KEY_TWO_SIZE, duDir2.getSize());
- Assert.assertEquals(DIR_THREE_PATH, duDir3.getSubpath());
- Assert.assertEquals(KEY_THREE_SIZE, duDir3.getSize());
+ assertEquals(DIR_THREE_PATH, duDir3.getSubpath());
+ assertEquals(KEY_THREE_SIZE, duDir3.getSize());
- Assert.assertEquals(DIR_FOUR_PATH, duDir4.getSubpath());
- Assert.assertEquals(KEY_SIX_SIZE, duDir4.getSize());
+ assertEquals(DIR_FOUR_PATH, duDir4.getSubpath());
+ assertEquals(KEY_SIX_SIZE, duDir4.getSize());
}
@Test
@@ -521,8 +524,8 @@ public class TestNSSummaryEndpointWithLegacy {
Response keyResponse = nsSummaryEndpoint.getDiskUsage(KEY_PATH,
false, false);
DUResponse keyObj = (DUResponse) keyResponse.getEntity();
- Assert.assertEquals(0, keyObj.getCount());
- Assert.assertEquals(KEY_FOUR_SIZE, keyObj.getSize());
+ assertEquals(0, keyObj.getCount());
+ assertEquals(KEY_FOUR_SIZE, keyObj.getSize());
}
@Test
@@ -531,7 +534,7 @@ public class TestNSSummaryEndpointWithLegacy {
Response invalidResponse = nsSummaryEndpoint.getDiskUsage(INVALID_PATH,
false, false);
DUResponse invalidObj = (DUResponse) invalidResponse.getEntity();
- Assert.assertEquals(ResponseStatus.PATH_NOT_FOUND,
+ assertEquals(ResponseStatus.PATH_NOT_FOUND,
invalidObj.getStatus());
}
@@ -541,8 +544,8 @@ public class TestNSSummaryEndpointWithLegacy {
Response keyResponse = nsSummaryEndpoint.getDiskUsage(MULTI_BLOCK_KEY_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) keyResponse.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_KEY_SIZE_WITH_REPLICA,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_KEY_SIZE_WITH_REPLICA,
replicaDUResponse.getSizeWithReplica());
}
@@ -553,10 +556,10 @@ public class TestNSSummaryEndpointWithLegacy {
Response rootResponse = nsSummaryEndpoint.getDiskUsage(ROOT_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) rootResponse.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_ROOT,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_ROOT,
replicaDUResponse.getSizeWithReplica());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_VOL,
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_VOL,
replicaDUResponse.getDuData().get(0).getSizeWithReplica());
}
@@ -567,10 +570,10 @@ public class TestNSSummaryEndpointWithLegacy {
Response volResponse = nsSummaryEndpoint.getDiskUsage(VOL_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) volResponse.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_VOL,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_VOL,
replicaDUResponse.getSizeWithReplica());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_BUCKET1,
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_BUCKET1,
replicaDUResponse.getDuData().get(0).getSizeWithReplica());
}
@@ -580,10 +583,10 @@ public class TestNSSummaryEndpointWithLegacy {
Response bucketResponse = nsSummaryEndpoint.getDiskUsage(BUCKET_ONE_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) bucketResponse.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_BUCKET1,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_BUCKET1,
replicaDUResponse.getSizeWithReplica());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR1,
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR1,
replicaDUResponse.getDuData().get(0).getSizeWithReplica());
}
@@ -599,10 +602,10 @@ public class TestNSSummaryEndpointWithLegacy {
Response dir1Response = nsSummaryEndpoint.getDiskUsage(DIR_ONE_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) dir1Response.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR1,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR1,
replicaDUResponse.getSizeWithReplica());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR2,
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_DIR2,
replicaDUResponse.getDuData().get(0).getSizeWithReplica());
}
@@ -612,8 +615,8 @@ public class TestNSSummaryEndpointWithLegacy {
Response keyResponse = nsSummaryEndpoint.getDiskUsage(KEY_PATH,
false, true);
DUResponse replicaDUResponse = (DUResponse) keyResponse.getEntity();
- Assert.assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
- Assert.assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_KEY,
+ assertEquals(ResponseStatus.OK, replicaDUResponse.getStatus());
+ assertEquals(MULTI_BLOCK_TOTAL_SIZE_WITH_REPLICA_UNDER_KEY,
replicaDUResponse.getSizeWithReplica());
}
@@ -623,45 +626,45 @@ public class TestNSSummaryEndpointWithLegacy {
Response rootResponse = nsSummaryEndpoint.getQuotaUsage(ROOT_PATH);
QuotaUsageResponse quRootRes =
(QuotaUsageResponse) rootResponse.getEntity();
- Assert.assertEquals(ROOT_QUOTA, quRootRes.getQuota());
- Assert.assertEquals(ROOT_DATA_SIZE, quRootRes.getQuotaUsed());
+ assertEquals(ROOT_QUOTA, quRootRes.getQuota());
+ assertEquals(ROOT_DATA_SIZE, quRootRes.getQuotaUsed());
// volume level quota usage
Response volResponse = nsSummaryEndpoint.getQuotaUsage(VOL_PATH);
QuotaUsageResponse quVolRes = (QuotaUsageResponse) volResponse.getEntity();
- Assert.assertEquals(VOL_QUOTA, quVolRes.getQuota());
- Assert.assertEquals(VOL_DATA_SIZE, quVolRes.getQuotaUsed());
+ assertEquals(VOL_QUOTA, quVolRes.getQuota());
+ assertEquals(VOL_DATA_SIZE, quVolRes.getQuotaUsed());
// bucket level quota usage
Response bucketRes = nsSummaryEndpoint.getQuotaUsage(BUCKET_ONE_PATH);
QuotaUsageResponse quBucketRes = (QuotaUsageResponse)
bucketRes.getEntity();
- Assert.assertEquals(BUCKET_ONE_QUOTA, quBucketRes.getQuota());
- Assert.assertEquals(BUCKET_ONE_DATA_SIZE, quBucketRes.getQuotaUsed());
+ assertEquals(BUCKET_ONE_QUOTA, quBucketRes.getQuota());
+ assertEquals(BUCKET_ONE_DATA_SIZE, quBucketRes.getQuotaUsed());
Response bucketRes2 = nsSummaryEndpoint.getQuotaUsage(BUCKET_TWO_PATH);
QuotaUsageResponse quBucketRes2 =
(QuotaUsageResponse) bucketRes2.getEntity();
- Assert.assertEquals(BUCKET_TWO_QUOTA, quBucketRes2.getQuota());
- Assert.assertEquals(BUCKET_TWO_DATA_SIZE, quBucketRes2.getQuotaUsed());
+ assertEquals(BUCKET_TWO_QUOTA, quBucketRes2.getQuota());
+ assertEquals(BUCKET_TWO_DATA_SIZE, quBucketRes2.getQuotaUsed());
// other level not applicable
Response naResponse1 = nsSummaryEndpoint.getQuotaUsage(DIR_ONE_PATH);
QuotaUsageResponse quotaUsageResponse1 =
(QuotaUsageResponse) naResponse1.getEntity();
- Assert.assertEquals(ResponseStatus.TYPE_NOT_APPLICABLE,
+ assertEquals(ResponseStatus.TYPE_NOT_APPLICABLE,
quotaUsageResponse1.getResponseCode());
Response naResponse2 = nsSummaryEndpoint.getQuotaUsage(KEY_PATH);
QuotaUsageResponse quotaUsageResponse2 =
(QuotaUsageResponse) naResponse2.getEntity();
- Assert.assertEquals(ResponseStatus.TYPE_NOT_APPLICABLE,
+ assertEquals(ResponseStatus.TYPE_NOT_APPLICABLE,
quotaUsageResponse2.getResponseCode());
// invalid path request
Response invalidRes = nsSummaryEndpoint.getQuotaUsage(INVALID_PATH);
QuotaUsageResponse invalidResObj =
(QuotaUsageResponse) invalidRes.getEntity();
- Assert.assertEquals(ResponseStatus.PATH_NOT_FOUND,
+ assertEquals(ResponseStatus.PATH_NOT_FOUND,
invalidResObj.getResponseCode());
}
@@ -680,12 +683,12 @@ public class TestNSSummaryEndpointWithLegacy {
FileSizeDistributionResponse fileSizeDistResObj =
(FileSizeDistributionResponse) res.getEntity();
int[] fileSizeDist = fileSizeDistResObj.getFileSizeDist();
- Assert.assertEquals(bin0, fileSizeDist[0]);
- Assert.assertEquals(bin1, fileSizeDist[1]);
- Assert.assertEquals(bin2, fileSizeDist[2]);
- Assert.assertEquals(bin3, fileSizeDist[3]);
+ assertEquals(bin0, fileSizeDist[0]);
+ assertEquals(bin1, fileSizeDist[1]);
+ assertEquals(bin2, fileSizeDist[2]);
+ assertEquals(bin3, fileSizeDist[3]);
for (int i = 4; i < ReconConstants.NUM_OF_FILE_SIZE_BINS; ++i) {
- Assert.assertEquals(0, fileSizeDist[i]);
+ assertEquals(0, fileSizeDist[i]);
}
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
index 5140e0d02b..66eeffc18d 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOmDBInsightEndPoint.java
@@ -46,11 +46,14 @@ import
org.apache.hadoop.ozone.recon.spi.impl.StorageContainerServiceProviderImp
import org.apache.hadoop.ozone.recon.tasks.ContainerKeyMapperTask;
import org.hadoop.ozone.recon.schema.tables.daos.GlobalStatsDao;
import org.hadoop.ozone.recon.schema.tables.pojos.GlobalStats;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.io.TempDir;
import javax.ws.rs.core.Response;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.sql.Timestamp;
import java.util.List;
import java.util.ArrayList;
@@ -74,7 +77,8 @@ import static org.mockito.Mockito.when;
* Unit test for OmDBInsightEndPoint.
*/
public class TestOmDBInsightEndPoint extends AbstractReconSqlDBTest {
-
+ @TempDir
+ private Path temporaryFolder;
private OzoneStorageContainerManager ozoneStorageContainerManager;
private ReconContainerMetadataManager reconContainerMetadataManager;
private OMMetadataManager omMetadataManager;
@@ -96,14 +100,16 @@ public class TestOmDBInsightEndPoint extends
AbstractReconSqlDBTest {
return newValue;
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
omMetadataManager = initializeNewOmMetadataManager(
- temporaryFolder.newFolder());
+ Files.createDirectory(temporaryFolder.resolve(
+ "JunitOmMetadata")).toFile());
reconOMMetadataManager = getTestReconOmMetadataManager(omMetadataManager,
- temporaryFolder.newFolder());
+ Files.createDirectory(temporaryFolder.resolve(
+ "JunitOmMetadataTest")).toFile());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(mock(OzoneManagerServiceProviderImpl.class))
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
index 7e362a67d5..ba79856155 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestOpenContainerCount.java
@@ -57,11 +57,10 @@ import
org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl;
import
org.apache.hadoop.ozone.recon.spi.impl.StorageContainerServiceProviderImpl;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.LambdaTestUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+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 static
org.apache.hadoop.hdds.protocol.MockDatanodeDetails.randomDatanodeDetails;
import static
org.apache.hadoop.ozone.container.upgrade.UpgradeUtils.defaultLayoutVersionProto;
@@ -79,6 +78,8 @@ import javax.ws.rs.core.Response;
import java.io.IOException;
import java.net.HttpURLConnection;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
@@ -88,8 +89,8 @@ import java.util.concurrent.Callable;
* Test for Open Container count per Datanode.
*/
public class TestOpenContainerCount {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private NodeEndpoint nodeEndpoint;
private ReconOMMetadataManager reconOMMetadataManager;
@@ -118,8 +119,9 @@ public class TestOpenContainerCount {
private void initializeInjector() throws Exception {
reconOMMetadataManager = getTestReconOmMetadataManager(
- initializeNewOmMetadataManager(temporaryFolder.newFolder()),
- temporaryFolder.newFolder());
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("JunitOmDBDir")).toFile()),
+ Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
datanodeDetails = randomDatanodeDetails();
datanodeDetails.setHostName(HOST1);
datanodeDetails.setIpAddress(IP1);
@@ -196,7 +198,7 @@ public class TestOpenContainerCount {
commonUtils.getReconNodeDetails());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(
@@ -219,7 +221,7 @@ public class TestOpenContainerCount {
reconTestInjector.getInstance(OzoneStorageContainerManager.class);
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// The following setup runs only once
if (!isSetupDone) {
@@ -327,7 +329,7 @@ public class TestOpenContainerCount {
// Process all events in the event queue
reconScm.getEventQueue().processAll(1000);
} catch (Exception ex) {
- Assert.fail(ex.getMessage());
+ Assertions.fail(ex.getMessage());
}
}
@@ -350,7 +352,7 @@ public class TestOpenContainerCount {
--expectedCnt;
closeContainer(id);
DatanodeMetadata metadata = getDatanodeMetadata();
- Assert.assertEquals(expectedCnt, metadata.getOpenContainers());
+ Assertions.assertEquals(expectedCnt, metadata.getOpenContainers());
}
}
@@ -419,7 +421,7 @@ public class TestOpenContainerCount {
// Process all events in the event queue
reconScm.getEventQueue().processAll(1000);
} catch (Exception ex) {
- Assert.fail(ex.getMessage());
+ Assertions.fail(ex.getMessage());
}
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTriggerDBSyncEndpoint.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTriggerDBSyncEndpoint.java
index 51da2243d1..3b73f6c854 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTriggerDBSyncEndpoint.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestTriggerDBSyncEndpoint.java
@@ -39,11 +39,10 @@ import
org.apache.hadoop.ozone.recon.spi.impl.StorageContainerServiceProviderImp
import org.apache.hadoop.ozone.recon.tasks.ReconTaskController;
import
org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.hadoop.ozone.recon.schema.tables.daos.ReconTaskStatusDao;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Assertions;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.io.TempDir;
import javax.ws.rs.core.Response;
import java.io.File;
@@ -51,6 +50,8 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
+import java.nio.file.Files;
+import java.nio.file.Path;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getTestReconOmMetadataManager;
@@ -69,18 +70,20 @@ import static org.mockito.Mockito.when;
*/
public class TestTriggerDBSyncEndpoint {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private ReconTestInjector reconTestInjector;
private CommonUtils commonUtils;
- @Before
+ @BeforeEach
public void setUp() throws IOException, AuthenticationException {
OzoneConfiguration configuration = new OzoneConfiguration();
configuration.set(OZONE_RECON_OM_SNAPSHOT_DB_DIR,
- temporaryFolder.newFolder().getAbsolutePath());
+ Files.createDirectory(temporaryFolder.resolve("OmSnapshotDB"))
+ .toFile().getAbsolutePath());
configuration.set(OZONE_RECON_DB_DIR,
- temporaryFolder.newFolder().getAbsolutePath());
+ Files.createDirectory(temporaryFolder.resolve("ReconDb"))
+ .toFile().getAbsolutePath());
configuration.set(OZONE_OM_ADDRESS_KEY, "localhost:9862");
commonUtils = new CommonUtils();
OzoneManagerProtocol ozoneManagerProtocol
@@ -89,10 +92,12 @@ public class TestTriggerDBSyncEndpoint {
.DBUpdatesRequest.class))).thenReturn(new DBUpdates());
OMMetadataManager omMetadataManager =
- initializeNewOmMetadataManager(temporaryFolder.newFolder());
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("OnMetadata")).toFile());
ReconOMMetadataManager reconOMMetadataManager
= getTestReconOmMetadataManager(omMetadataManager,
- temporaryFolder.newFolder());
+ Files.createDirectory(
+ temporaryFolder.resolve("OmMetadataTest")).toFile());
ReconUtils reconUtilsMock = mock(ReconUtils.class);
@@ -120,7 +125,7 @@ public class TestTriggerDBSyncEndpoint {
ozoneManagerServiceProvider.start();
reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(ozoneManagerServiceProvider)
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
index 8a8f63fe34..bddf9092e2 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/heatmap/TestHeatMapInfo.java
@@ -32,13 +32,14 @@ import
org.apache.hadoop.ozone.recon.scm.ReconStorageContainerManagerFacade;
import org.apache.hadoop.ozone.recon.spi.StorageContainerServiceProvider;
import org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl;
import
org.apache.hadoop.ozone.recon.spi.impl.StorageContainerServiceProviderImpl;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.api.Assertions;
-import org.junit.rules.TemporaryFolder;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -53,8 +54,8 @@ import static org.mockito.Mockito.mock;
*/
public class TestHeatMapInfo {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private boolean isSetupDone = false;
private ReconOMMetadataManager reconOMMetadataManager;
@@ -64,11 +65,12 @@ public class TestHeatMapInfo {
@SuppressWarnings("checkstyle:methodlength")
private void initializeInjector() throws Exception {
reconOMMetadataManager = getTestReconOmMetadataManager(
- initializeNewOmMetadataManager(temporaryFolder.newFolder()),
- temporaryFolder.newFolder());
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("JunitOmDBDir")).toFile()),
+ Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(mock(OzoneManagerServiceProviderImpl.class))
@@ -728,7 +730,7 @@ public class TestHeatMapInfo {
"}";
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// The following setup runs only once
if (!isSetupDone) {
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractReconSqlDBTest.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractReconSqlDBTest.java
index c8447fffda..4446cf2a61 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractReconSqlDBTest.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/AbstractReconSqlDBTest.java
@@ -21,6 +21,8 @@ import static
org.hadoop.ozone.recon.codegen.SqlDbUtils.DERBY_DRIVER_CLASS;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -36,11 +38,8 @@ import org.jooq.DSLContext;
import org.jooq.SQLDialect;
import org.jooq.impl.DSL;
import org.jooq.impl.DefaultConfiguration;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.rules.TemporaryFolder;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
@@ -53,9 +52,7 @@ import com.google.inject.Provider;
* to access the DAOs easily.
*/
public class AbstractReconSqlDBTest {
-
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ private Path temporaryFolder;
private Injector injector;
private DSLContext dslContext;
@@ -63,25 +60,20 @@ public class AbstractReconSqlDBTest {
public AbstractReconSqlDBTest() {
try {
- temporaryFolder.create();
+ temporaryFolder = Files.createTempDirectory("JunitConfig");
configurationProvider =
- new
DerbyDataSourceConfigurationProvider(temporaryFolder.newFolder());
+ new DerbyDataSourceConfigurationProvider(Files.createDirectory(
+ temporaryFolder.resolve("Config")).toFile());
} catch (IOException e) {
- Assert.fail();
+ Assertions.fail();
}
}
protected AbstractReconSqlDBTest(Provider<DataSourceConfiguration> provider)
{
- try {
- temporaryFolder.create();
- configurationProvider = provider;
- } catch (IOException e) {
- Assert.fail();
- }
+ configurationProvider = provider;
}
@BeforeEach
- @Before
public void createReconSchemaForTest() throws IOException {
injector = Guice.createInjector(getReconSqlDBModules());
dslContext = DSL.using(new DefaultConfiguration().set(
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconWithDifferentSqlDBs.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconWithDifferentSqlDBs.java
index 0e096623eb..721e524dad 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconWithDifferentSqlDBs.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/persistence/TestReconWithDifferentSqlDBs.java
@@ -17,7 +17,6 @@
package org.apache.hadoop.ozone.recon.persistence;
-import static java.util.stream.Collectors.toList;
import static
org.apache.hadoop.ozone.recon.ReconControllerModule.ReconDaoBindingModule.RECON_DAO_LIST;
import static org.hadoop.ozone.recon.codegen.SqlDbUtils.SQLITE_DRIVER_CLASS;
import static org.hadoop.ozone.recon.schema.Tables.RECON_TASK_STATUS;
@@ -26,59 +25,58 @@ import static org.junit.Assert.assertNotNull;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.sql.SQLException;
import java.util.stream.Stream;
import org.hadoop.ozone.recon.schema.tables.daos.ReconTaskStatusDao;
import org.hadoop.ozone.recon.schema.tables.pojos.ReconTaskStatus;
import org.jooq.SQLDialect;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
import com.google.inject.Provider;
/**
* Test Recon schema with different DBs.
*/
-@RunWith(Parameterized.class)
-public class TestReconWithDifferentSqlDBs extends AbstractReconSqlDBTest {
-
- public TestReconWithDifferentSqlDBs(
- Provider<DataSourceConfiguration> provider) {
- super(provider);
- }
-
- @Parameterized.Parameters(name = "{0}")
- public static Iterable<Object[]> parameters() throws IOException {
- TemporaryFolder temporaryFolder = new TemporaryFolder();
- temporaryFolder.create();
+public class TestReconWithDifferentSqlDBs {
+ @TempDir
+ private static Path temporaryFolder;
+ public static Stream<Object> parametersSource() throws IOException {
return Stream.of(
- new DerbyDataSourceConfigurationProvider(temporaryFolder.newFolder()),
- new SqliteDataSourceConfigurationProvider(temporaryFolder.newFolder()))
- .map(each -> new Object[] {each})
- .collect(toList());
+ new AbstractReconSqlDBTest.DerbyDataSourceConfigurationProvider(
+ Files.createDirectory(temporaryFolder.resolve("JunitDerbyDB"))
+ .toFile()),
+ new SqliteDataSourceConfigurationProvider(Files.createDirectory(
+ temporaryFolder.resolve("JunitSQLDS")).toFile()));
}
/**
* Make sure schema was created correctly.
* @throws SQLException
*/
- @Test
- public void testSchemaSetup() throws SQLException {
- assertNotNull(getInjector());
- assertNotNull(getConfiguration());
- assertNotNull(getDslContext());
- assertNotNull(getConnection());
+ @ParameterizedTest
+ @MethodSource("parametersSource")
+ public void testSchemaSetup(Provider<DataSourceConfiguration> provider)
+ throws SQLException, IOException {
+ AbstractReconSqlDBTest reconSqlDB = new AbstractReconSqlDBTest(provider);
+ reconSqlDB.createReconSchemaForTest();
+ assertNotNull(reconSqlDB.getInjector());
+ assertNotNull(reconSqlDB.getConfiguration());
+ assertNotNull(reconSqlDB.getDslContext());
+ assertNotNull(reconSqlDB.getConnection());
RECON_DAO_LIST.forEach(dao -> {
- assertNotNull(getDao(dao));
+ assertNotNull(reconSqlDB.getDao(dao));
});
- ReconTaskStatusDao dao = getDao(ReconTaskStatusDao.class);
+ ReconTaskStatusDao dao = reconSqlDB.getDao(ReconTaskStatusDao.class);
dao.insert(new ReconTaskStatus("TestTask", 1L, 2L));
assertEquals(1, dao.findAll().size());
- int numRows = getDslContext().delete(RECON_TASK_STATUS).execute();
+ int numRows = reconSqlDB.getDslContext().
+ delete(RECON_TASK_STATUS).execute();
assertEquals(1, numRows);
assertEquals(0, dao.findAll().size());
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/recovery/TestReconOmMetadataManagerImpl.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/recovery/TestReconOmMetadataManagerImpl.java
index 4b14c740ed..b1e7e54d6d 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/recovery/TestReconOmMetadataManagerImpl.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/recovery/TestReconOmMetadataManagerImpl.java
@@ -23,6 +23,8 @@ import static
org.apache.hadoop.ozone.recon.ReconServerConfigKeys.OZONE_RECON_OM
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdds.client.StandaloneReplicationConfig;
@@ -37,18 +39,20 @@ import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.hdds.utils.db.DBCheckpoint;
import org.apache.hadoop.ozone.recon.ReconUtils;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test Recon OM Metadata Manager implementation.
*/
public class TestReconOmMetadataManagerImpl {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
@Test
public void testStart() throws Exception {
@@ -64,7 +68,8 @@ public class TestReconOmMetadataManagerImpl {
checkpoint.getCheckpointLocation().toFile().renameTo(snapshotFile);
//Create new Recon OM Metadata manager instance.
- File reconOmDbDir = temporaryFolder.newFolder();
+ File reconOmDbDir = Files.createDirectory(
+ temporaryFolder.resolve("NewDir")).toFile();
OzoneConfiguration configuration = new OzoneConfiguration();
configuration.set(OZONE_RECON_OM_SNAPSHOT_DB_DIR, reconOmDbDir
.getAbsolutePath());
@@ -74,14 +79,14 @@ public class TestReconOmMetadataManagerImpl {
new ReconOmMetadataManagerImpl(configuration, new ReconUtils());
reconOMMetadataManager.start(configuration);
- Assert.assertNotNull(reconOMMetadataManager.getBucketTable());
- Assert.assertNotNull(reconOMMetadataManager.getVolumeTable()
+ assertNotNull(reconOMMetadataManager.getBucketTable());
+ assertNotNull(reconOMMetadataManager.getVolumeTable()
.get("/sampleVol"));
- Assert.assertNotNull(reconOMMetadataManager.getBucketTable()
+ assertNotNull(reconOMMetadataManager.getBucketTable()
.get("/sampleVol/bucketOne"));
- Assert.assertNotNull(reconOMMetadataManager.getKeyTable(getBucketLayout())
+ assertNotNull(reconOMMetadataManager.getKeyTable(getBucketLayout())
.get("/sampleVol/bucketOne/key_one"));
- Assert.assertNotNull(reconOMMetadataManager.getKeyTable(getBucketLayout())
+ assertNotNull(reconOMMetadataManager.getKeyTable(getBucketLayout())
.get("/sampleVol/bucketOne/key_two"));
}
@@ -90,18 +95,19 @@ public class TestReconOmMetadataManagerImpl {
OMMetadataManager omMetadataManager = getOMMetadataManager();
//Make sure OM Metadata reflects the keys that were inserted.
- Assert.assertNotNull(omMetadataManager.getKeyTable(getBucketLayout())
+ assertNotNull(omMetadataManager.getKeyTable(getBucketLayout())
.get("/sampleVol/bucketOne/key_one"));
- Assert.assertNotNull(omMetadataManager.getKeyTable(getBucketLayout())
+ assertNotNull(omMetadataManager.getKeyTable(getBucketLayout())
.get("/sampleVol/bucketOne/key_two"));
//Take checkpoint of OM DB.
DBCheckpoint checkpoint = omMetadataManager.getStore()
.getCheckpoint(true);
- Assert.assertNotNull(checkpoint.getCheckpointLocation());
+ assertNotNull(checkpoint.getCheckpointLocation());
//Create new Recon OM Metadata manager instance.
- File reconOmDbDir = temporaryFolder.newFolder();
+ File reconOmDbDir = Files.createDirectory(
+ temporaryFolder.resolve("reconOmDbDir")).toFile();
OzoneConfiguration configuration = new OzoneConfiguration();
configuration.set(OZONE_RECON_OM_SNAPSHOT_DB_DIR, reconOmDbDir
.getAbsolutePath());
@@ -110,37 +116,37 @@ public class TestReconOmMetadataManagerImpl {
reconOMMetadataManager.start(configuration);
//Before accepting a snapshot, the metadata should have null tables.
- Assert.assertNull(reconOMMetadataManager.getBucketTable());
+ assertNull(reconOMMetadataManager.getBucketTable());
//Update Recon OM DB with the OM DB checkpoint location.
reconOMMetadataManager.updateOmDB(
checkpoint.getCheckpointLocation().toFile());
//Now, the tables should have been initialized.
- Assert.assertNotNull(reconOMMetadataManager.getBucketTable());
+ assertNotNull(reconOMMetadataManager.getBucketTable());
// Check volume and bucket entries.
- Assert.assertNotNull(reconOMMetadataManager.getVolumeTable()
+ assertNotNull(reconOMMetadataManager.getVolumeTable()
.get("/sampleVol"));
- Assert.assertNotNull(reconOMMetadataManager.getBucketTable()
+ assertNotNull(reconOMMetadataManager.getBucketTable()
.get("/sampleVol/bucketOne"));
//Verify Keys inserted in OM DB are available in Recon OM DB.
- Assert.assertNotNull(reconOMMetadataManager.getKeyTable(getBucketLayout())
+ assertNotNull(reconOMMetadataManager.getKeyTable(getBucketLayout())
.get("/sampleVol/bucketOne/key_one"));
- Assert.assertNotNull(reconOMMetadataManager.getKeyTable(getBucketLayout())
+ assertNotNull(reconOMMetadataManager.getKeyTable(getBucketLayout())
.get("/sampleVol/bucketOne/key_two"));
//Take a new checkpoint of OM DB.
DBCheckpoint newCheckpoint = omMetadataManager.getStore()
.getCheckpoint(true);
- Assert.assertNotNull(newCheckpoint.getCheckpointLocation());
+ assertNotNull(newCheckpoint.getCheckpointLocation());
// Update again with an existing OM DB.
DBStore current = reconOMMetadataManager.getStore();
reconOMMetadataManager.updateOmDB(
newCheckpoint.getCheckpointLocation().toFile());
// Verify that the existing DB instance is closed.
- Assert.assertTrue(current.isClosed());
+ assertTrue(current.isClosed());
}
/**
@@ -150,7 +156,8 @@ public class TestReconOmMetadataManagerImpl {
*/
private OMMetadataManager getOMMetadataManager() throws IOException {
//Create a new OM Metadata Manager instance + DB.
- File omDbDir = temporaryFolder.newFolder();
+ File omDbDir = Files.createDirectory(
+ temporaryFolder.resolve("OmMetadataDir")).toFile();
OzoneConfiguration omConfiguration = new OzoneConfiguration();
omConfiguration.set(OZONE_OM_DB_DIRS,
omDbDir.getAbsolutePath());
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
index 1598ddfea4..4f6b09309a 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconNodeManager.java
@@ -33,6 +33,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.List;
import java.util.UUID;
@@ -52,30 +53,28 @@ import
org.apache.hadoop.ozone.protocol.commands.ReregisterCommand;
import org.apache.hadoop.ozone.protocol.commands.SCMCommand;
import
org.apache.hadoop.ozone.protocol.commands.SetNodeOperationalStateCommand;
import org.apache.hadoop.ozone.recon.ReconUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
/**
* Tests for Recon Node Manager.
*/
public class TestReconNodeManager {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private OzoneConfiguration conf;
private DBStore store;
private ReconStorageConfig reconStorageConfig;
private HDDSLayoutVersionManager versionManager;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
conf = new OzoneConfiguration();
- conf.set(OZONE_METADATA_DIRS,
- temporaryFolder.newFolder().getAbsolutePath());
+ conf.set(OZONE_METADATA_DIRS, temporaryFolder.toAbsolutePath().toString());
conf.set(OZONE_SCM_NAMES, "localhost");
reconStorageConfig = new ReconStorageConfig(conf, new ReconUtils());
versionManager = new HDDSLayoutVersionManager(
@@ -83,7 +82,7 @@ public class TestReconNodeManager {
store = DBStoreBuilder.createDBStore(conf, new ReconSCMDBDefinition());
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
store.close();
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
index 8e6b1db4cf..7ca5868ab9 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconPipelineManager.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.recon.scm;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -55,14 +56,15 @@ import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_NAMES;
import static
org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager.maxLayoutVersion;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_METADATA_DIRS;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getRandomPipeline;
-import org.junit.After;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;
import static org.mockito.Mockito.mock;
@@ -72,8 +74,8 @@ import static org.mockito.Mockito.mock;
*/
public class TestReconPipelineManager {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private OzoneConfiguration conf;
private SCMStorageConfig scmStorageConfig;
@@ -82,11 +84,11 @@ public class TestReconPipelineManager {
private SCMHAManager scmhaManager;
private SCMContext scmContext;
- @Before
+ @BeforeEach
public void setup() throws IOException {
conf = new OzoneConfiguration();
conf.set(OZONE_METADATA_DIRS,
- temporaryFolder.newFolder().getAbsolutePath());
+ temporaryFolder.toAbsolutePath().toString());
conf.set(OZONE_SCM_NAMES, "localhost");
scmStorageConfig = new ReconStorageConfig(conf, new ReconUtils());
store = DBStoreBuilder.createDBStore(conf, new ReconSCMDBDefinition());
@@ -95,7 +97,7 @@ public class TestReconPipelineManager {
scmContext = SCMContext.emptyContext();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
store.close();
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
index c250ffe571..ca374a4ac3 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconContainerMetadataManagerImpl.java
@@ -20,11 +20,13 @@ package org.apache.hadoop.ozone.recon.spi.impl;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getTestReconOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.initializeNewOmMetadataManager;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
@@ -35,20 +37,18 @@ import
org.apache.hadoop.ozone.recon.api.types.ContainerMetadata;
import org.apache.hadoop.ozone.recon.api.types.KeyPrefixContainer;
import org.apache.hadoop.ozone.recon.recovery.ReconOMMetadataManager;
import org.apache.hadoop.ozone.recon.spi.ReconContainerMetadataManager;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
/**
* Unit Tests for ContainerDBServiceProviderImpl.
*/
public class TestReconContainerMetadataManagerImpl {
- @ClassRule
- public static final TemporaryFolder TEMP_FOLDER = new TemporaryFolder();
+ @TempDir()
+ private static Path temporaryFolder;
private static ReconContainerMetadataManager reconContainerMetadataManager;
private static ReconOMMetadataManager reconOMMetadataManager;
@@ -56,13 +56,14 @@ public class TestReconContainerMetadataManagerImpl {
private String keyPrefix2 = "V3/B1/K2";
private String keyPrefix3 = "V3/B2/K1";
- @BeforeClass
+ @BeforeAll
public static void setupOnce() throws Exception {
reconOMMetadataManager = getTestReconOmMetadataManager(
- initializeNewOmMetadataManager(TEMP_FOLDER.newFolder()),
- TEMP_FOLDER.newFolder());
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("JunitOmDBDir")).toFile()),
+ Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(TEMP_FOLDER)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withContainerDB()
.withReconOm(reconOMMetadataManager)
@@ -71,7 +72,7 @@ public class TestReconContainerMetadataManagerImpl {
reconTestInjector.getInstance(ReconContainerMetadataManager.class);
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Reset containerDB before running each test
reconContainerMetadataManager.reinitWithNewContainerDataFromOm(null);
@@ -174,15 +175,15 @@ public class TestReconContainerMetadataManagerImpl {
}
reconContainerMetadataManager.commitBatchOperation(rdbBatchOperation);
- Assert.assertEquals(1,
+ assertEquals(1,
reconContainerMetadataManager.getCountForContainerKeyPrefix(
ContainerKeyPrefix.get(containerId, keyPrefix1,
0)).longValue());
- Assert.assertEquals(2,
+ assertEquals(2,
reconContainerMetadataManager.getCountForContainerKeyPrefix(
ContainerKeyPrefix.get(containerId, keyPrefix2,
0)).longValue());
- Assert.assertEquals(3,
+ assertEquals(3,
reconContainerMetadataManager.getCountForContainerKeyPrefix(
ContainerKeyPrefix.get(containerId, keyPrefix3,
0)).longValue());
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconDBProvider.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconDBProvider.java
index 14c094d0bf..d75e99692c 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconDBProvider.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconDBProvider.java
@@ -23,12 +23,12 @@ import static org.junit.Assert.assertNotNull;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.io.TempDir;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
@@ -41,18 +41,17 @@ import com.google.inject.Singleton;
*/
public class TestReconDBProvider {
- @Rule
- public TemporaryFolder tempFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private Injector injector;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
- tempFolder.create();
injector = Guice.createInjector(new AbstractModule() {
@Override
protected void configure() {
- File dbDir = tempFolder.getRoot();
+ File dbDir = temporaryFolder.toFile();
OzoneConfiguration configuration = new OzoneConfiguration();
configuration.set(OZONE_RECON_DB_DIR, dbDir.getAbsolutePath());
bind(OzoneConfiguration.class).toInstance(configuration);
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
index 60f52bab22..46d7b0dfcc 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/spi/impl/TestReconNamespaceSummaryManagerImpl.java
@@ -22,14 +22,15 @@ import org.apache.hadoop.hdds.utils.db.RDBBatchOperation;
import org.apache.hadoop.ozone.recon.ReconTestInjector;
import org.apache.hadoop.ozone.recon.api.types.NSSummary;
import org.apache.hadoop.ozone.recon.recovery.ReconOMMetadataManager;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
@@ -43,21 +44,22 @@ import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.initializ
* Test for NSSummary manager.
*/
public class TestReconNamespaceSummaryManagerImpl {
- @ClassRule
- public static final TemporaryFolder TEMP_FOLDER = new TemporaryFolder();
+ @TempDir()
+ private static Path temporaryFolder;
private static ReconNamespaceSummaryManagerImpl reconNamespaceSummaryManager;
private static ReconOMMetadataManager reconOMMetadataManager;
private static int[] testBucket;
private static final Set<Long> TEST_CHILD_DIR =
new HashSet<>(Arrays.asList(new Long[]{1L, 2L, 3L}));
- @BeforeClass
+ @BeforeAll
public static void setupOnce() throws Exception {
reconOMMetadataManager = getTestReconOmMetadataManager(
- initializeNewOmMetadataManager(TEMP_FOLDER.newFolder()),
- TEMP_FOLDER.newFolder());
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("JunitOmDBDir")).toFile()),
+ Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(TEMP_FOLDER)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withReconOm(reconOMMetadataManager)
.withContainerDB()
@@ -70,7 +72,7 @@ public class TestReconNamespaceSummaryManagerImpl {
}
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Clear namespace table before running each test
reconNamespaceSummaryManager.clearNSSummaryTable();
@@ -82,30 +84,30 @@ public class TestReconNamespaceSummaryManagerImpl {
NSSummary summary = reconNamespaceSummaryManager.getNSSummary(1L);
NSSummary summary2 = reconNamespaceSummaryManager.getNSSummary(2L);
NSSummary summary3 = reconNamespaceSummaryManager.getNSSummary(3L);
- Assert.assertEquals(1, summary.getNumOfFiles());
- Assert.assertEquals(2, summary.getSizeOfFiles());
- Assert.assertEquals(3, summary2.getNumOfFiles());
- Assert.assertEquals(4, summary2.getSizeOfFiles());
- Assert.assertEquals(5, summary3.getNumOfFiles());
- Assert.assertEquals(6, summary3.getSizeOfFiles());
+ Assertions.assertEquals(1, summary.getNumOfFiles());
+ Assertions.assertEquals(2, summary.getSizeOfFiles());
+ Assertions.assertEquals(3, summary2.getNumOfFiles());
+ Assertions.assertEquals(4, summary2.getSizeOfFiles());
+ Assertions.assertEquals(5, summary3.getNumOfFiles());
+ Assertions.assertEquals(6, summary3.getSizeOfFiles());
- Assert.assertEquals("dir1", summary.getDirName());
- Assert.assertEquals("dir2", summary2.getDirName());
- Assert.assertEquals("dir3", summary3.getDirName());
+ Assertions.assertEquals("dir1", summary.getDirName());
+ Assertions.assertEquals("dir2", summary2.getDirName());
+ Assertions.assertEquals("dir3", summary3.getDirName());
// test child dir is written
- Assert.assertEquals(3, summary.getChildDir().size());
+ Assertions.assertEquals(3, summary.getChildDir().size());
// non-existent key
- Assert.assertNull(reconNamespaceSummaryManager.getNSSummary(0L));
+ Assertions.assertNull(reconNamespaceSummaryManager.getNSSummary(0L));
}
@Test
public void testInitNSSummaryTable() throws IOException {
putThreeNSMetadata();
- Assert.assertFalse(
+ Assertions.assertFalse(
reconNamespaceSummaryManager.getNSSummaryTable().isEmpty());
reconNamespaceSummaryManager.clearNSSummaryTable();
- Assert.assertTrue(
+ Assertions.assertTrue(
reconNamespaceSummaryManager.getNSSummaryTable().isEmpty());
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
index 32ca5cab48..390b9821aa 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestContainerKeyMapperTask.java
@@ -25,10 +25,12 @@ import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getRandom
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.getTestReconOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.initializeNewOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.writeDataToOm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.Collections;
@@ -50,18 +52,17 @@ import
org.apache.hadoop.ozone.recon.api.types.ContainerKeyPrefix;
import org.apache.hadoop.ozone.recon.recovery.ReconOMMetadataManager;
import org.apache.hadoop.ozone.recon.spi.ReconContainerMetadataManager;
import org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
/**
* Unit test for Container Key mapper task.
*/
public class TestContainerKeyMapperTask {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private ReconContainerMetadataManager reconContainerMetadataManager;
private OMMetadataManager omMetadataManager;
@@ -80,17 +81,17 @@ public class TestContainerKeyMapperTask {
private static final long VOL_OBJECT_ID = 0L;
private static final long KEY_ONE_SIZE = 500L; // 500 bytes
- @Before
+ @BeforeEach
public void setUp() throws Exception {
omMetadataManager = initializeNewOmMetadataManager(
- temporaryFolder.newFolder());
+ temporaryFolder.resolve("JunitOmDBDir").toFile());
ozoneManagerServiceProvider = getMockOzoneManagerServiceProvider();
reconOMMetadataManager = getTestReconOmMetadataManager(omMetadataManager,
- temporaryFolder.newFolder());
+ temporaryFolder.resolve("JunitOmMetadataDir").toFile());
omConfiguration = new OzoneConfiguration();
ReconTestInjector reconTestInjector =
- new ReconTestInjector.Builder(temporaryFolder)
+ new ReconTestInjector.Builder(temporaryFolder.toFile())
.withReconSqlDb()
.withReconOm(reconOMMetadataManager)
.withOmServiceProvider(ozoneManagerServiceProvider)
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOMDBUpdatesHandler.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOMDBUpdatesHandler.java
index e84e662115..9ece45df95 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOMDBUpdatesHandler.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOMDBUpdatesHandler.java
@@ -21,13 +21,13 @@ package org.apache.hadoop.ozone.recon.tasks;
import static
org.apache.hadoop.ozone.recon.tasks.OMDBUpdateEvent.OMDBUpdateAction.PUT;
import static
org.apache.hadoop.ozone.recon.tasks.OMDBUpdateEvent.OMDBUpdateAction.UPDATE;
import static
org.apache.hadoop.ozone.recon.tasks.OMDBUpdateEvent.OMDBUpdateAction.DELETE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
-import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -49,10 +49,9 @@ import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.hdds.utils.db.RDBStore;
import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
import org.jetbrains.annotations.NotNull;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.rocksdb.RocksDBException;
import org.rocksdb.TransactionLogIterator;
import org.rocksdb.WriteBatch;
@@ -62,30 +61,29 @@ import org.rocksdb.WriteBatch;
*/
public class TestOMDBUpdatesHandler {
- @Rule
- public TemporaryFolder folder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
private OMMetadataManager omMetadataManager;
private OMMetadataManager reconOmMetadataManager;
private OMDBDefinition omdbDefinition = new OMDBDefinition();
private Random random = new Random();
- private OzoneConfiguration createNewTestPath() throws IOException {
+ private OzoneConfiguration createNewTestPath(String folderName)
+ throws IOException {
OzoneConfiguration configuration = new OzoneConfiguration();
- File newFolder = folder.newFolder();
- if (!newFolder.exists()) {
- assertTrue(newFolder.mkdirs());
- }
- ServerUtils.setOzoneMetaDirPath(configuration, newFolder.toString());
+ Path tempDirPath =
+ Files.createDirectory(temporaryFolder.resolve(folderName));
+ ServerUtils.setOzoneMetaDirPath(configuration, tempDirPath.toString());
return configuration;
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
- OzoneConfiguration configuration = createNewTestPath();
+ OzoneConfiguration configuration = createNewTestPath("config");
omMetadataManager = new OmMetadataManagerImpl(configuration, null);
- OzoneConfiguration reconConfiguration = createNewTestPath();
+ OzoneConfiguration reconConfiguration = createNewTestPath("reconConfig");
reconOmMetadataManager = new OmMetadataManagerImpl(reconConfiguration,
null);
}
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java
index 8bf6337117..9c0193e502 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmTableInsightTask.java
@@ -35,8 +35,11 @@ import
org.hadoop.ozone.recon.schema.tables.daos.GlobalStatsDao;
import org.jooq.DSLContext;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -66,7 +69,8 @@ import static org.mockito.Mockito.when;
* Unit test for Object Count Task.
*/
public class TestOmTableInsightTask extends AbstractReconSqlDBTest {
-
+ @TempDir
+ private Path temporaryFolder;
private GlobalStatsDao globalStatsDao;
private OmTableInsightTask omTableInsightTask;
private DSLContext dslContext;
@@ -75,8 +79,9 @@ public class TestOmTableInsightTask extends
AbstractReconSqlDBTest {
private void initializeInjector() throws IOException {
reconOMMetadataManager = getTestReconOmMetadataManager(
- initializeNewOmMetadataManager(temporaryFolder.newFolder()),
- temporaryFolder.newFolder());
+ initializeNewOmMetadataManager(Files.createDirectory(
+ temporaryFolder.resolve("JunitOmDBDir")).toFile()),
+ Files.createDirectory(temporaryFolder.resolve("NewDir")).toFile());
globalStatsDao = getDao(GlobalStatsDao.class);
omTableInsightTask = new OmTableInsightTask(
globalStatsDao, getConfiguration(), reconOMMetadataManager);
diff --git
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmUpdateEventValidator.java
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmUpdateEventValidator.java
index de866de152..9a9232341e 100644
---
a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmUpdateEventValidator.java
+++
b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestOmUpdateEventValidator.java
@@ -26,21 +26,21 @@ import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmPrefixInfo;
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import org.slf4j.Logger;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.List;
import static
org.apache.hadoop.ozone.recon.OMMetadataManagerTestUtils.initializeNewOmMetadataManager;
import static
org.apache.hadoop.ozone.recon.tasks.OMDBUpdateEvent.OMDBUpdateAction.PUT;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.times;
@@ -54,13 +54,13 @@ public class TestOmUpdateEventValidator {
private OMDBDefinition omdbDefinition;
private OMMetadataManager omMetadataManager;
private Logger logger;
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @TempDir
+ private Path temporaryFolder;
- @Before
+ @BeforeEach
public void setUp() throws IOException {
omMetadataManager = initializeNewOmMetadataManager(
- temporaryFolder.newFolder());
+ temporaryFolder.toFile());
omdbDefinition = new OMDBDefinition();
eventValidator = new OmUpdateEventValidator(omdbDefinition);
// Create a mock logger
@@ -138,7 +138,7 @@ public class TestOmUpdateEventValidator {
// Assert that the captured log messages are not empty
List<String> logMessages = captor.getAllValues();
for (String logMessage : logMessages) {
- assertFalse("Warning message is empty", logMessage.isEmpty());
+ assertFalse(logMessage.isEmpty(), "Warning message is empty");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
