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 a4bda5c6a2 HDDS-9775. Migrate simple OM integration tests to JUnit5
(#5723)
a4bda5c6a2 is described below
commit a4bda5c6a2da921b53d02c622f1b9d14c190fb91
Author: Raju Balpande <[email protected]>
AuthorDate: Tue Dec 5 00:30:13 2023 +0530
HDDS-9775. Migrate simple OM integration tests to JUnit5 (#5723)
---
.../ozone/om/TestBucketLayoutWithOlderClient.java | 34 +++---
.../apache/hadoop/ozone/om/TestBucketOwner.java | 23 ++--
.../org/apache/hadoop/ozone/om/TestKeyPurging.java | 27 ++---
.../hadoop/ozone/om/TestListKeysWithFSO.java | 27 ++---
.../org/apache/hadoop/ozone/om/TestListStatus.java | 27 ++---
.../hadoop/ozone/om/TestOMEpochForNonRatis.java | 35 +++---
.../ozone/om/TestOMStartupWithBucketLayout.java | 20 +---
.../apache/hadoop/ozone/om/TestObjectStore.java | 55 ++++-----
.../hadoop/ozone/om/TestObjectStoreWithFSO.java | 131 ++++++++++-----------
.../ozone/om/TestObjectStoreWithLegacyFS.java | 40 +++----
.../org/apache/hadoop/ozone/om/TestOmAcls.java | 30 ++---
.../hadoop/ozone/om/TestOmBlockVersioning.java | 32 ++---
.../org/apache/hadoop/ozone/om/TestOmInit.java | 29 ++---
.../org/apache/hadoop/ozone/om/TestOmMetrics.java | 34 ++----
.../ozone/om/TestOzoneManagerConfiguration.java | 86 +++++++-------
.../ozone/om/TestOzoneManagerListVolumes.java | 38 +++---
.../ozone/om/TestOzoneManagerRestInterface.java | 38 +++---
.../hadoop/ozone/om/TestOzoneManagerRestart.java | 49 ++++----
.../apache/hadoop/ozone/om/TestScmSafeMode.java | 44 +++----
.../hadoop/ozone/om/TestSecureOzoneManager.java | 84 +++++++------
.../om/multitenant/TestMultiTenantVolume.java | 44 +++----
.../snapshot/TestOzoneManagerSnapshotProvider.java | 28 ++---
22 files changed, 420 insertions(+), 535 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketLayoutWithOlderClient.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketLayoutWithOlderClient.java
index d54d5c420a..6908583062 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketLayoutWithOlderClient.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketLayoutWithOlderClient.java
@@ -26,21 +26,21 @@ import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
-import org.junit.Assert;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.IOException;
import java.util.UUID;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Tests to verify bucket ops with older version client.
*/
+@Timeout(1200)
public class TestBucketLayoutWithOlderClient {
private static MiniOzoneCluster cluster = null;
@@ -50,16 +50,13 @@ public class TestBucketLayoutWithOlderClient {
private static String omId;
private static OzoneClient client;
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(new Timeout(1200000));
-
/**
* Create a MiniDFSCluster for testing.
* <p>
*
* @throws IOException
*/
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
clusterId = UUID.randomUUID().toString();
@@ -79,12 +76,12 @@ public class TestBucketLayoutWithOlderClient {
OzoneBucket bucket = TestDataUtil.createVolumeAndBucket(client, null);
String volumeName = bucket.getVolumeName();
// OM defaulted bucket layout
- Assert.assertEquals(BucketLayout.OBJECT_STORE, bucket.getBucketLayout());
+ assertEquals(BucketLayout.OBJECT_STORE, bucket.getBucketLayout());
// Sets bucket layout explicitly.
OzoneBucket fsobucket = TestDataUtil
.createVolumeAndBucket(client, BucketLayout.FILE_SYSTEM_OPTIMIZED);
- Assert.assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
+ assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
fsobucket.getBucketLayout());
// Create bucket request by an older client.
@@ -111,19 +108,18 @@ public class TestBucketLayoutWithOlderClient {
omResponse = cluster.getOzoneManager().getOmServerProtocol()
.submitRequest(null, createBucketReq);
- Assert.assertEquals(omResponse.getStatus(),
- OzoneManagerProtocolProtos.Status.OK);
+ assertEquals(OzoneManagerProtocolProtos.Status.OK, omResponse.getStatus());
OmBucketInfo bucketInfo =
cluster.getOzoneManager().getBucketInfo(volumeName, buckName);
- Assert.assertNotNull(bucketInfo);
- Assert.assertEquals(BucketLayout.LEGACY, bucketInfo.getBucketLayout());
+ assertNotNull(bucketInfo);
+ assertEquals(BucketLayout.LEGACY, bucketInfo.getBucketLayout());
}
/**
* Shutdown MiniDFSCluster.
*/
- @AfterClass
+ @AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketOwner.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketOwner.java
index 5b6d1d2f5a..0af4925dbc 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketOwner.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestBucketOwner.java
@@ -31,14 +31,10 @@ import
org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
import org.apache.hadoop.ozone.security.acl.OzoneObj;
import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;
import org.apache.hadoop.security.UserGroupInformation;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,13 +47,14 @@ import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
import static
org.apache.hadoop.ozone.security.acl.IAccessAuthorizer.ACLIdentityType.USER;
import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test for Ozone Bucket Owner.
*/
+@Timeout(120)
public class TestBucketOwner {
- @Rule public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(120));
private static MiniOzoneCluster cluster;
private static final Logger LOG =
@@ -71,7 +68,7 @@ public class TestBucketOwner {
private static UserGroupInformation user3 = UserGroupInformation
.createUserForTesting("user3", new String[] {"test3"});
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
// loginUser is the user running this test.
UserGroupInformation.setLoginUser(adminUser);
@@ -103,7 +100,7 @@ public class TestBucketOwner {
}
}
- @AfterClass
+ @AfterAll
public static void stopCluster() {
if (cluster != null) {
cluster.shutdown();
@@ -244,7 +241,7 @@ public class TestBucketOwner {
String aclString) throws IOException {
OzoneObj obj = OzoneObjInfo.Builder.newBuilder().setVolumeName(volumeName)
.setResType(OzoneObj.ResourceType.VOLUME).setStoreType(OZONE).build();
- Assert.assertTrue(store.setAcl(obj, OzoneAcl.parseAcls(aclString)));
+ assertTrue(store.setAcl(obj, OzoneAcl.parseAcls(aclString)));
}
private void createKey(OzoneBucket ozoneBucket, String key, int length,
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java
index f79b6c1f7f..066ff6e1db 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java
@@ -33,14 +33,11 @@ import
org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.hadoop.ozone.container.TestHelper;
import org.apache.hadoop.ozone.om.service.KeyDeletingService;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ozone.test.JUnit5AwareTimeout;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.IOException;
import java.util.ArrayList;
@@ -48,6 +45,7 @@ import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static java.nio.charset.StandardCharsets.UTF_8;
import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_REPORT_INTERVAL;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL;
@@ -55,14 +53,9 @@ import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVI
/**
* Test OM's {@link KeyDeletingService}.
*/
+@Timeout(300)
public class TestKeyPurging {
- /**
- * Set a timeout for each test.
- */
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(300));
-
private MiniOzoneCluster cluster;
private ObjectStore store;
private OzoneManager om;
@@ -71,7 +64,7 @@ public class TestKeyPurging {
private static final int KEY_SIZE = 100;
private OzoneClient client;
- @Before
+ @BeforeEach
public void setup() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
conf.setTimeDuration(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, 100,
@@ -92,7 +85,7 @@ public class TestKeyPurging {
om = cluster.getOzoneManager();
}
- @After
+ @AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -141,7 +134,7 @@ public class TestKeyPurging {
() -> keyDeletingService.getDeletedKeyCount().get() >= NUM_KEYS,
1000, 10000);
- Assert.assertTrue(keyDeletingService.getRunCount().get() > 1);
+ assertTrue(keyDeletingService.getRunCount().get() > 1);
GenericTestUtils.waitFor(
() -> {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java
index 5174fe5af7..d83bd48719 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java
@@ -31,14 +31,10 @@ import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.client.io.OzoneInputStream;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -52,11 +48,13 @@ import java.util.UUID;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_CLIENT_LIST_CACHE_SIZE;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_ITERATE_BATCH_SIZE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test covers listKeys(keyPrefix, startKey) combinations
* in a FSO bucket layout type.
*/
+@Timeout(1200)
public class TestListKeysWithFSO {
private static MiniOzoneCluster cluster = null;
@@ -71,16 +69,13 @@ public class TestListKeysWithFSO {
private static OzoneBucket fsoOzoneBucket2;
private static OzoneClient client;
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(new Timeout(1200000));
-
/**
* Create a MiniDFSCluster for testing.
* <p>
*
* @throws IOException
*/
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
conf.setBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
@@ -129,7 +124,7 @@ public class TestListKeysWithFSO {
initFSNameSpace();
}
- @AfterClass
+ @AfterAll
public static void teardownClass() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -587,7 +582,7 @@ public class TestListKeysWithFSO {
List <String> keyLists = new ArrayList<>();
while (ozoneKeyIterator.hasNext()) {
OzoneKey ozoneKey = ozoneKeyIterator.next();
- Assert.assertEquals(expectedReplication,
ozoneKey.getReplicationConfig());
+ assertEquals(expectedReplication, ozoneKey.getReplicationConfig());
keyLists.add(ozoneKey.getName());
}
LinkedList outputKeysList = new LinkedList(keyLists);
@@ -598,7 +593,7 @@ public class TestListKeysWithFSO {
}
System.out.println("END:::keyPrefix---> " + keyPrefix + ":::---> " +
startKey);
- Assert.assertEquals(keys, outputKeysList);
+ assertEquals(keys, outputKeysList);
}
private void checkKeyList(String keyPrefix, String startKey,
@@ -637,7 +632,7 @@ public class TestListKeysWithFSO {
ozoneInputStream.read(read, 0, length);
ozoneInputStream.close();
- Assert.assertEquals(new String(input, StandardCharsets.UTF_8),
+ assertEquals(new String(input, StandardCharsets.UTF_8),
new String(read, StandardCharsets.UTF_8));
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListStatus.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListStatus.java
index a8ab1aca0e..13e4440236 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListStatus.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListStatus.java
@@ -27,25 +27,23 @@ import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.AfterClass;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.IOException;
import java.util.UUID;
import java.util.List;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.apache.hadoop.ozone.OzoneConfigKeys.
OZONE_FS_ITERATE_BATCH_SIZE;
/**
* A simple test that asserts that list status output is sorted.
*/
+@Timeout(1200)
public class TestListStatus {
private static MiniOzoneCluster cluster = null;
@@ -56,16 +54,13 @@ public class TestListStatus {
private static OzoneBucket fsoOzoneBucket;
private static OzoneClient client;
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(new Timeout(1200000));
-
/**
* Create a MiniDFSCluster for testing.
* <p>
*
* @throws IOException
*/
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
conf.setBoolean(OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS,
@@ -88,7 +83,7 @@ public class TestListStatus {
buildNameSpaceTree(fsoOzoneBucket);
}
- @AfterClass
+ @AfterAll
public static void teardownClass() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -193,7 +188,7 @@ public class TestListStatus {
List<OzoneFileStatus> statuses =
fsoOzoneBucket.listStatus(keyPrefix, false, startKey,
numEntries, isPartialPrefix);
- Assert.assertEquals(expectedNumKeys, statuses.size());
+ assertEquals(expectedNumKeys, statuses.size());
System.out.println("BEGIN:::keyPrefix---> " + keyPrefix + ":::---> " +
startKey);
@@ -203,7 +198,7 @@ public class TestListStatus {
OzoneFileStatus stNext = statuses.get(i + 1);
System.out.println("status:" + stCurr);
- Assert.assertTrue(stCurr.getPath().compareTo(stNext.getPath()) < 0);
+ assertTrue(stCurr.getPath().compareTo(stNext.getPath()) < 0);
}
if (!statuses.isEmpty()) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java
index 0291a4e580..d63aab63dd 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java
@@ -38,15 +38,12 @@ import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory;
import
org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolClientSideTranslatorPB;
import org.apache.hadoop.security.UserGroupInformation;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.ozone.OmUtils.EPOCH_ID_SHIFT;
import static org.apache.hadoop.ozone.OmUtils.EPOCH_WHEN_RATIS_NOT_ENABLED;
@@ -55,6 +52,7 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY;
/**
* Tests OM epoch generation for when Ratis is not enabled.
*/
+@Timeout(240)
public class TestOMEpochForNonRatis {
private static MiniOzoneCluster cluster = null;
private static OzoneConfiguration conf;
@@ -63,10 +61,7 @@ public class TestOMEpochForNonRatis {
private static String omId;
private static OzoneClient client;
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(240));
-
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
clusterId = UUID.randomUUID().toString();
@@ -85,7 +80,7 @@ public class TestOMEpochForNonRatis {
/**
* Shutdown MiniDFSCluster.
*/
- @AfterClass
+ @AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -121,8 +116,8 @@ public class TestOMEpochForNonRatis {
OmVolumeArgs volumeInfo = omClient.getVolumeInfo(volumeName);
long volumeTrxnIndex = OmUtils.getTxIdFromObjectId(
volumeInfo.getObjectID());
- Assert.assertEquals(1, volumeTrxnIndex);
- Assert.assertEquals(volumeTrxnIndex, om.getLastTrxnIndexForNonRatis());
+ assertEquals(1, volumeTrxnIndex);
+ assertEquals(volumeTrxnIndex, om.getLastTrxnIndexForNonRatis());
OzoneVolume ozoneVolume = objectStore.getVolume(volumeName);
ozoneVolume.createBucket(bucketName);
@@ -131,8 +126,8 @@ public class TestOMEpochForNonRatis {
OmBucketInfo bucketInfo = omClient.getBucketInfo(volumeName, bucketName);
long bucketTrxnIndex = OmUtils.getTxIdFromObjectId(
bucketInfo.getObjectID());
- Assert.assertEquals(2, bucketTrxnIndex);
- Assert.assertEquals(bucketTrxnIndex, om.getLastTrxnIndexForNonRatis());
+ assertEquals(2, bucketTrxnIndex);
+ assertEquals(bucketTrxnIndex, om.getLastTrxnIndexForNonRatis());
// Restart the OM and create new object
cluster.restartOzoneManager();
@@ -154,10 +149,10 @@ public class TestOMEpochForNonRatis {
.build());
long keyTrxnIndex = OmUtils.getTxIdFromObjectId(
omKeyInfo.getObjectID());
- Assert.assertEquals(3, keyTrxnIndex);
+ assertEquals(3, keyTrxnIndex);
// Key commit is a separate transaction. Hence, the last trxn index in DB
// should be 1 more than KeyTrxnIndex
- Assert.assertEquals(4, om.getLastTrxnIndexForNonRatis());
+ assertEquals(4, om.getLastTrxnIndexForNonRatis());
}
@Test
@@ -179,6 +174,6 @@ public class TestOMEpochForNonRatis {
long volObjId = omClient.getVolumeInfo(volumeName).getObjectID();
long epochInVolObjId = volObjId >> EPOCH_ID_SHIFT;
- Assert.assertEquals(EPOCH_WHEN_RATIS_NOT_ENABLED, epochInVolObjId);
+ assertEquals(EPOCH_WHEN_RATIS_NOT_ENABLED, epochInVolObjId);
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMStartupWithBucketLayout.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMStartupWithBucketLayout.java
index 130c2fdce6..50cb298977 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMStartupWithBucketLayout.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMStartupWithBucketLayout.java
@@ -23,26 +23,18 @@ import org.apache.hadoop.ozone.TestDataUtil;
import org.apache.hadoop.ozone.client.OzoneBucket;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.util.UUID;
/**
* Verifies OM startup with different layout.
*/
+@Timeout(300)
public class TestOMStartupWithBucketLayout {
- /**
- * Set a timeout for each test.
- */
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(300));
-
private static MiniOzoneCluster cluster;
private static OzoneClient client;
@@ -161,8 +153,8 @@ public class TestOMStartupWithBucketLayout {
private void verifyBucketLayout(OzoneBucket bucket,
BucketLayout metadataLayout) {
- Assert.assertNotNull(bucket);
- Assert.assertEquals(metadataLayout, bucket.getBucketLayout());
+ Assertions.assertNotNull(bucket);
+ Assertions.assertEquals(metadataLayout, bucket.getBucketLayout());
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStore.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStore.java
index bb4fafec27..5349727ff5 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStore.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStore.java
@@ -26,21 +26,21 @@ import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.IOException;
import java.util.UUID;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
/**
* Tests to verify Object store without prefix enabled.
*/
+@Timeout(1200)
public class TestObjectStore {
private static MiniOzoneCluster cluster = null;
private static OzoneConfiguration conf;
@@ -49,16 +49,13 @@ public class TestObjectStore {
private static String omId;
private static OzoneClient client;
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(new Timeout(1200000));
-
/**
* Create a MiniOzoneCluster for testing.
* <p>
*
* @throws IOException
*/
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
clusterId = UUID.randomUUID().toString();
@@ -73,7 +70,7 @@ public class TestObjectStore {
/**
* Shutdown MiniOzoneCluster.
*/
- @AfterClass
+ @AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -93,8 +90,8 @@ public class TestObjectStore {
BucketArgs.Builder builder = BucketArgs.newBuilder();
volume.createBucket(sampleBucketName, builder.build());
OzoneBucket bucket = volume.getBucket(sampleBucketName);
- Assert.assertEquals(sampleBucketName, bucket.getName());
- Assert.assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
+ assertEquals(sampleBucketName, bucket.getName());
+ assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
bucket.getBucketLayout());
// Case 2: Bucket layout: OBJECT_STORE
@@ -102,8 +99,8 @@ public class TestObjectStore {
builder.setBucketLayout(BucketLayout.OBJECT_STORE);
volume.createBucket(sampleBucketName, builder.build());
bucket = volume.getBucket(sampleBucketName);
- Assert.assertEquals(sampleBucketName, bucket.getName());
- Assert.assertEquals(BucketLayout.OBJECT_STORE,
+ assertEquals(sampleBucketName, bucket.getName());
+ assertEquals(BucketLayout.OBJECT_STORE,
bucket.getBucketLayout());
// Case 3: Bucket layout: LEGACY
@@ -111,16 +108,16 @@ public class TestObjectStore {
builder.setBucketLayout(BucketLayout.LEGACY);
volume.createBucket(sampleBucketName, builder.build());
bucket = volume.getBucket(sampleBucketName);
- Assert.assertEquals(sampleBucketName, bucket.getName());
- Assert.assertEquals(BucketLayout.LEGACY, bucket.getBucketLayout());
+ assertEquals(sampleBucketName, bucket.getName());
+ assertEquals(BucketLayout.LEGACY, bucket.getBucketLayout());
// Case 3: Bucket layout: FILE_SYSTEM_OPTIMIZED
sampleBucketName = UUID.randomUUID().toString();
builder.setBucketLayout(BucketLayout.FILE_SYSTEM_OPTIMIZED);
volume.createBucket(sampleBucketName, builder.build());
bucket = volume.getBucket(sampleBucketName);
- Assert.assertEquals(sampleBucketName, bucket.getName());
- Assert.assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
+ assertEquals(sampleBucketName, bucket.getName());
+ assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
bucket.getBucketLayout());
}
@@ -164,16 +161,16 @@ public class TestObjectStore {
// Check that Link Buckets' layouts match source bucket layouts
OzoneBucket bucket = volume.getBucket(linkBucket1Name);
- Assert.assertEquals(sourceBucket1Layout, bucket.getBucketLayout());
+ assertEquals(sourceBucket1Layout, bucket.getBucketLayout());
bucket = volume.getBucket(linkBucket2Name);
- Assert.assertEquals(sourceBucket2Layout, bucket.getBucketLayout());
+ assertEquals(sourceBucket2Layout, bucket.getBucketLayout());
// linkBucket3 is chained onto linkBucket1, hence its bucket layout matches
// linkBucket1's source bucket.
bucket = volume.getBucket(linkBucket3Name);
- Assert.assertEquals(sourceBucket1Layout, bucket.getBucketLayout());
- Assert.assertEquals(linkBucket1Name, bucket.getSourceBucket());
+ assertEquals(sourceBucket1Layout, bucket.getBucketLayout());
+ assertEquals(linkBucket1Name, bucket.getSourceBucket());
}
@Test
@@ -198,10 +195,10 @@ public class TestObjectStore {
// since sourceBucket does not exist, layout depends on
// OZONE_DEFAULT_BUCKET_LAYOUT config.
OzoneBucket bucket = volume.getBucket(danglingLinkBucketName);
- Assert.assertEquals(BucketLayout.fromString(
+ assertEquals(BucketLayout.fromString(
conf.get(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT)),
bucket.getBucketLayout());
- Assert.assertEquals(sourceBucketName, bucket.getSourceBucket());
+ assertEquals(sourceBucketName, bucket.getSourceBucket());
}
@Test
@@ -225,10 +222,10 @@ public class TestObjectStore {
try {
volume.getBucket(linkBucket1Name);
- Assert.fail("Should throw Exception due to loop in Link Buckets");
+ fail("Should throw Exception due to loop in Link Buckets");
} catch (OMException oe) {
// Expected exception
-
Assert.assertEquals(OMException.ResultCodes.DETECTED_LOOP_IN_BUCKET_LINKS,
+ assertEquals(OMException.ResultCodes.DETECTED_LOOP_IN_BUCKET_LINKS,
oe.getResult());
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java
index d45ebe4082..c61dfd36a9 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithFSO.java
@@ -48,15 +48,11 @@ import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.util.StringUtils;
import org.apache.ozone.test.GenericTestUtils;
-import org.junit.Assert;
-import org.junit.AfterClass;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.IOException;
import java.net.URI;
@@ -76,12 +72,17 @@ import static
org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_SCHEME;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_ALREADY_EXISTS;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_NOT_FOUND;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Tests to verify Object store with prefix enabled cases.
*/
+@Timeout(1200)
public class TestObjectStoreWithFSO {
private static final Path ROOT =
new Path(OZONE_URI_DELIMITER);
@@ -95,16 +96,13 @@ public class TestObjectStoreWithFSO {
private static FileSystem fs;
private static OzoneClient client;
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(new Timeout(1200000));
-
/**
* Create a MiniDFSCluster for testing.
* <p>
*
* @throws IOException
*/
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
clusterId = UUID.randomUUID().toString();
@@ -132,7 +130,7 @@ public class TestObjectStoreWithFSO {
fs = FileSystem.get(conf);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
deleteRootDir();
}
@@ -151,8 +149,7 @@ public class TestObjectStoreWithFSO {
deleteRootRecursively(fileStatuses);
fileStatuses = fs.listStatus(ROOT);
if (fileStatuses != null) {
- Assert.assertEquals(
- "Delete root failed!", 0, fileStatuses.length);
+ assertEquals(0, fileStatuses.length, "Delete root failed!");
}
}
@@ -171,9 +168,9 @@ public class TestObjectStoreWithFSO {
ObjectStore objectStore = client.getObjectStore();
OzoneVolume ozoneVolume = objectStore.getVolume(volumeName);
- Assert.assertTrue(ozoneVolume.getName().equals(volumeName));
+ assertTrue(ozoneVolume.getName().equals(volumeName));
OzoneBucket ozoneBucket = ozoneVolume.getBucket(bucketName);
- Assert.assertTrue(ozoneBucket.getName().equals(bucketName));
+ assertTrue(ozoneBucket.getName().equals(bucketName));
Table<String, OmKeyInfo> openFileTable =
cluster.getOzoneManager().getMetadataManager()
@@ -192,7 +189,7 @@ public class TestObjectStoreWithFSO {
long clientID = keyOutputStream.getClientID();
OmDirectoryInfo dirPathC = getDirInfo(parent);
- Assert.assertNotNull("Failed to find dir path: a/b/c", dirPathC);
+ assertNotNull(dirPathC, "Failed to find dir path: a/b/c");
// after file creation
verifyKeyInOpenFileTable(openFileTable, clientID, file,
@@ -252,8 +249,8 @@ public class TestObjectStoreWithFSO {
// Create a key.
ozoneBucket.createKey(key, 10).close();
- Assert.assertFalse(cluster.getOzoneManager().getMetadataManager()
- .isBucketEmpty(testVolumeName, testBucketName));
+ assertFalse(cluster.getOzoneManager().getMetadataManager().isBucketEmpty(
+ testVolumeName, testBucketName));
try {
// Try to delete the bucket while a key is present under it.
@@ -265,7 +262,7 @@ public class TestObjectStoreWithFSO {
// Delete the key (this only deletes the file)
ozoneBucket.deleteKey(key);
- Assert.assertFalse(cluster.getOzoneManager().getMetadataManager()
+ assertFalse(cluster.getOzoneManager().getMetadataManager()
.isBucketEmpty(testVolumeName, testBucketName));
try {
// Try to delete the bucket while intermediate dirs are present under it.
@@ -278,7 +275,7 @@ public class TestObjectStoreWithFSO {
// Delete last level of directories.
ozoneBucket.deleteDirectory(parent, true);
- Assert.assertFalse(cluster.getOzoneManager().getMetadataManager()
+ assertFalse(cluster.getOzoneManager().getMetadataManager()
.isBucketEmpty(testVolumeName, testBucketName));
try {
// Try to delete the bucket while dirs are present under it.
@@ -291,7 +288,7 @@ public class TestObjectStoreWithFSO {
// Delete all the intermediate directories
ozoneBucket.deleteDirectory("a/", true);
- Assert.assertTrue(cluster.getOzoneManager().getMetadataManager()
+ assertTrue(cluster.getOzoneManager().getMetadataManager()
.isBucketEmpty(testVolumeName, testBucketName));
ozoneVolume.deleteBucket(testBucketName);
// Cleanup the Volume.
@@ -306,9 +303,9 @@ public class TestObjectStoreWithFSO {
ObjectStore objectStore = client.getObjectStore();
OzoneVolume ozoneVolume = objectStore.getVolume(volumeName);
- Assert.assertTrue(ozoneVolume.getName().equals(volumeName));
+ assertTrue(ozoneVolume.getName().equals(volumeName));
OzoneBucket ozoneBucket = ozoneVolume.getBucket(bucketName);
- Assert.assertTrue(ozoneBucket.getName().equals(bucketName));
+ assertTrue(ozoneBucket.getName().equals(bucketName));
Table<String, OmKeyInfo> openFileTable =
cluster.getOzoneManager().getMetadataManager()
@@ -324,7 +321,7 @@ public class TestObjectStoreWithFSO {
long clientID = keyOutputStream.getClientID();
OmDirectoryInfo dirPathC = getDirInfo(parent);
- Assert.assertNotNull("Failed to find dir path: a/b/c", dirPathC);
+ assertNotNull(dirPathC, "Failed to find dir path: a/b/c");
// after file creation
verifyKeyInOpenFileTable(openFileTable, clientID, fileName,
@@ -346,7 +343,7 @@ public class TestObjectStoreWithFSO {
ozoneOutputStream.close();
OzoneKeyDetails keyDetails = ozoneBucket.getKey(key);
- Assert.assertEquals(key, keyDetails.getName());
+ assertEquals(key, keyDetails.getName());
Table<String, OmKeyInfo> fileTable =
cluster.getOzoneManager().getMetadataManager()
@@ -400,9 +397,9 @@ public class TestObjectStoreWithFSO {
public void testListKeysAtDifferentLevels() throws Exception {
ObjectStore objectStore = client.getObjectStore();
OzoneVolume ozoneVolume = objectStore.getVolume(volumeName);
- Assert.assertTrue(ozoneVolume.getName().equals(volumeName));
+ assertTrue(ozoneVolume.getName().equals(volumeName));
OzoneBucket ozoneBucket = ozoneVolume.getBucket(bucketName);
- Assert.assertTrue(ozoneBucket.getName().equals(bucketName));
+ assertTrue(ozoneBucket.getName().equals(bucketName));
String keyc1 = "/a/b1/c1/c1.tx";
String keyc2 = "/a/b1/c2/c2.tx";
@@ -532,9 +529,9 @@ public class TestObjectStoreWithFSO {
public void testListKeysWithNotNormalizedPath() throws Exception {
ObjectStore objectStore = client.getObjectStore();
OzoneVolume ozoneVolume = objectStore.getVolume(volumeName);
- Assert.assertTrue(ozoneVolume.getName().equals(volumeName));
+ assertTrue(ozoneVolume.getName().equals(volumeName));
OzoneBucket ozoneBucket = ozoneVolume.getBucket(bucketName);
- Assert.assertTrue(ozoneBucket.getName().equals(bucketName));
+ assertTrue(ozoneBucket.getName().equals(bucketName));
String key1 = "/dir1///dir2/file1/";
String key2 = "/dir1///dir2/file2/";
@@ -595,7 +592,7 @@ public class TestObjectStoreWithFSO {
outputKeys.add(ozoneKey.getName());
}
- Assert.assertEquals(keys, outputKeys);
+ assertEquals(keys, outputKeys);
}
private void createKeys(OzoneBucket ozoneBucket, List<String> keys)
@@ -625,7 +622,7 @@ public class TestObjectStoreWithFSO {
ozoneInputStream.close();
String inputString = new String(input, StandardCharsets.UTF_8);
- Assert.assertEquals(inputString, new String(read, StandardCharsets.UTF_8));
+ assertEquals(inputString, new String(read, StandardCharsets.UTF_8));
// Read using filesystem.
String rootPath = String.format("%s://%s.%s/", OZONE_URI_SCHEME,
@@ -637,7 +634,7 @@ public class TestObjectStoreWithFSO {
fsDataInputStream.read(read, 0, length);
fsDataInputStream.close();
- Assert.assertEquals(inputString, new String(read, StandardCharsets.UTF_8));
+ assertEquals(inputString, new String(read, StandardCharsets.UTF_8));
}
@Test
@@ -655,7 +652,7 @@ public class TestObjectStoreWithFSO {
String toKeyName = "";
bucket.renameKey(fromKeyName, toKeyName);
OzoneKey emptyKeyRename = bucket.getKey(fromKeyName);
- Assert.assertEquals(fromKeyName, emptyKeyRename.getName());
+ assertEquals(fromKeyName, emptyKeyRename.getName());
toKeyName = UUID.randomUUID().toString();
bucket.renameKey(fromKeyName, toKeyName);
@@ -665,11 +662,11 @@ public class TestObjectStoreWithFSO {
bucket.getKey(fromKeyName);
fail("Lookup for old from key name should fail!");
} catch (OMException ome) {
- Assert.assertEquals(KEY_NOT_FOUND, ome.getResult());
+ assertEquals(KEY_NOT_FOUND, ome.getResult());
}
OzoneKey key = bucket.getKey(toKeyName);
- Assert.assertEquals(toKeyName, key.getName());
+ assertEquals(toKeyName, key.getName());
}
@Test
@@ -691,8 +688,8 @@ public class TestObjectStoreWithFSO {
bucket.renameKey(keyName2, newKeyName2);
// new key should exist
- Assert.assertEquals(newKeyName1, bucket.getKey(newKeyName1).getName());
- Assert.assertEquals(newKeyName2, bucket.getKey(newKeyName2).getName());
+ assertEquals(newKeyName1, bucket.getKey(newKeyName1).getName());
+ assertEquals(newKeyName2, bucket.getKey(newKeyName2).getName());
// old key should not exist
assertKeyRenamedEx(bucket, keyName1);
@@ -715,7 +712,7 @@ public class TestObjectStoreWithFSO {
bucket.renameKey(keyName1, keyName2);
fail("Should throw exception as destin key already exists!");
} catch (OMException e) {
- Assert.assertEquals(KEY_ALREADY_EXISTS, e.getResult());
+ assertEquals(KEY_ALREADY_EXISTS, e.getResult());
}
}
@@ -732,8 +729,8 @@ public class TestObjectStoreWithFSO {
builder.setBucketLayout(BucketLayout.FILE_SYSTEM_OPTIMIZED);
volume.createBucket(sampleBucketName, builder.build());
OzoneBucket bucket = volume.getBucket(sampleBucketName);
- Assert.assertEquals(sampleBucketName, bucket.getName());
- Assert.assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
+ assertEquals(sampleBucketName, bucket.getName());
+ assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
bucket.getBucketLayout());
// Case 2: Bucket layout: OBJECT_STORE
@@ -741,8 +738,8 @@ public class TestObjectStoreWithFSO {
builder.setBucketLayout(BucketLayout.OBJECT_STORE);
volume.createBucket(sampleBucketName, builder.build());
bucket = volume.getBucket(sampleBucketName);
- Assert.assertEquals(sampleBucketName, bucket.getName());
- Assert.assertEquals(BucketLayout.OBJECT_STORE, bucket.getBucketLayout());
+ assertEquals(sampleBucketName, bucket.getName());
+ assertEquals(BucketLayout.OBJECT_STORE, bucket.getBucketLayout());
// Case 3: Bucket layout: Empty and
// OM default bucket layout: FILE_SYSTEM_OPTIMIZED
@@ -750,8 +747,8 @@ public class TestObjectStoreWithFSO {
sampleBucketName = UUID.randomUUID().toString();
volume.createBucket(sampleBucketName, builder.build());
bucket = volume.getBucket(sampleBucketName);
- Assert.assertEquals(sampleBucketName, bucket.getName());
- Assert.assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
+ assertEquals(sampleBucketName, bucket.getName());
+ assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
bucket.getBucketLayout());
// Case 4: Bucket layout: Empty
@@ -759,8 +756,8 @@ public class TestObjectStoreWithFSO {
builder = BucketArgs.newBuilder();
volume.createBucket(sampleBucketName, builder.build());
bucket = volume.getBucket(sampleBucketName);
- Assert.assertEquals(sampleBucketName, bucket.getName());
- Assert.assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
+ assertEquals(sampleBucketName, bucket.getName());
+ assertEquals(BucketLayout.FILE_SYSTEM_OPTIMIZED,
bucket.getBucketLayout());
// Case 5: Bucket layout: LEGACY
@@ -768,8 +765,8 @@ public class TestObjectStoreWithFSO {
builder.setBucketLayout(BucketLayout.LEGACY);
volume.createBucket(sampleBucketName, builder.build());
bucket = volume.getBucket(sampleBucketName);
- Assert.assertEquals(sampleBucketName, bucket.getName());
- Assert.assertEquals(BucketLayout.LEGACY, bucket.getBucketLayout());
+ assertEquals(sampleBucketName, bucket.getName());
+ assertEquals(BucketLayout.LEGACY, bucket.getBucketLayout());
}
private void assertKeyRenamedEx(OzoneBucket bucket, String keyName)
@@ -778,7 +775,7 @@ public class TestObjectStoreWithFSO {
bucket.getKey(keyName);
fail("Should throw KeyNotFound as the key got renamed!");
} catch (OMException ome) {
- Assert.assertEquals(KEY_NOT_FOUND, ome.getResult());
+ assertEquals(KEY_NOT_FOUND, ome.getResult());
}
}
@@ -790,7 +787,7 @@ public class TestObjectStoreWithFSO {
out.write(keyValue.getBytes(StandardCharsets.UTF_8));
out.close();
OzoneKey key = bucket.getKey(keyName);
- Assert.assertEquals(keyName, key.getName());
+ assertEquals(keyName, key.getName());
}
private OmDirectoryInfo getDirInfo(String parentKey) throws Exception {
@@ -822,15 +819,14 @@ public class TestObjectStoreWithFSO {
parentID, fileName);
OmKeyInfo omKeyInfo = fileTable.get(dbFileKey);
if (isEmpty) {
- Assert.assertNull("Table is not empty!", omKeyInfo);
+ assertNull(omKeyInfo, "Table is not empty!");
} else {
- Assert.assertNotNull("Table is empty!", omKeyInfo);
+ assertNotNull(omKeyInfo, "Table is empty!");
// used startsWith because the key format is,
// <parentID>/fileName/<clientID> and clientID is not visible.
- Assert.assertEquals("Invalid Key: " + omKeyInfo.getObjectInfo(),
- omKeyInfo.getKeyName(), fileName);
- Assert.assertEquals("Invalid Key", parentID,
- omKeyInfo.getParentObjectID());
+ assertEquals(omKeyInfo.getKeyName(), fileName,
+ "Invalid Key: " + omKeyInfo.getObjectInfo());
+ assertEquals(parentID, omKeyInfo.getParentObjectID(), "Invalid Key");
}
}
@@ -851,20 +847,19 @@ public class TestObjectStoreWithFSO {
OmKeyInfo omKeyInfo = openFileTable.get(dbOpenFileKey);
return omKeyInfo == null;
} catch (IOException e) {
- Assert.fail("DB failure!");
+ fail("DB failure!");
return false;
}
}, 1000, 120000);
} else {
OmKeyInfo omKeyInfo = openFileTable.get(dbOpenFileKey);
- Assert.assertNotNull("Table is empty!", omKeyInfo);
+ assertNotNull(omKeyInfo, "Table is empty!");
// used startsWith because the key format is,
// <parentID>/fileName/<clientID> and clientID is not visible.
- Assert.assertEquals("Invalid Key: " + omKeyInfo.getObjectInfo(),
- omKeyInfo.getKeyName(), fileName);
- Assert.assertEquals("Invalid Key", parentID,
- omKeyInfo.getParentObjectID());
+ assertEquals(omKeyInfo.getKeyName(), fileName,
+ "Invalid Key: " + omKeyInfo.getObjectInfo());
+ assertEquals(parentID, omKeyInfo.getParentObjectID(), "Invalid Key");
}
}
@@ -875,7 +870,7 @@ public class TestObjectStoreWithFSO {
/**
* Shutdown MiniDFSCluster.
*/
- @AfterClass
+ @AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithLegacyFS.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithLegacyFS.java
index ad1e5ee43d..0b00f9b578 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithLegacyFS.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestObjectStoreWithLegacyFS.java
@@ -43,15 +43,11 @@ import
org.apache.hadoop.ozone.om.helpers.OmMultipartCommitUploadPartInfo;
import org.apache.hadoop.ozone.om.helpers.OmMultipartUploadCompleteInfo;
import org.apache.ozone.test.GenericTestUtils;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,14 +57,16 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.UUID;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
/**
* Test verifies object store with OZONE_OM_ENABLE_FILESYSTEM_PATHS enabled.
*/
+@Timeout(200)
public class TestObjectStoreWithLegacyFS {
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(200));
-
private static MiniOzoneCluster cluster = null;
private static OzoneClient client;
@@ -81,7 +79,7 @@ public class TestObjectStoreWithLegacyFS {
private static final Logger LOG =
LoggerFactory.getLogger(TestObjectStoreWithLegacyFS.class);
- @BeforeClass
+ @BeforeAll
public static void initClass() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -98,7 +96,7 @@ public class TestObjectStoreWithLegacyFS {
/**
* Shutdown MiniOzoneCluster.
*/
- @AfterClass
+ @AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -106,7 +104,7 @@ public class TestObjectStoreWithLegacyFS {
}
}
- @Before
+ @BeforeEach
public void init() throws Exception {
volumeName = RandomStringUtils.randomAlphabetic(10).toLowerCase();
bucketName = RandomStringUtils.randomAlphabetic(10).toLowerCase();
@@ -167,10 +165,10 @@ public class TestObjectStoreWithLegacyFS {
}
} catch (IOException ex) {
LOG.info("Test failed with: " + ex.getMessage(), ex);
- Assert.fail("Test failed with: " + ex.getMessage());
+ fail("Test failed with: " + ex.getMessage());
}
if (countKeys > expectedCnt) {
- Assert.fail("Test failed with: too many keys found, expected "
+ fail("Test failed with: too many keys found, expected "
+ expectedCnt + " keys, found " + countKeys + " keys");
}
if (matchingKeys != expectedCnt) {
@@ -196,7 +194,7 @@ public class TestObjectStoreWithLegacyFS {
omMultipartUploadCompleteInfo =
uploadMPUWithDirectoryExists(bucket, keyName);
// successfully uploaded MPU key
- Assert.assertNotNull(omMultipartUploadCompleteInfo);
+ assertNotNull(omMultipartUploadCompleteInfo);
// Test-2: Upload MPU to an LEGACY layout with Directory Exists
legacyBuckName = UUID.randomUUID().toString();
@@ -209,10 +207,10 @@ public class TestObjectStoreWithLegacyFS {
try {
uploadMPUWithDirectoryExists(bucket, keyName);
- Assert.fail("Must throw error as there is " +
+ fail("Must throw error as there is " +
"already directory in the given path");
} catch (OMException ome) {
- Assert.assertEquals(OMException.ResultCodes.NOT_A_FILE, ome.getResult());
+ assertEquals(OMException.ResultCodes.NOT_A_FILE, ome.getResult());
}
}
@@ -221,7 +219,7 @@ public class TestObjectStoreWithLegacyFS {
OmMultipartInfo omMultipartInfo = bucket.initiateMultipartUpload(keyName,
RatisReplicationConfig.getInstance(HddsProtos.ReplicationFactor.ONE));
- Assert.assertNotNull(omMultipartInfo.getUploadID());
+ assertNotNull(omMultipartInfo.getUploadID());
String uploadID = omMultipartInfo.getUploadID();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java
index 003fb44889..d0d2bf40ef 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmAcls.java
@@ -33,14 +33,11 @@ import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;
import org.apache.hadoop.ozone.security.acl.RequestContext;
import org.apache.hadoop.ozone.audit.AuditLogTestUtils;
import org.apache.ozone.test.GenericTestUtils;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.IOException;
import java.util.ArrayList;
@@ -51,21 +48,16 @@ import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS_WILDCARD;
import static org.apache.hadoop.ozone.audit.AuditLogTestUtils.verifyAuditLog;
-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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test for Ozone Manager ACLs.
*/
+@Timeout(300)
public class TestOmAcls {
- /**
- * Set a timeout for each test.
- */
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(300));
-
private static boolean volumeAclAllow = true;
private static boolean bucketAclAllow = true;
private static boolean keyAclAllow = true;
@@ -83,7 +75,7 @@ public class TestOmAcls {
* <p>
* Ozone is made active by setting OZONE_ENABLED = true
*/
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
String clusterId = UUID.randomUUID().toString();
@@ -104,7 +96,7 @@ public class TestOmAcls {
GenericTestUtils.LogCapturer.captureLogs(OzoneManager.getLogger());
}
- @AfterClass
+ @AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -113,7 +105,7 @@ public class TestOmAcls {
AuditLogTestUtils.deleteAuditLogFile();
}
- @Before
+ @BeforeEach
public void setup() throws IOException {
logCapturer.clearOutput();
AuditLogTestUtils.truncateAuditLogFile();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java
index dd39f93388..428bfa7305 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java
@@ -36,38 +36,28 @@ import org.apache.hadoop.ozone.om.helpers.OpenKeySession;
import org.apache.hadoop.ozone.om.protocol.OzoneManagerProtocol;
import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.AfterClass;
-import org.junit.Assert;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE;
-import static org.junit.Assert.assertEquals;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
/**
* This class tests the versioning of blocks from OM side.
*/
+@Timeout(300)
public class TestOmBlockVersioning {
- /**
- * Set a timeout for each test.
- */
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(300));
private static MiniOzoneCluster cluster = null;
private static OzoneClient client;
private static OzoneConfiguration conf;
private static OzoneManager ozoneManager;
private static OzoneManagerProtocol writeClient;
- @Rule
- public ExpectedException exception = ExpectedException.none();
-
/**
* Create a MiniDFSCluster for testing.
* <p>
@@ -75,7 +65,7 @@ public class TestOmBlockVersioning {
*
* @throws IOException
*/
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
cluster = MiniOzoneCluster.newBuilder(conf).build();
@@ -89,7 +79,7 @@ public class TestOmBlockVersioning {
/**
* Shutdown MiniDFSCluster.
*/
- @AfterClass
+ @AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -154,7 +144,7 @@ public class TestOmBlockVersioning {
List<OmKeyLocationInfo> locationInfoList =
openKey.getKeyInfo().getLatestVersionLocations()
.getBlocksLatestVersionOnly();
- Assert.assertTrue(locationInfoList.size() == 1);
+ assertTrue(locationInfoList.size() == 1);
locationInfoList.add(locationInfo);
keyArgs.setLocationInfoList(locationInfoList);
writeClient.commitKey(keyArgs, openKey.getId());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmInit.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmInit.java
index ec8a39d63d..b9feec93a9 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmInit.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmInit.java
@@ -23,26 +23,18 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import
org.apache.hadoop.security.authentication.client.AuthenticationException;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
/**
* Test Ozone Manager Init.
*/
+@Timeout(300)
public class TestOmInit {
- /**
- * Set a timeout for each test.
- */
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(300));
private static MiniOzoneCluster cluster = null;
private static OMMetrics omMetrics;
private static OzoneConfiguration conf;
@@ -50,9 +42,6 @@ public class TestOmInit {
private static String scmId;
private static String omId;
- @Rule
- public ExpectedException exception = ExpectedException.none();
-
/**
* Create a MiniDFSCluster for testing.
* <p>
@@ -60,7 +49,7 @@ public class TestOmInit {
*
* @throws IOException
*/
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
clusterId = UUID.randomUUID().toString();
@@ -78,7 +67,7 @@ public class TestOmInit {
/**
* Shutdown MiniDFSCluster.
*/
- @AfterClass
+ @AfterAll
public static void shutdown() {
if (cluster != null) {
cluster.shutdown();
@@ -96,7 +85,7 @@ public class TestOmInit {
// Stop the Ozone Manager
cluster.getOzoneManager().stop();
// Now try to init the OM again. It should succeed
- Assert.assertTrue(OzoneManager.omInit(conf));
+ Assertions.assertTrue(OzoneManager.omInit(conf));
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
index 7fc050e172..d49f059a06 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
@@ -22,8 +22,9 @@ import static
org.apache.hadoop.ozone.security.acl.OzoneObj.ResourceType.VOLUME;
import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
import static org.apache.hadoop.test.MetricsAsserts.assertCounter;
import static org.apache.hadoop.test.MetricsAsserts.getMetrics;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
@@ -66,26 +67,17 @@ import org.apache.hadoop.ozone.security.acl.OzoneObj;
import org.apache.hadoop.ozone.security.acl.OzoneObjInfo;
import org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse;
import org.assertj.core.util.Lists;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.mockito.Mockito;
/**
* Test for OM metrics.
*/
+@Timeout(300)
public class TestOmMetrics {
-
- /**
- * Set a timeout for each test.
- */
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(300));
private MiniOzoneCluster cluster;
private MiniOzoneCluster.Builder clusterBuilder;
private OzoneConfiguration conf;
@@ -101,7 +93,7 @@ public class TestOmMetrics {
/**
* Create a MiniDFSCluster for testing.
*/
- @Before
+ @BeforeEach
public void setup() throws Exception {
conf = new OzoneConfiguration();
conf.setTimeDuration(OMConfigKeys.OZONE_OM_METRICS_SAVE_INTERVAL,
@@ -121,7 +113,7 @@ public class TestOmMetrics {
/**
* Shutdown MiniDFSCluster.
*/
- @After
+ @AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -129,8 +121,6 @@ public class TestOmMetrics {
}
}
-
-
@Test
public void testVolumeOps() throws Exception {
startCluster();
@@ -334,8 +324,8 @@ public class TestOmMetrics {
writeClient.commitKey(keyArgs, keySession.getId());
} catch (Exception e) {
//Expected Failure in preExecute due to not enough datanode
- Assertions.assertTrue(e.getMessage()
- .contains("No enough datanodes to choose"), e::getMessage);
+ assertTrue(e.getMessage().contains("No enough datanodes to choose"),
+ e::getMessage);
}
omMetrics = getMetrics("OMMetrics");
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
index 62d50e5a70..8f75e56805 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
@@ -39,26 +39,22 @@ import org.apache.ozone.test.GenericTestUtils;
import org.apache.ratis.protocol.RaftPeer;
import org.apache.ratis.util.LifeCycle;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Tests OM related configurations.
*/
+@Timeout(300)
public class TestOzoneManagerConfiguration {
- /**
- * Set a timeout for each test.
- */
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(300));
-
private OzoneConfiguration conf;
private MiniOzoneCluster cluster;
private String omId;
@@ -69,7 +65,7 @@ public class TestOzoneManagerConfiguration {
private static final long RATIS_RPC_TIMEOUT = 500L;
- @Before
+ @BeforeEach
public void init() throws IOException {
conf = new OzoneConfiguration();
omId = UUID.randomUUID().toString();
@@ -87,7 +83,7 @@ public class TestOzoneManagerConfiguration {
omStore.initialize();
}
- @After
+ @AfterEach
public void shutdown() {
if (cluster != null) {
cluster.shutdown();
@@ -113,7 +109,7 @@ public class TestOzoneManagerConfiguration {
startCluster();
om = cluster.getOzoneManager();
- Assert.assertTrue(NetUtils.isLocalAddress(
+ assertTrue(NetUtils.isLocalAddress(
om.getOmRpcServerAddr().getAddress()));
}
@@ -144,16 +140,16 @@ public class TestOzoneManagerConfiguration {
startCluster();
om = cluster.getOzoneManager();
- Assert.assertEquals("0.0.0.0",
+ assertEquals("0.0.0.0",
om.getOmRpcServerAddr().getHostName());
- Assert.assertEquals(OMConfigKeys.OZONE_OM_PORT_DEFAULT,
+ assertEquals(OMConfigKeys.OZONE_OM_PORT_DEFAULT,
om.getOmRpcServerAddr().getPort());
// Verify that the 2nd OMs address stored in the current OM also has the
// default port as the port is not specified
InetSocketAddress omNode2Addr = om.getPeerNodes().get(0).getRpcAddress();
- Assert.assertEquals("122.0.0.122", omNode2Addr.getHostString());
- Assert.assertEquals(OMConfigKeys.OZONE_OM_PORT_DEFAULT,
+ assertEquals("122.0.0.122", omNode2Addr.getHostString());
+ assertEquals(OMConfigKeys.OZONE_OM_PORT_DEFAULT,
omNode2Addr.getPort());
}
@@ -169,14 +165,14 @@ public class TestOzoneManagerConfiguration {
om = cluster.getOzoneManager();
omRatisServer = om.getOmRatisServer();
- Assert.assertEquals(LifeCycle.State.RUNNING, om.getOmRatisServerState());
+ assertEquals(LifeCycle.State.RUNNING, om.getOmRatisServerState());
// OM's Ratis server should have only 1 peer (itself) in its RaftGroup
Collection<RaftPeer> peers = omRatisServer.getRaftGroup().getPeers();
- Assert.assertEquals(1, peers.size());
+ assertEquals(1, peers.size());
// The RaftPeer id should match OM_DEFAULT_NODE_ID
RaftPeer raftPeer = peers.toArray(new RaftPeer[1])[0];
- Assert.assertEquals(OzoneConsts.OM_DEFAULT_NODE_ID,
+ assertEquals(OzoneConsts.OM_DEFAULT_NODE_ID,
raftPeer.getId().toString());
}
@@ -220,15 +216,15 @@ public class TestOzoneManagerConfiguration {
om = cluster.getOzoneManager();
omRatisServer = om.getOmRatisServer();
- Assert.assertEquals(LifeCycle.State.RUNNING, om.getOmRatisServerState());
+ assertEquals(LifeCycle.State.RUNNING, om.getOmRatisServerState());
// OM's Ratis server should have 3 peers in its RaftGroup
Collection<RaftPeer> peers = omRatisServer.getRaftGroup().getPeers();
- Assert.assertEquals(3, peers.size());
+ assertEquals(3, peers.size());
// Ratis server RaftPeerId should match with omNode2 ID as node2 is the
// localhost
- Assert.assertEquals(omNode2Id, omRatisServer.getRaftPeerId().toString());
+ assertEquals(omNode2Id, omRatisServer.getRaftPeerId().toString());
// Verify peer details
for (RaftPeer peer : peers) {
@@ -247,9 +243,9 @@ public class TestOzoneManagerConfiguration {
// Ratis port is not set for node3. So it should take the default port
expectedPeerAddress = "124.0.0.124:9898";
break;
- default : Assert.fail("Unrecognized RaftPeerId");
+ default : fail("Unrecognized RaftPeerId");
}
- Assert.assertEquals(expectedPeerAddress, peer.getAddress());
+ assertEquals(expectedPeerAddress, peer.getAddress());
}
}
@@ -298,19 +294,19 @@ public class TestOzoneManagerConfiguration {
// Verify Peer details
List<OMNodeDetails> peerNodes = om.getPeerNodes();
for (OMNodeDetails peerNode : peerNodes) {
- Assert.assertTrue(peerNode.isHostUnresolved());
- Assert.assertNull(peerNode.getInetAddress());
+ assertTrue(peerNode.isHostUnresolved());
+ assertNull(peerNode.getInetAddress());
}
- Assert.assertEquals(LifeCycle.State.RUNNING, om.getOmRatisServerState());
+ assertEquals(LifeCycle.State.RUNNING, om.getOmRatisServerState());
// OM's Ratis server should have 3 peers in its RaftGroup
Collection<RaftPeer> peers = omRatisServer.getRaftGroup().getPeers();
- Assert.assertEquals(3, peers.size());
+ assertEquals(3, peers.size());
// Ratis server RaftPeerId should match with omNode2 ID as node2 is the
// localhost
- Assert.assertEquals(omNode2Id, omRatisServer.getRaftPeerId().toString());
+ assertEquals(omNode2Id, omRatisServer.getRaftPeerId().toString());
// Verify peer details
for (RaftPeer peer : peers) {
@@ -330,9 +326,9 @@ public class TestOzoneManagerConfiguration {
// Ratis port is not set for node3. So it should take the default port
expectedPeerAddress = node3Hostname + ":9898";
break;
- default : Assert.fail("Unrecognized RaftPeerId");
+ default : fail("Unrecognized RaftPeerId");
}
- Assert.assertEquals(expectedPeerAddress, peer.getAddress());
+ assertEquals(expectedPeerAddress, peer.getAddress());
}
}
@@ -366,7 +362,7 @@ public class TestOzoneManagerConfiguration {
try {
startCluster();
- Assert.fail("Wrong Configuration. OM initialization should have
failed.");
+ fail("Wrong Configuration. OM initialization should have failed.");
} catch (OzoneIllegalArgumentException e) {
GenericTestUtils.assertExceptionContains("Configuration has no " +
OMConfigKeys.OZONE_OM_ADDRESS_KEY + " address that matches local " +
@@ -387,10 +383,10 @@ public class TestOzoneManagerConfiguration {
try {
startCluster();
- Assert.fail("Should have failed to start the cluster!");
+ fail("Should have failed to start the cluster!");
} catch (OzoneIllegalArgumentException e) {
// Expect error message
- Assert.assertTrue(e.getMessage().contains(
+ assertTrue(e.getMessage().contains(
"List of OM Node ID's should be specified"));
}
}
@@ -417,10 +413,10 @@ public class TestOzoneManagerConfiguration {
try {
startCluster();
- Assert.fail("Should have failed to start the cluster!");
+ fail("Should have failed to start the cluster!");
} catch (OzoneIllegalArgumentException e) {
// Expect error message
- Assert.assertTrue(e.getMessage().contains(
+ assertTrue(e.getMessage().contains(
"OM RPC Address should be set for all node"));
}
}
@@ -470,16 +466,16 @@ public class TestOzoneManagerConfiguration {
om = cluster.getOzoneManager();
omRatisServer = om.getOmRatisServer();
- Assert.assertEquals(LifeCycle.State.RUNNING, om.getOmRatisServerState());
+ assertEquals(LifeCycle.State.RUNNING, om.getOmRatisServerState());
// OM's Ratis server should have 3 peers in its RaftGroup
Collection<RaftPeer> peers = omRatisServer.getRaftGroup().getPeers();
- Assert.assertEquals(3, peers.size());
+ assertEquals(3, peers.size());
// Verify that the serviceId and nodeId match the node with the localhost
// address - om-service-test2 and omNode2
- Assert.assertEquals(om2ServiceId, om.getOMServiceId());
- Assert.assertEquals(omNode2Id, omRatisServer.getRaftPeerId().toString());
+ assertEquals(om2ServiceId, om.getOMServiceId());
+ assertEquals(omNode2Id, omRatisServer.getRaftPeerId().toString());
}
private String getOMAddrKeyWithSuffix(String serviceId, String nodeId) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java
index c90f95f71b..530da077c3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java
@@ -47,27 +47,22 @@ import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_VOLUME_LISTALL_ALLOWED;
import static org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType.OZONE;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
/**
* Test OzoneManager list volume operation under combinations of configs.
*/
+@Timeout(120)
public class TestOzoneManagerListVolumes {
private static MiniOzoneCluster cluster;
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(120));
-
private static UserGroupInformation adminUser =
UserGroupInformation.createUserForTesting("om", new String[]{"ozone"});
private static UserGroupInformation user1 =
@@ -80,7 +75,7 @@ public class TestOzoneManagerListVolumes {
UserGroupInformation.createUserForTesting("[email protected]",
new String[]{"test"});
- @Before
+ @BeforeEach
public void init() throws Exception {
// loginUser is the user running this test.
// Implication: loginUser is automatically added to the OM admin list.
@@ -91,7 +86,7 @@ public class TestOzoneManagerListVolumes {
* Create a MiniDFSCluster for testing.
*/
- @BeforeClass
+ @BeforeAll
public static void setupClass()
throws InterruptedException, TimeoutException, IOException {
OzoneConfiguration conf = new OzoneConfiguration();
@@ -131,7 +126,7 @@ public class TestOzoneManagerListVolumes {
om.join();
}
- @AfterClass
+ @AfterAll
public static void shutdownClass() {
if (cluster != null) {
cluster.shutdown();
@@ -148,7 +143,7 @@ public class TestOzoneManagerListVolumes {
cluster.getOzoneManager().restart();
}
- @After
+ @AfterEach
public void stopOM() {
OzoneManager om = cluster.getOzoneManager();
if (om != null) {
@@ -179,7 +174,8 @@ public class TestOzoneManagerListVolumes {
String aclString) throws IOException {
OzoneObj obj = OzoneObjInfo.Builder.newBuilder().setVolumeName(volumeName)
.setResType(OzoneObj.ResourceType.VOLUME).setStoreType(OZONE).build();
- Assert.assertTrue(objectStore.setAcl(obj, OzoneAcl.parseAcls(aclString)));
+ Assertions.assertTrue(objectStore.setAcl(
+ obj, OzoneAcl.parseAcls(aclString)));
}
/**
@@ -212,7 +208,7 @@ public class TestOzoneManagerListVolumes {
String volumeName = vol.getName();
accessibleVolumes.add(volumeName);
}
- Assert.assertEquals(new HashSet<>(expectVol), accessibleVolumes);
+ Assertions.assertEquals(new HashSet<>(expectVol), accessibleVolumes);
} catch (RuntimeException ex) {
if (expectListByUserSuccess) {
throw ex;
@@ -238,11 +234,11 @@ public class TestOzoneManagerListVolumes {
it.next();
count++;
}
- Assert.assertEquals(5, count);
+ Assertions.assertEquals(5, count);
} else {
try {
objectStore.listVolumes("volume");
- Assert.fail("listAllVolumes should fail for " + user.getUserName());
+ Assertions.fail("listAllVolumes should fail for " +
user.getUserName());
} catch (RuntimeException ex) {
// Current listAllVolumes throws RuntimeException
if (ex.getCause() instanceof OMException) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java
index 0a844c8648..2cca0619af 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java
@@ -32,45 +32,39 @@ import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Rule;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.apache.hadoop.hdds.HddsUtils.getScmAddressForClients;
import static org.apache.hadoop.ozone.OmUtils.getOmAddressForClients;
/**
* This class is to test the REST interface exposed by OzoneManager.
*/
+@Timeout(300)
public class TestOzoneManagerRestInterface {
- /**
- * Set a timeout for each test.
- */
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(300));
-
private static MiniOzoneCluster cluster;
private static OzoneConfiguration conf;
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
conf = new OzoneConfiguration();
cluster = MiniOzoneCluster.newBuilder(conf).build();
cluster.waitForClusterToBeReady();
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws Exception {
if (cluster != null) {
cluster.shutdown();
@@ -102,19 +96,19 @@ public class TestOzoneManagerRestInterface {
getOmAddressForClients(conf);
ServiceInfo omInfo = serviceMap.get(HddsProtos.NodeType.OM);
- Assert.assertEquals(omAddress.getHostName(), omInfo.getHostname());
- Assert.assertEquals(omAddress.getPort(),
+ assertEquals(omAddress.getHostName(), omInfo.getHostname());
+ assertEquals(omAddress.getPort(),
omInfo.getPort(ServicePort.Type.RPC));
- Assert.assertEquals(server.getHttpAddress().getPort(),
+ assertEquals(server.getHttpAddress().getPort(),
omInfo.getPort(ServicePort.Type.HTTP));
- Assert.assertTrue(getScmAddressForClients(conf).iterator().hasNext());
+ assertTrue(getScmAddressForClients(conf).iterator().hasNext());
InetSocketAddress scmAddress =
getScmAddressForClients(conf).iterator().next();
ServiceInfo scmInfo = serviceMap.get(HddsProtos.NodeType.SCM);
- Assert.assertEquals(scmAddress.getHostName(), scmInfo.getHostname());
- Assert.assertEquals(scmAddress.getPort(),
+ assertEquals(scmAddress.getHostName(), scmInfo.getHostname());
+ assertEquals(scmAddress.getPort(),
scmInfo.getPort(ServicePort.Type.RPC));
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestart.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestart.java
index 5f6954e790..c95bb1e35f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestart.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestart.java
@@ -39,29 +39,27 @@ import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import static java.nio.charset.StandardCharsets.UTF_8;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_RATIS_PIPELINE_LIMIT;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS_WILDCARD;
-import org.junit.AfterClass;
-import org.junit.Assert;
-
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_NOT_FOUND;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.PARTIAL_RENAME;
-import static org.junit.Assert.fail;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test some client operations after cluster starts. And perform restart and
* then performs client operations and check the behavior is expected or not.
*/
+@Timeout(240)
public class TestOzoneManagerRestart {
private static MiniOzoneCluster cluster = null;
private static OzoneConfiguration conf;
@@ -70,9 +68,6 @@ public class TestOzoneManagerRestart {
private static String omId;
private static OzoneClient client;
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(240));
-
/**
* Create a MiniDFSCluster for testing.
* <p>
@@ -80,7 +75,7 @@ public class TestOzoneManagerRestart {
*
* @throws IOException
*/
- @BeforeClass
+ @BeforeAll
public static void init() throws Exception {
conf = new OzoneConfiguration();
clusterId = UUID.randomUUID().toString();
@@ -104,7 +99,7 @@ public class TestOzoneManagerRestart {
/**
* Shutdown MiniDFSCluster.
*/
- @AfterClass
+ @AfterAll
public static void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -121,7 +116,7 @@ public class TestOzoneManagerRestart {
objectStore.createVolume(volumeName);
OzoneVolume ozoneVolume = objectStore.getVolume(volumeName);
- Assert.assertTrue(ozoneVolume.getName().equals(volumeName));
+ assertTrue(ozoneVolume.getName().equals(volumeName));
cluster.restartOzoneManager();
cluster.restartStorageContainerManager(true);
@@ -136,7 +131,7 @@ public class TestOzoneManagerRestart {
// Get Volume.
ozoneVolume = objectStore.getVolume(volumeName);
- Assert.assertTrue(ozoneVolume.getName().equals(volumeName));
+ assertTrue(ozoneVolume.getName().equals(volumeName));
}
@@ -151,12 +146,12 @@ public class TestOzoneManagerRestart {
objectStore.createVolume(volumeName);
OzoneVolume ozoneVolume = objectStore.getVolume(volumeName);
- Assert.assertTrue(ozoneVolume.getName().equals(volumeName));
+ assertTrue(ozoneVolume.getName().equals(volumeName));
ozoneVolume.createBucket(bucketName);
OzoneBucket ozoneBucket = ozoneVolume.getBucket(bucketName);
- Assert.assertTrue(ozoneBucket.getName().equals(bucketName));
+ assertTrue(ozoneBucket.getName().equals(bucketName));
cluster.restartOzoneManager();
cluster.restartStorageContainerManager(true);
@@ -171,7 +166,7 @@ public class TestOzoneManagerRestart {
// Get bucket.
ozoneBucket = ozoneVolume.getBucket(bucketName);
- Assert.assertTrue(ozoneBucket.getName().equals(bucketName));
+ assertTrue(ozoneBucket.getName().equals(bucketName));
}
@@ -191,12 +186,12 @@ public class TestOzoneManagerRestart {
objectStore.createVolume(volumeName);
OzoneVolume ozoneVolume = objectStore.getVolume(volumeName);
- Assert.assertTrue(ozoneVolume.getName().equals(volumeName));
+ assertTrue(ozoneVolume.getName().equals(volumeName));
ozoneVolume.createBucket(bucketName);
OzoneBucket ozoneBucket = ozoneVolume.getBucket(bucketName);
- Assert.assertTrue(ozoneBucket.getName().equals(bucketName));
+ assertTrue(ozoneBucket.getName().equals(bucketName));
String data = "random data";
OzoneOutputStream ozoneOutputStream1 = ozoneBucket.createKey(key1,
@@ -213,14 +208,14 @@ public class TestOzoneManagerRestart {
try {
ozoneBucket.renameKeys(keyMap);
} catch (OMException ex) {
- Assert.assertEquals(PARTIAL_RENAME, ex.getResult());
+ assertEquals(PARTIAL_RENAME, ex.getResult());
}
// Get original Key1, it should not exist
try {
ozoneBucket.getKey(key1);
} catch (OMException ex) {
- Assert.assertEquals(KEY_NOT_FOUND, ex.getResult());
+ assertEquals(KEY_NOT_FOUND, ex.getResult());
}
cluster.restartOzoneManager();
@@ -232,15 +227,15 @@ public class TestOzoneManagerRestart {
// Get newKey1.
OzoneKey ozoneKey = ozoneBucket.getKey(newKey1);
- Assert.assertTrue(ozoneKey.getName().equals(newKey1));
- Assert.assertTrue(ozoneKey.getReplicationType().equals(
+ assertTrue(ozoneKey.getName().equals(newKey1));
+ assertTrue(ozoneKey.getReplicationType().equals(
ReplicationType.RATIS));
// Get newKey2, it should not exist
try {
ozoneBucket.getKey(newKey2);
} catch (OMException ex) {
- Assert.assertEquals(KEY_NOT_FOUND, ex.getResult());
+ assertEquals(KEY_NOT_FOUND, ex.getResult());
}
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java
index 7a70a6ddc2..1d3aaf351f 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestScmSafeMode.java
@@ -43,17 +43,14 @@ import org.apache.hadoop.ozone.client.OzoneVolume;
import
org.apache.hadoop.ozone.common.statemachine.InvalidStateTransitionException;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.ozone.test.GenericTestUtils;
-import org.apache.ozone.test.JUnit5AwareTimeout;
import org.apache.ozone.test.UnhealthyTest;
import org.apache.ozone.test.tag.Unhealthy;
-import org.junit.After;
-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.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.junit.experimental.categories.Category;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,15 +63,16 @@ import static
org.apache.hadoop.hdds.client.ReplicationType.RATIS;
import static org.apache.hadoop.hdds.client.ReplicationFactor.ONE;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DEADNODE_INTERVAL;
import static
org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test Ozone Manager operation in distributed handler scenario.
*/
+@Timeout(300)
@Category(UnhealthyTest.class) @Unhealthy("HDDS-3260")
public class TestScmSafeMode {
@@ -88,10 +86,6 @@ public class TestScmSafeMode {
private StorageContainerLocationProtocolClientSideTranslatorPB
storageContainerLocationClient;
-
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(300));
-
/**
* Create a MiniDFSCluster for testing.
* <p>
@@ -100,7 +94,7 @@ public class TestScmSafeMode {
*
* @throws IOException
*/
- @Before
+ @BeforeEach
public void init() throws Exception {
conf = new OzoneConfiguration();
conf.set(OZONE_SCM_STALENODE_INTERVAL, "10s");
@@ -121,7 +115,7 @@ public class TestScmSafeMode {
/**
* Shutdown MiniDFSCluster.
*/
- @After
+ @AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -166,7 +160,7 @@ public class TestScmSafeMode {
StorageContainerManager scm;
scm = cluster.getStorageContainerManager();
- Assert.assertTrue(scm.isInSafeMode());
+ Assertions.assertTrue(scm.isInSafeMode());
om = cluster.getOzoneManager();
@@ -189,20 +183,20 @@ public class TestScmSafeMode {
@Test
public void testIsScmInSafeModeAndForceExit() throws Exception {
// Test 1: SCM should be out of safe mode.
- Assert.assertFalse(storageContainerLocationClient.inSafeMode());
+ Assertions.assertFalse(storageContainerLocationClient.inSafeMode());
cluster.stop();
// Restart the cluster with same metadata dir.
try {
cluster = builder.build();
} catch (IOException e) {
- Assert.fail("Cluster startup failed.");
+ Assertions.fail("Cluster startup failed.");
}
// Test 2: Scm should be in safe mode as datanodes are not started yet.
storageContainerLocationClient = cluster
.getStorageContainerLocationClient();
- Assert.assertTrue(storageContainerLocationClient.inSafeMode());
+ Assertions.assertTrue(storageContainerLocationClient.inSafeMode());
// Force scm out of safe mode.
cluster.getStorageContainerManager().getClientProtocolServer()
.forceExitSafeMode();
@@ -212,7 +206,7 @@ public class TestScmSafeMode {
return !cluster.getStorageContainerManager().getClientProtocolServer()
.inSafeMode();
} catch (IOException e) {
- Assert.fail("Cluster");
+ Assertions.fail("Cluster");
return false;
}
}, 10, 1000 * 5);
@@ -227,7 +221,7 @@ public class TestScmSafeMode {
try {
cluster = builder.build();
} catch (IOException e) {
- Assert.fail("Cluster startup failed.");
+ Assertions.fail("Cluster startup failed.");
}
assertTrue(cluster.getStorageContainerManager().isInSafeMode());
cluster.startHddsDatanodes();
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSecureOzoneManager.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSecureOzoneManager.java
index 38d4ca1cff..8562a09be0 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSecureOzoneManager.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestSecureOzoneManager.java
@@ -29,14 +29,10 @@ import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.security.OMCertificateClient;
import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
import org.bouncycastle.cert.X509CertificateHolder;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -55,10 +51,15 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
import static
org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod.KERBEROS;
import static org.apache.ozone.test.GenericTestUtils.LogCapturer;
import static org.apache.ozone.test.GenericTestUtils.getTempPath;
+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.assertThrows;
/**
* Test secure Ozone Manager operation in distributed handler scenario.
*/
+@Timeout(25)
public class TestSecureOzoneManager {
private static final String COMPONENT = "om";
@@ -70,15 +71,12 @@ public class TestSecureOzoneManager {
private Path metaDir;
private HddsProtos.OzoneManagerDetailsProto omInfo;
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(25));
-
/**
* Create a MiniDFSCluster for testing.
* <p>
* Ozone is made active by setting OZONE_ENABLED = true
*/
- @Before
+ @BeforeEach
public void init() throws Exception {
conf = new OzoneConfiguration();
clusterId = UUID.randomUUID().toString();
@@ -99,7 +97,7 @@ public class TestSecureOzoneManager {
/**
* Shutdown MiniDFSCluster.
*/
- @After
+ @AfterEach
public void shutdown() {
if (cluster != null) {
cluster.shutdown();
@@ -127,22 +125,22 @@ public class TestSecureOzoneManager {
OMCertificateClient client =
new OMCertificateClient(
securityConfig, null, omStorage, omInfo, "", scmId, null, null);
- Assert.assertEquals(CertificateClient.InitResponse.GETCERT, client.init());
+ assertEquals(CertificateClient.InitResponse.GETCERT, client.init());
privateKey = client.getPrivateKey();
publicKey = client.getPublicKey();
- Assert.assertNotNull(client.getPrivateKey());
- Assert.assertNotNull(client.getPublicKey());
- Assert.assertNull(client.getCertificate());
+ assertNotNull(client.getPrivateKey());
+ assertNotNull(client.getPublicKey());
+ assertNull(client.getCertificate());
client.close();
// Case 2: If key pair already exist than response should be GETCERT.
client =
new OMCertificateClient(
securityConfig, null, omStorage, omInfo, "", scmId, null, null);
- Assert.assertEquals(CertificateClient.InitResponse.GETCERT, client.init());
- Assert.assertNotNull(client.getPrivateKey());
- Assert.assertNotNull(client.getPublicKey());
- Assert.assertNull(client.getCertificate());
+ assertEquals(CertificateClient.InitResponse.GETCERT, client.init());
+ assertNotNull(client.getPrivateKey());
+ assertNotNull(client.getPublicKey());
+ assertNull(client.getCertificate());
client.close();
// Case 3: When public key as well as certificate is missing.
@@ -151,10 +149,10 @@ public class TestSecureOzoneManager {
securityConfig, null, omStorage, omInfo, "", null, null, null);
FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMPONENT)
.toString(), securityConfig.getPublicKeyFileName()).toFile());
- Assert.assertEquals(CertificateClient.InitResponse.GETCERT, client.init());
- Assert.assertNotNull(client.getPrivateKey());
- Assert.assertNotNull(client.getPublicKey());
- Assert.assertNull(client.getCertificate());
+ assertEquals(CertificateClient.InitResponse.GETCERT, client.init());
+ assertNotNull(client.getPrivateKey());
+ assertNotNull(client.getPublicKey());
+ assertNull(client.getCertificate());
client.close();
// Case 4: When private key and certificate is missing.
@@ -164,10 +162,10 @@ public class TestSecureOzoneManager {
KeyCodec keyCodec = new KeyCodec(securityConfig, COMPONENT);
FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMPONENT)
.toString(), securityConfig.getPrivateKeyFileName()).toFile());
- Assert.assertEquals(CertificateClient.InitResponse.FAILURE, client.init());
- Assert.assertNull(client.getPrivateKey());
- Assert.assertNotNull(client.getPublicKey());
- Assert.assertNull(client.getCertificate());
+ assertEquals(CertificateClient.InitResponse.FAILURE, client.init());
+ assertNull(client.getPrivateKey());
+ assertNotNull(client.getPublicKey());
+ assertNull(client.getCertificate());
client.close();
// Case 5: When only certificate is present.
@@ -184,10 +182,10 @@ public class TestSecureOzoneManager {
client =
new OMCertificateClient(
securityConfig, null, omStorage, omInfo, "", scmId, null, null);
- Assert.assertEquals(CertificateClient.InitResponse.FAILURE, client.init());
- Assert.assertNull(client.getPrivateKey());
- Assert.assertNull(client.getPublicKey());
- Assert.assertNotNull(client.getCertificate());
+ assertEquals(CertificateClient.InitResponse.FAILURE, client.init());
+ assertNull(client.getPrivateKey());
+ assertNull(client.getPublicKey());
+ assertNotNull(client.getCertificate());
client.close();
// Case 6: When private key and certificate is present.
@@ -197,20 +195,20 @@ public class TestSecureOzoneManager {
FileUtils.deleteQuietly(Paths.get(securityConfig.getKeyLocation(COMPONENT)
.toString(), securityConfig.getPublicKeyFileName()).toFile());
keyCodec.writePrivateKey(privateKey);
- Assert.assertEquals(CertificateClient.InitResponse.SUCCESS, client.init());
- Assert.assertNotNull(client.getPrivateKey());
- Assert.assertNotNull(client.getPublicKey());
- Assert.assertNotNull(client.getCertificate());
+ assertEquals(CertificateClient.InitResponse.SUCCESS, client.init());
+ assertNotNull(client.getPrivateKey());
+ assertNotNull(client.getPublicKey());
+ assertNotNull(client.getCertificate());
client.close();
// Case 7 When keypair and certificate is present.
client =
new OMCertificateClient(
securityConfig, null, omStorage, omInfo, "", scmId, null, null);
- Assert.assertEquals(CertificateClient.InitResponse.SUCCESS, client.init());
- Assert.assertNotNull(client.getPrivateKey());
- Assert.assertNotNull(client.getPublicKey());
- Assert.assertNotNull(client.getCertificate());
+ assertEquals(CertificateClient.InitResponse.SUCCESS, client.init());
+ assertNotNull(client.getPrivateKey());
+ assertNotNull(client.getPublicKey());
+ assertNotNull(client.getCertificate());
client.close();
}
@@ -224,9 +222,9 @@ public class TestSecureOzoneManager {
omStorage.setClusterId(clusterId);
omStorage.setOmId(omId);
config.set(OZONE_OM_ADDRESS_KEY, "om-unknown");
- RuntimeException rte = Assert.assertThrows(RuntimeException.class,
+ RuntimeException rte = assertThrows(RuntimeException.class,
() -> OzoneManager.initializeSecurity(config, omStorage, scmId));
- Assert.assertEquals("Can't get SCM signed certificate. omRpcAdd:" +
+ assertEquals("Can't get SCM signed certificate. omRpcAdd:" +
" om-unknown:9862", rte.getMessage());
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantVolume.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantVolume.java
index 714d7e5bec..e311bc0b5e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantVolume.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantVolume.java
@@ -38,10 +38,9 @@ import org.apache.hadoop.ozone.om.upgrade.OMLayoutFeature;
import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer;
import org.apache.ozone.test.GenericTestUtils;
import org.apache.ozone.test.LambdaTestUtils.VoidCallable;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
import java.io.IOException;
import java.util.UUID;
@@ -52,6 +51,8 @@ import static
org.apache.hadoop.ozone.admin.scm.FinalizeUpgradeCommandUtil.isSta
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_MULTITENANCY_ENABLED;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Tests that S3 requests for a tenant are directed to that tenant's volume,
@@ -68,7 +69,7 @@ public class TestMultiTenantVolume {
private static final String ACCESS_ID = "tenant$username";
private static OzoneClient client;
- @BeforeClass
+ @BeforeAll
public static void initClusterProvider() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
conf.setBoolean(
@@ -85,7 +86,7 @@ public class TestMultiTenantVolume {
finalizeOMUpgrade();
}
- @AfterClass
+ @AfterAll
public static void shutdownClusterProvider() {
IOUtils.closeQuietly(client);
cluster.shutdown();
@@ -126,11 +127,11 @@ public class TestMultiTenantVolume {
// S3 get/set/revoke secret APIs still work before finalization
final String accessId = "testUser1accessId1";
S3SecretValue s3SecretValue = store.getS3Secret(accessId);
- Assert.assertEquals(accessId, s3SecretValue.getAwsAccessKey());
+ assertEquals(accessId, s3SecretValue.getAwsAccessKey());
final String setSecret = "testsecret";
s3SecretValue = store.setS3Secret(accessId, setSecret);
- Assert.assertEquals(accessId, s3SecretValue.getAwsAccessKey());
- Assert.assertEquals(setSecret, s3SecretValue.getAwsSecret());
+ assertEquals(accessId, s3SecretValue.getAwsAccessKey());
+ assertEquals(setSecret, s3SecretValue.getAwsSecret());
store.revokeS3Secret(accessId);
}
@@ -149,7 +150,7 @@ public class TestMultiTenantVolume {
omClient.finalizeUpgrade(upgradeClientID);
// The status should transition as soon as the client call above returns
- Assert.assertTrue(isStarting(finalizationResponse.status()));
+ assertTrue(isStarting(finalizationResponse.status()));
// Wait for the finalization to be marked as done.
// 10s timeout should be plenty.
@@ -160,7 +161,7 @@ public class TestMultiTenantVolume {
upgradeClientID, false, false);
return isDone(progress.status());
} catch (IOException e) {
- Assert.fail("Unexpected exception while waiting for "
+ fail("Unexpected exception while waiting for "
+ "the OM upgrade to finalize: " + e.getMessage());
}
return false;
@@ -173,11 +174,11 @@ public class TestMultiTenantVolume {
// Default client not belonging to a tenant should end up in the S3 volume.
ObjectStore store = client.getObjectStore();
- Assert.assertEquals(s3VolumeName, store.getS3Volume().getName());
+ assertEquals(s3VolumeName, store.getS3Volume().getName());
// Create bucket.
store.createS3Bucket(bucketName);
- Assert.assertEquals(s3VolumeName,
+ assertEquals(s3VolumeName,
store.getS3Bucket(bucketName).getVolumeName());
// Delete bucket.
@@ -194,12 +195,12 @@ public class TestMultiTenantVolume {
store.tenantAssignUserAccessId(USER_PRINCIPAL, TENANT_ID, ACCESS_ID);
// S3 volume pointed to by the store should be for the tenant.
- Assert.assertEquals(TENANT_ID, store.getS3Volume().getName());
+ assertEquals(TENANT_ID, store.getS3Volume().getName());
// Create bucket in the tenant volume.
store.createS3Bucket(BUCKET_NAME);
OzoneBucket bucket = store.getS3Bucket(BUCKET_NAME);
- Assert.assertEquals(TENANT_ID, bucket.getVolumeName());
+ assertEquals(TENANT_ID, bucket.getVolumeName());
// A different user should not see bucket, since they will be directed to
// the s3 volume.
@@ -267,7 +268,7 @@ public class TestMultiTenantVolume {
.get(OzoneConsts.RANGER_OZONE_SERVICE_VERSION_KEY);
long readBackVersion = Long.parseLong(readBackVersionStr);
- Assert.assertEquals(writtenVersion, readBackVersion);
+ assertEquals(writtenVersion, readBackVersion);
}
@Test
@@ -279,8 +280,8 @@ public class TestMultiTenantVolume {
store.createTenant(TENANT_ID);
OzoneVolume volume;
volume = store.getVolume(TENANT_ID);
- Assert.assertEquals(OzoneConsts.QUOTA_RESET, volume.getQuotaInNamespace());
- Assert.assertEquals(OzoneConsts.QUOTA_RESET, volume.getQuotaInBytes());
+ assertEquals(OzoneConsts.QUOTA_RESET, volume.getQuotaInNamespace());
+ assertEquals(OzoneConsts.QUOTA_RESET, volume.getQuotaInBytes());
long spaceQuota = 10;
long namespaceQuota = 20;
@@ -289,8 +290,8 @@ public class TestMultiTenantVolume {
// Check quota
volume = store.getVolume(TENANT_ID);
- Assert.assertEquals(namespaceQuota, volume.getQuotaInNamespace());
- Assert.assertEquals(spaceQuota, volume.getQuotaInBytes());
+ assertEquals(namespaceQuota, volume.getQuotaInNamespace());
+ assertEquals(spaceQuota, volume.getQuotaInBytes());
// Delete tenant and volume
store.deleteTenant(TENANT_ID);
@@ -309,8 +310,7 @@ public class TestMultiTenantVolume {
OMException.class,
() -> store.createTenant(tenantId));
- Assert.assertTrue(e.getMessage().contains("Invalid volume name: "
- + tenantId));
+ assertTrue(e.getMessage().contains("Invalid volume name: " + tenantId));
}
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java
index 2208387324..091471fab1 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java
@@ -37,18 +37,18 @@ import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.hdds.utils.TransactionInfo;
import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
-import org.apache.ozone.test.JUnit5AwareTimeout;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test OM's snapshot provider service.
*/
+@Timeout(300)
public class TestOzoneManagerSnapshotProvider {
private MiniOzoneHAClusterImpl cluster = null;
@@ -59,14 +59,12 @@ public class TestOzoneManagerSnapshotProvider {
private String omServiceId;
private int numOfOMs = 3;
- @Rule
- public TestRule timeout = new JUnit5AwareTimeout(Timeout.seconds(300));
private OzoneClient client;
/**
* Create a MiniDFSCluster for testing.
*/
- @Before
+ @BeforeEach
public void init() throws Exception {
conf = new OzoneConfiguration();
clusterId = UUID.randomUUID().toString();
@@ -88,7 +86,7 @@ public class TestOzoneManagerSnapshotProvider {
/**
* Shutdown MiniDFSCluster.
*/
- @After
+ @AfterEach
public void shutdown() {
IOUtils.closeQuietly(client);
if (cluster != null) {
@@ -132,9 +130,9 @@ public class TestOzoneManagerSnapshotProvider {
// The snapshot index downloaded from leader OM should match the ratis
// snapshot index on the leader OM
- Assert.assertEquals("The snapshot index downloaded from leader OM does " +
- "not match its ratis snapshot index",
- leaderSnapshotIndex, downloadedSnapshotIndex);
+ assertEquals(leaderSnapshotIndex, downloadedSnapshotIndex,
+ "The snapshot index downloaded from leader OM " +
+ "does not match its ratis snapshot index");
}
private long getDownloadedSnapshotIndex(DBCheckpoint dbCheckpoint)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
