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 b9e74f6041 HDDS-10033. Improve assertTrue assertions in ozone-manager
(#5901)
b9e74f6041 is described below
commit b9e74f604161609e43c63a29c7a7ad2b16fb7d62
Author: Zhaohui Wang <[email protected]>
AuthorDate: Wed Jan 3 16:04:56 2024 +0800
HDDS-10033. Improve assertTrue assertions in ozone-manager (#5901)
---
.../hadoop/ozone/om/TestAuthorizerLockImpl.java | 11 ++++++-----
.../hadoop/ozone/om/TestBucketManagerImpl.java | 5 +++--
.../apache/hadoop/ozone/om/TestKeyManagerUnit.java | 7 +++----
.../hadoop/ozone/om/TestOMMultiTenantManager.java | 3 ++-
.../ozone/om/TestOMMultiTenantManagerImpl.java | 13 +++++++------
.../hadoop/ozone/om/TestOmMetadataManager.java | 17 +++++++++--------
.../hadoop/ozone/om/TestOmSnapshotManager.java | 9 +++++----
.../apache/hadoop/ozone/om/TestOzoneConfigUtil.java | 18 +++++++++---------
.../hadoop/ozone/om/TestSstFilteringService.java | 3 ++-
.../hadoop/ozone/om/failover/TestOMFailovers.java | 10 +++++-----
.../hadoop/ozone/om/lock/TestOzoneLockProvider.java | 8 ++++----
.../TestMultiTenantAccessController.java | 7 ++++---
.../om/ratis/TestOzoneManagerDoubleBuffer.java | 3 ++-
...stOzoneManagerDoubleBufferWithDummyResponse.java | 14 +++++++-------
.../TestOzoneManagerDoubleBufferWithOMResponse.java | 8 +++-----
.../ozone/om/ratis/TestOzoneManagerRatisServer.java | 9 ++++-----
.../om/ratis/TestOzoneManagerStateMachine.java | 4 ++--
.../hadoop/ozone/om/request/TestNormalizePaths.java | 4 ++--
.../bucket/TestOMBucketSetPropertyRequest.java | 21 +++++++++++----------
.../bucket/acl/TestOMBucketAddAclRequest.java | 4 ++--
.../bucket/acl/TestOMBucketRemoveAclRequest.java | 4 ++--
.../bucket/acl/TestOMBucketSetAclRequest.java | 4 ++--
.../om/request/file/TestOMFileCreateRequest.java | 12 ++++++------
.../om/request/key/TestOMAllocateBlockRequest.java | 9 +++++----
.../ozone/om/request/key/TestOMKeyAclRequest.java | 8 ++++----
.../om/request/key/TestOMKeyCommitRequest.java | 3 ++-
.../om/request/key/TestOMKeyCreateRequest.java | 14 +++++++-------
.../om/request/key/TestOMKeyRenameRequest.java | 6 +++---
.../request/key/TestOMKeyRenameRequestWithFSO.java | 6 +++---
.../TestS3InitiateMultipartUploadRequest.java | 4 ++--
.../s3/multipart/TestS3MultipartRequest.java | 9 +++++----
...stS3MultipartUploadCommitPartRequestWithFSO.java | 5 +++--
.../TestS3MultipartUploadCompleteRequest.java | 3 ++-
.../request/s3/security/TestS3GetSecretRequest.java | 19 +++++++++----------
.../tenant/TestSetRangerServiceVersionRequest.java | 4 ++--
.../snapshot/TestOMSnapshotDeleteRequest.java | 3 ++-
.../request/validation/TestValidatorRegistry.java | 18 ++++++++----------
.../request/volume/TestOMVolumeCreateRequest.java | 4 ++--
.../request/volume/TestOMVolumeSetOwnerRequest.java | 3 ++-
.../request/volume/TestOMVolumeSetQuotaRequest.java | 17 ++++++++---------
.../volume/acl/TestOMVolumeAddAclRequest.java | 4 ++--
.../volume/acl/TestOMVolumeRemoveAclRequest.java | 4 ++--
.../volume/acl/TestOMVolumeSetAclRequest.java | 14 ++++++++------
.../om/response/key/TestOMKeyCommitResponse.java | 3 ++-
.../om/response/key/TestOMKeyDeleteResponse.java | 3 ++-
...tS3MultipartUploadCommitPartResponseWithFSO.java | 4 ++--
.../snapshot/TestOMSnapshotCreateResponse.java | 4 ++--
.../om/service/TestDirectoryDeletingService.java | 3 ++-
.../ozone/om/service/TestKeyDeletingService.java | 12 ++++++------
.../service/TestMultipartUploadCleanupService.java | 5 +++--
.../ozone/om/service/TestOpenKeyCleanupService.java | 5 ++---
.../hadoop/ozone/om/snapshot/TestSnapshotCache.java | 3 ++-
.../ozone/om/snapshot/TestSnapshotDiffManager.java | 19 ++++++++++---------
.../ozone/om/upgrade/TestOMLayoutFeatureAspect.java | 10 +++++-----
.../ozone/om/upgrade/TestOMVersionManager.java | 7 ++++---
.../TestOzoneDelegationTokenSecretManager.java | 5 +++--
.../security/acl/TestOzoneNativeAuthorizer.java | 3 ++-
57 files changed, 230 insertions(+), 211 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestAuthorizerLockImpl.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestAuthorizerLockImpl.java
index dbf8b08ebe..b78864e301 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestAuthorizerLockImpl.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestAuthorizerLockImpl.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.ozone.om;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -68,9 +69,9 @@ public class TestAuthorizerLockImpl {
// Case 2: Read lock is reentrant; Write lock is exclusive
long readLockStamp1 = authorizerLock.tryReadLock(100);
- assertTrue(readLockStamp1 > 0L);
+ assertThat(readLockStamp1).isGreaterThan(0L);
long readLockStamp2 = authorizerLock.tryReadLock(100);
- assertTrue(readLockStamp2 > 0L);
+ assertThat(readLockStamp2).isGreaterThan(0L);
// Can't acquire write lock now, as read lock has been held
long writeLockStamp1 = authorizerLock.tryWriteLock(100);
@@ -85,7 +86,7 @@ public class TestAuthorizerLockImpl {
// Release the other read lock. And again. Should work
authorizerLock.unlockRead(readLockStamp1);
writeLockStamp1 = authorizerLock.tryWriteLock(100);
- assertTrue(writeLockStamp1 > 0L);
+ assertThat(writeLockStamp1).isGreaterThan(0L);
// But a second write lock won't work
long writeLockStamp2 = authorizerLock.tryWriteLock(100);
@@ -162,7 +163,7 @@ public class TestAuthorizerLockImpl {
// With only competing reads, an optimistic read should be valid.
long optStamp = authorizerLock.tryOptimisticReadThrowOnTimeout();
long readStamp = authorizerLock.tryReadLock(100);
- assertTrue(readStamp > 0L);
+ assertThat(readStamp).isGreaterThan(0L);
assertTrue(authorizerLock.validateOptimisticRead(optStamp));
authorizerLock.unlockRead(readStamp);
assertTrue(authorizerLock.validateOptimisticRead(optStamp));
@@ -178,7 +179,7 @@ public class TestAuthorizerLockImpl {
// stamp should be invalidated.
optStamp = authorizerLock.tryOptimisticReadThrowOnTimeout();
writeStamp = authorizerLock.tryWriteLockThrowOnTimeout();
- assertTrue(writeStamp > 0L);
+ assertThat(writeStamp).isGreaterThan(0L);
assertFalse(authorizerLock.validateOptimisticRead(optStamp));
authorizerLock.unlockWrite(writeStamp);
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestBucketManagerImpl.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestBucketManagerImpl.java
index 180f31ab9e..7919b013b1 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestBucketManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestBucketManagerImpl.java
@@ -52,6 +52,7 @@ import org.junit.jupiter.api.io.TempDir;
import org.mockito.junit.jupiter.MockitoExtension;
import static java.util.Collections.singletonMap;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -192,7 +193,7 @@ public class TestBucketManagerImpl {
BucketManager bucketManager = omTestManagers.getBucketManager();
bucketManager.getBucketInfo("sample-vol", "bucket-one");
});
- assertTrue(exception.getMessage().contains("Bucket not found"));
+ assertThat(exception.getMessage()).contains("Bucket not found");
assertEquals(ResultCodes.BUCKET_NOT_FOUND,
exception.getResult());
}
@@ -337,7 +338,7 @@ public class TestBucketManagerImpl {
});
assertEquals(ResultCodes.BUCKET_NOT_FOUND,
omEx.getResult());
- assertTrue(omEx.getMessage().contains("Bucket not found"));
+ assertThat(omEx.getMessage()).contains("Bucket not found");
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
index aad935c868..96b0c13891 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerUnit.java
@@ -84,10 +84,10 @@ import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static java.util.Comparator.comparing;
import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -515,9 +515,8 @@ public class TestKeyManagerUnit {
.getBlockID().getLocalID());
assertEquals(pipelineTwo.getId(),
newBlockLocation.getPipeline().getId());
- assertTrue(newBlockLocation.getPipeline().getNodes().contains(dnFour));
- assertTrue(newBlockLocation.getPipeline().getNodes().contains(dnFive));
- assertTrue(newBlockLocation.getPipeline().getNodes().contains(dnSix));
+ assertThat(newBlockLocation.getPipeline().getNodes())
+ .contains(dnFour, dnFive, dnSix);
}
private void insertKey(Pipeline pipeline, String volumeName,
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManager.java
index 58e52cdb82..adab44d43f 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManager.java
@@ -40,6 +40,7 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RANGER_HTTPS_ADMI
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_RANGER_HTTPS_ADDRESS_KEY;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_RANGER_SERVICE;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.FEATURE_NOT_ENABLED;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -119,7 +120,7 @@ public class TestOMMultiTenantManager {
OMMultiTenantManager.checkAndEnableMultiTenancy(ozoneManager, conf);
fail("Should have thrown RuntimeException");
} catch (RuntimeException e) {
- assertTrue(e.getMessage().contains("Failed to meet"));
+ assertThat(e.getMessage()).contains("Failed to meet");
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManagerImpl.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManagerImpl.java
index 210cb3839a..70c204c04c 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManagerImpl.java
@@ -22,6 +22,7 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_DB_DIRS;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_MULTITENANCY_RANGER_SYNC_INTERVAL;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_MULTITENANCY_RANGER_SYNC_INTERVAL_DEFAULT;
import static
org.apache.hadoop.ozone.om.OMMultiTenantManagerImpl.OZONE_OM_TENANT_DEV_SKIP_RANGER;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -141,8 +142,8 @@ public class TestOMMultiTenantManagerImpl {
() -> tenantManager.listUsersInTenant("tenant2", null));
assertEquals("Tenant 'tenant2' not found!", ioException.getMessage());
- assertTrue(tenantManager.listUsersInTenant(TENANT_ID, "abc")
- .getUserAccessIds().isEmpty());
+ assertThat(tenantManager.listUsersInTenant(TENANT_ID, "abc")
+ .getUserAccessIds()).isEmpty();
}
@Test
@@ -155,10 +156,10 @@ public class TestOMMultiTenantManagerImpl {
tenantManager.getCacheOp()
.revokeUserAccessId("seed-accessId1", TENANT_ID);
- assertTrue(tenantManager.getTenantCache().get(TENANT_ID)
- .getAccessIdInfoMap().isEmpty());
- assertTrue(tenantManager.listUsersInTenant(TENANT_ID, null)
- .getUserAccessIds().isEmpty());
+ assertThat(tenantManager.getTenantCache().get(TENANT_ID)
+ .getAccessIdInfoMap()).isEmpty();
+ assertThat(tenantManager.listUsersInTenant(TENANT_ID, null)
+ .getUserAccessIds()).isEmpty();
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
index 14911a3241..e6debcdc23 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmMetadataManager.java
@@ -69,6 +69,7 @@ import static
org.apache.hadoop.ozone.OzoneConsts.TRANSACTION_INFO_KEY;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_DB_DIRS;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.BUCKET_NOT_FOUND;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.VOLUME_NOT_FOUND;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -645,7 +646,7 @@ public class TestOmMetadataManager {
numExpiredOpenKeys - 1, bucketLayout).getOpenKeyBuckets();
List<String> names = getOpenKeyNames(someExpiredKeys);
assertEquals(numExpiredOpenKeys - 1, names.size());
- assertTrue(expiredKeys.containsAll(names));
+ assertThat(expiredKeys).containsAll(names);
// Test attempting to retrieving more expired keys than actually exist.
Collection<OpenKeyBucket.Builder> allExpiredKeys =
@@ -653,7 +654,7 @@ public class TestOmMetadataManager {
numExpiredOpenKeys + 1, bucketLayout).getOpenKeyBuckets();
names = getOpenKeyNames(allExpiredKeys);
assertEquals(numExpiredOpenKeys, names.size());
- assertTrue(expiredKeys.containsAll(names));
+ assertThat(expiredKeys).containsAll(names);
// Test retrieving exact amount of expired keys that exist.
allExpiredKeys =
@@ -661,7 +662,7 @@ public class TestOmMetadataManager {
numExpiredOpenKeys, bucketLayout).getOpenKeyBuckets();
names = getOpenKeyNames(allExpiredKeys);
assertEquals(numExpiredOpenKeys, names.size());
- assertTrue(expiredKeys.containsAll(names));
+ assertThat(expiredKeys).containsAll(names);
}
private void testGetExpiredOpenKeysExcludeMPUKeys(
@@ -810,7 +811,7 @@ public class TestOmMetadataManager {
(numExpiredMPUs * numPartsPerMPU) - (numPartsPerMPU));
List<String> names = getMultipartKeyNames(someExpiredMPUs);
assertEquals(numExpiredMPUs - 1, names.size());
- assertTrue(expiredMPUs.containsAll(names));
+ assertThat(expiredMPUs).containsAll(names);
// Test retrieving fewer expire MPU parts than actually exist (round up).
someExpiredMPUs = omMetadataManager.getExpiredMultipartUploads(
@@ -818,7 +819,7 @@ public class TestOmMetadataManager {
(numExpiredMPUs * numPartsPerMPU) - (numPartsPerMPU + 1));
names = getMultipartKeyNames(someExpiredMPUs);
assertEquals(numExpiredMPUs - 1, names.size());
- assertTrue(expiredMPUs.containsAll(names));
+ assertThat(expiredMPUs).containsAll(names);
// Test attempting to retrieving more expire MPU parts than actually exist.
List<ExpiredMultipartUploadsBucket> allExpiredMPUs =
@@ -826,7 +827,7 @@ public class TestOmMetadataManager {
(numExpiredMPUs * numPartsPerMPU) + numPartsPerMPU);
names = getMultipartKeyNames(allExpiredMPUs);
assertEquals(numExpiredMPUs, names.size());
- assertTrue(expiredMPUs.containsAll(names));
+ assertThat(expiredMPUs).containsAll(names);
// Test retrieving exact amount of MPU parts than actually exist.
allExpiredMPUs =
@@ -834,7 +835,7 @@ public class TestOmMetadataManager {
(numExpiredMPUs * numPartsPerMPU));
names = getMultipartKeyNames(allExpiredMPUs);
assertEquals(numExpiredMPUs, names.size());
- assertTrue(expiredMPUs.containsAll(names));
+ assertThat(expiredMPUs).containsAll(names);
}
private List<String> getOpenKeyNames(
@@ -926,7 +927,7 @@ public class TestOmMetadataManager {
assertTrue(snapshotInfo.getName().startsWith(prefixA));
assertEquals(snapshotInfo, snapshotsASnapshotIDMap.get(
snapshotInfo.getName()));
- assertTrue(snapshotInfo.getName().compareTo(startSnapshot) > 0);
+
assertThat(snapshotInfo.getName().compareTo(startSnapshot)).isGreaterThan(0);
}
startSnapshot = null;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotManager.java
index cd21478da8..79e201b429 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshotManager.java
@@ -66,6 +66,7 @@ import static
org.apache.hadoop.ozone.om.OmSnapshotManager.OM_HARDLINK_FILE;
import static org.apache.hadoop.ozone.om.snapshot.OmSnapshotUtils.getINode;
import static org.apache.hadoop.ozone.om.OmSnapshotManager.getSnapshotPrefix;
import static
org.apache.hadoop.ozone.om.snapshot.OmSnapshotUtils.truncateFileName;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -633,16 +634,16 @@ public class TestOmSnapshotManager {
// Create first checkpoint for the snapshot checkpoint
OmSnapshotManager.createOmSnapshotCheckpoint(om.getMetadataManager(),
first);
- assertFalse(logCapturer.getOutput().contains(
- "for snapshot " + first.getName() + " already exists."));
+ assertThat(logCapturer.getOutput()).doesNotContain(
+ "for snapshot " + first.getName() + " already exists.");
logCapturer.clearOutput();
// Create checkpoint again for the same snapshot.
OmSnapshotManager.createOmSnapshotCheckpoint(om.getMetadataManager(),
first);
- assertTrue(logCapturer.getOutput().contains(
- "for snapshot " + first.getName() + " already exists."));
+ assertThat(logCapturer.getOutput()).contains(
+ "for snapshot " + first.getName() + " already exists.");
}
private SnapshotInfo createSnapshotInfo(String volumeName,
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneConfigUtil.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneConfigUtil.java
index cd312df06b..0bd99d4949 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneConfigUtil.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneConfigUtil.java
@@ -29,8 +29,8 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Arrays;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -125,8 +125,8 @@ public class TestOzoneConfigUtil {
OzoneConfiguration configuration = new OzoneConfiguration();
configuration.set(OzoneConfigKeys.OZONE_S3_ADMINISTRATORS, "alice,bob");
- assertTrue(OzoneConfigUtil.getS3AdminsFromConfig(configuration)
- .containsAll(Arrays.asList("alice", "bob")));
+ assertThat(OzoneConfigUtil.getS3AdminsFromConfig(configuration))
+ .containsAll(Arrays.asList("alice", "bob"));
}
@Test
@@ -134,8 +134,8 @@ public class TestOzoneConfigUtil {
OzoneConfiguration configuration = new OzoneConfiguration();
configuration.set(OzoneConfigKeys.OZONE_ADMINISTRATORS, "alice,bob");
- assertTrue(OzoneConfigUtil.getS3AdminsFromConfig(configuration)
- .containsAll(Arrays.asList("alice", "bob")));
+ assertThat(OzoneConfigUtil.getS3AdminsFromConfig(configuration))
+ .containsAll(Arrays.asList("alice", "bob"));
}
@Test
@@ -144,8 +144,8 @@ public class TestOzoneConfigUtil {
configuration.set(OzoneConfigKeys.OZONE_S3_ADMINISTRATORS_GROUPS,
"test1, test2");
- assertTrue(OzoneConfigUtil.getS3AdminsGroupsFromConfig(
- configuration).containsAll(Arrays.asList("test1", "test2")));
+ assertThat(OzoneConfigUtil.getS3AdminsGroupsFromConfig(configuration))
+ .containsAll(Arrays.asList("test1", "test2"));
}
@Test
@@ -154,7 +154,7 @@ public class TestOzoneConfigUtil {
configuration.set(OzoneConfigKeys.OZONE_ADMINISTRATORS_GROUPS,
"test1, test2");
- assertTrue(OzoneConfigUtil.getS3AdminsGroupsFromConfig(
- configuration).containsAll(Arrays.asList("test1", "test2")));
+ assertThat(OzoneConfigUtil.getS3AdminsGroupsFromConfig(configuration))
+ .containsAll(Arrays.asList("test1", "test2"));
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestSstFilteringService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestSstFilteringService.java
index 2009f7e5da..2277b6ce67 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestSstFilteringService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestSstFilteringService.java
@@ -64,6 +64,7 @@ import static
org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_SST_FILTERING_SERVICE_INTERVAL;
import static org.awaitility.Awaitility.with;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -178,7 +179,7 @@ public class TestSstFilteringService {
}
}
- assertTrue(nonLevel0FilesCountAfterCompact > 0);
+ assertThat(nonLevel0FilesCountAfterCompact).isGreaterThan(0);
String bucketName2 = "buck2";
createVolumeAndBucket(volumeName, bucketName2);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/failover/TestOMFailovers.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/failover/TestOMFailovers.java
index 75c27f70d5..157a77b1f9 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/failover/TestOMFailovers.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/failover/TestOMFailovers.java
@@ -38,11 +38,11 @@ import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import org.apache.hadoop.security.AccessControlException;
import org.apache.ozone.test.GenericTestUtils;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.slf4j.event.Level;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Tests OM failover protocols using a Mock Failover provider and a Mock OM
@@ -70,16 +70,16 @@ public class TestOMFailovers {
failoverProxyProvider.getRetryPolicy(
OzoneConfigKeys.OZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_DEFAULT));
- ServiceException serviceException =
Assertions.assertThrows(ServiceException.class,
+ ServiceException serviceException = assertThrows(ServiceException.class,
() -> proxy.submitRequest(null, null));
// Request should try all OMs one be one and fail when the last OM also
// throws AccessControlException.
assertThat(serviceException).hasCauseInstanceOf(AccessControlException.class)
.hasMessage("ServiceException of type class
org.apache.hadoop.security.AccessControlException for om3");
-
Assertions.assertTrue(logCapturer.getOutput().contains(getRetryProxyDebugMsg("om1")));
-
Assertions.assertTrue(logCapturer.getOutput().contains(getRetryProxyDebugMsg("om2")));
-
Assertions.assertTrue(logCapturer.getOutput().contains(getRetryProxyDebugMsg("om3")));
+ assertThat(logCapturer.getOutput()).contains(getRetryProxyDebugMsg("om1"));
+ assertThat(logCapturer.getOutput()).contains(getRetryProxyDebugMsg("om2"));
+ assertThat(logCapturer.getOutput()).contains(getRetryProxyDebugMsg("om3"));
}
private String getRetryProxyDebugMsg(String omNodeId) {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneLockProvider.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneLockProvider.java
index affb2bda7f..d01660b6c0 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneLockProvider.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/lock/TestOzoneLockProvider.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.Collection;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -83,13 +83,13 @@ public class TestOzoneLockProvider {
if (keyPathLockEnabled) {
if (bucketLayout == BucketLayout.OBJECT_STORE) {
- assertTrue(ozoneLockStrategy instanceof OBSKeyPathLockStrategy);
+ assertInstanceOf(OBSKeyPathLockStrategy.class, ozoneLockStrategy);
} else if (!enableFileSystemPaths &&
bucketLayout == BucketLayout.LEGACY) {
- assertTrue(ozoneLockStrategy instanceof OBSKeyPathLockStrategy);
+ assertInstanceOf(OBSKeyPathLockStrategy.class, ozoneLockStrategy);
}
} else {
- assertTrue(ozoneLockStrategy instanceof RegularBucketLockStrategy);
+ assertInstanceOf(RegularBucketLockStrategy.class, ozoneLockStrategy);
}
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantAccessController.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantAccessController.java
index 2b88a0c874..966ef4e985 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantAccessController.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/multitenant/TestMultiTenantAccessController.java
@@ -44,6 +44,7 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_KERBEROS_PRINCIPA
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_RANGER_HTTPS_ADDRESS_KEY;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_RANGER_SERVICE;
import static
org.apache.hadoop.ozone.om.OMMultiTenantManager.OZONE_TENANT_RANGER_ROLE_DESCRIPTION;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -249,14 +250,14 @@ public class TestMultiTenantAccessController {
List<Policy> retrievedLabeledPolicies =
controller.getLabeledPolicies(label);
assertEquals(labeledPolicies.size(), retrievedLabeledPolicies.size());
- assertTrue(retrievedLabeledPolicies.containsAll(labeledPolicies));
+ assertThat(retrievedLabeledPolicies).containsAll(labeledPolicies);
// Get of a specific policy should also succeed.
Policy retrievedPolicy = controller.getPolicy(unlabeledPolicy.getName());
assertEquals(unlabeledPolicy, retrievedPolicy);
// Get of policies with nonexistent label should give an empty list.
- assertTrue(controller.getLabeledPolicies(label + "1").isEmpty());
+ assertThat(controller.getLabeledPolicies(label + "1")).isEmpty();
// Cleanup
for (Policy policy: labeledPolicies) {
@@ -322,7 +323,7 @@ public class TestMultiTenantAccessController {
// get one of the roles to check it is there but empty.
Role retrievedRole = controller.getRole(roleName);
assertFalse(retrievedRole.getDescription().isPresent());
- assertTrue(retrievedRole.getUsersMap().isEmpty());
+ assertThat(retrievedRole.getUsersMap()).isEmpty();
assertTrue(retrievedRole.getId().isPresent());
// Add a user to the role.
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
index dba2109860..729eca6f47 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBuffer.java
@@ -60,6 +60,7 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import static
org.apache.hadoop.security.authentication.util.KerberosName.DEFAULT_MECHANISM;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -303,7 +304,7 @@ class TestOzoneManagerDoubleBuffer {
await.get();
// Make sure notify was called at least twice.
- assertTrue(notifyCounter.get() >= 2);
+ assertThat(notifyCounter.get()).isGreaterThanOrEqualTo(2);
assertFalse(flusher.isDone());
// Confirm still empty.
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
index 19a4647847..bdff3c0467 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithDummyResponse.java
@@ -49,10 +49,10 @@ import org.apache.hadoop.hdds.utils.db.BatchOperation;
import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
import static org.apache.hadoop.ozone.OzoneConsts.TRANSACTION_INFO_KEY;
import static org.apache.hadoop.ozone.om.OmMetadataManagerImpl.BUCKET_TABLE;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.apache.ozone.test.GenericTestUtils.waitFor;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* This class tests OzoneManagerDoubleBuffer implementation with
@@ -117,16 +117,16 @@ public class
TestOzoneManagerDoubleBufferWithDummyResponse {
waitFor(() -> metrics.getTotalNumOfFlushedTransactions() == bucketCount,
100, 60000);
- assertTrue(metrics.getTotalNumOfFlushOperations() > 0);
+ assertThat(metrics.getTotalNumOfFlushOperations()).isGreaterThan(0);
assertEquals(bucketCount, doubleBuffer.getFlushedTransactionCount());
- assertTrue(metrics.getMaxNumberOfTransactionsFlushedInOneIteration() > 0);
+
assertThat(metrics.getMaxNumberOfTransactionsFlushedInOneIteration()).isGreaterThan(0);
assertEquals(bucketCount, omMetadataManager.countRowsInTable(
omMetadataManager.getBucketTable()));
- assertTrue(doubleBuffer.getFlushIterations() > 0);
- assertTrue(metrics.getFlushTime().lastStat().numSamples() > 0);
- assertTrue(metrics.getAvgFlushTransactionsInOneIteration() > 0);
+ assertThat(doubleBuffer.getFlushIterations()).isGreaterThan(0);
+
assertThat(metrics.getFlushTime().lastStat().numSamples()).isGreaterThan(0);
+
assertThat(metrics.getAvgFlushTransactionsInOneIteration()).isGreaterThan(0);
assertEquals(bucketCount, (long)
metrics.getQueueSize().lastStat().total());
- assertTrue(metrics.getQueueSize().lastStat().numSamples() > 0);
+
assertThat(metrics.getQueueSize().lastStat().numSamples()).isGreaterThan(0);
// Assert there is only instance of OM Double Metrics.
OzoneManagerDoubleBufferMetrics metricsCopy =
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
index a9f2af8352..2d58088e25 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerDoubleBufferWithOMResponse.java
@@ -63,10 +63,10 @@ import org.apache.hadoop.util.Daemon;
import static org.apache.hadoop.ozone.OzoneConsts.TRANSACTION_INFO_KEY;
import static
org.apache.hadoop.ozone.om.request.OMRequestTestUtils.newBucketInfoBuilder;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
@@ -275,9 +275,7 @@ public class TestOzoneManagerDoubleBufferWithOMResponse {
// running in parallel, so lastAppliedIndex cannot be always
// total transaction count. So, just checking here whether it is less
// than total transaction count.
- assertTrue(lastAppliedIndex <= bucketCount + deleteCount + 2);
-
-
+ assertThat(lastAppliedIndex).isLessThanOrEqualTo(bucketCount + deleteCount
+ 2);
}
/**
@@ -413,7 +411,7 @@ public class TestOzoneManagerDoubleBufferWithOMResponse {
assertRowCount(expectedBuckets, omMetadataManager.getBucketTable()),
300, volumeCount * 300);
- assertTrue(doubleBuffer.getFlushIterations() > 0);
+ assertThat(doubleBuffer.getFlushIterations()).isGreaterThan(0);
}
private boolean assertRowCount(int expected, Table<String, ?> table) {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
index 7ef5349c22..c2f2feae62 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java
@@ -59,8 +59,8 @@ import org.slf4j.LoggerFactory;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.ozone.OzoneConsts.TRANSACTION_INFO_KEY;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -197,10 +197,9 @@ public class TestOzoneManagerRatisServer {
.setClientId(clientId)
.build();
OmUtils.isReadOnly(request);
- assertFalse(
- logCapturer.getOutput().contains("CmdType " + cmdtype + " is not " +
- "categorized as readOnly or not."),
- cmdtype + " is not categorized in OmUtils#isReadyOnly");
+ assertThat(logCapturer.getOutput())
+ .withFailMessage(cmdtype + " is not categorized in
OmUtils#isReadyOnly")
+ .doesNotContain("CmdType " + cmdtype + " is not categorized as
readOnly or not.");
logCapturer.clearOutput();
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java
index 102eaa08d8..bb9e4ee9b9 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java
@@ -47,8 +47,8 @@ import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
@@ -300,7 +300,7 @@ public class TestOzoneManagerStateMachine {
assertFalse(smEx.leaderShouldStepDown());
Throwable cause = smEx.getCause();
- assertTrue(cause instanceof OMException);
+ assertInstanceOf(OMException.class, cause);
assertEquals(((OMException) cause).getResult(),
OMException.ResultCodes.NOT_SUPPORTED_OPERATION_WHEN_PREPARED);
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestNormalizePaths.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestNormalizePaths.java
index b346b0aa65..ae421470af 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestNormalizePaths.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestNormalizePaths.java
@@ -23,8 +23,8 @@ import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.junit.jupiter.api.Test;
import static
org.apache.hadoop.ozone.om.request.OMClientRequest.validateAndNormalizeKey;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
/**
@@ -79,7 +79,7 @@ public class TestNormalizePaths {
validateAndNormalizeKey(true, keyName);
fail("checkInvalidPath failed for path " + keyName);
} catch (OMException ex) {
- assertTrue(ex.getMessage().contains("Invalid KeyPath"));
+ assertThat(ex.getMessage()).contains("Invalid KeyPath");
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java
index 325d4f3483..d68825c6aa 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java
@@ -46,6 +46,7 @@ import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
import static org.apache.hadoop.hdds.client.ReplicationType.EC;
import static org.apache.hadoop.ozone.OzoneConsts.GB;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -79,7 +80,7 @@ public class TestOMBucketSetPropertyRequest extends
TestBucketRequest {
.getModificationTime();
long newModTime = preExecuteRequest.getSetBucketPropertyRequest()
.getModificationTime();
- assertTrue(newModTime > originModTime);
+ assertThat(newModTime).isGreaterThan(originModTime);
// As user info gets added.
assertNotEquals(omRequest,
omBucketSetPropertyRequest.preExecute(ozoneManager));
@@ -201,15 +202,15 @@ public class TestOMBucketSetPropertyRequest extends
TestBucketRequest {
.validateAndUpdateCache(ozoneManager, 1);
//capture the error log
- assertTrue(logs.getOutput().contains(
- "Setting bucket property failed for bucket"));
+ assertThat(logs.getOutput()).contains(
+ "Setting bucket property failed for bucket");
assertFalse(omClientResponse.getOMResponse().getSuccess());
assertEquals(omClientResponse.getOMResponse().getStatus(),
OzoneManagerProtocolProtos.Status.QUOTA_EXCEEDED);
- assertTrue(omClientResponse.getOMResponse().getMessage().
+ assertThat(omClientResponse.getOMResponse().getMessage()).
contains("Total buckets quota in this volume " +
- "should not be greater than volume quota"));
+ "should not be greater than volume quota");
}
@Test
@@ -243,7 +244,7 @@ public class TestOMBucketSetPropertyRequest extends
TestBucketRequest {
OzoneManagerProtocolProtos.Status.NOT_SUPPORTED_OPERATION,
omClientResponse.getOMResponse().getStatus());
String message = omClientResponse.getOMResponse().getMessage();
- assertTrue(message.contains("Cannot set property on link"), message);
+ assertThat(message).contains("Cannot set property on link");
}
@Test
@@ -396,9 +397,9 @@ public class TestOMBucketSetPropertyRequest extends
TestBucketRequest {
assertFalse(omClientResponse.getOMResponse().getSuccess());
assertEquals(omClientResponse.getOMResponse().getStatus(),
OzoneManagerProtocolProtos.Status.QUOTA_ERROR);
- assertTrue(omClientResponse.getOMResponse().getMessage().
+ assertThat(omClientResponse.getOMResponse().getMessage()).
contains("Cannot update bucket quota. Requested spaceQuota less than "
+
- "used spaceQuota"));
+ "used spaceQuota");
}
@Test
@@ -428,9 +429,9 @@ public class TestOMBucketSetPropertyRequest extends
TestBucketRequest {
assertFalse(omClientResponse.getOMResponse().getSuccess());
assertEquals(omClientResponse.getOMResponse().getStatus(),
OzoneManagerProtocolProtos.Status.QUOTA_ERROR);
- assertTrue(omClientResponse.getOMResponse().getMessage().
+ assertThat(omClientResponse.getOMResponse().getMessage()).
contains("Cannot update bucket quota. NamespaceQuota requested " +
- "is less than used namespaceQuota"));
+ "is less than used namespaceQuota");
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketAddAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketAddAclRequest.java
index beff4fe898..6c781a4451 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketAddAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketAddAclRequest.java
@@ -18,10 +18,10 @@
package org.apache.hadoop.ozone.om.request.bucket.acl;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.om.request.bucket.TestBucketRequest;
@@ -60,7 +60,7 @@ public class TestOMBucketAddAclRequest extends
TestBucketRequest {
.getModificationTime();
// When preExecute() of adding acl,
// the new modification time is greater than origin one.
- assertTrue(newModTime > originModTime);
+ assertThat(newModTime).isGreaterThan(originModTime);
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketRemoveAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketRemoveAclRequest.java
index 10aff53330..c05f8598d9 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketRemoveAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketRemoveAclRequest.java
@@ -18,10 +18,10 @@
package org.apache.hadoop.ozone.om.request.bucket.acl;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.om.request.bucket.TestBucketRequest;
@@ -59,7 +59,7 @@ public class TestOMBucketRemoveAclRequest extends
TestBucketRequest {
.getModificationTime();
// When preExecute() of removing acl,
// the new modification time is greater than origin one.
- assertTrue(newModTime > originModTime);
+ assertThat(newModTime).isGreaterThan(originModTime);
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketSetAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketSetAclRequest.java
index 18f85e8933..b6ac39d127 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketSetAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/acl/TestOMBucketSetAclRequest.java
@@ -18,10 +18,10 @@
package org.apache.hadoop.ozone.om.request.bucket.acl;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import com.google.common.collect.Lists;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
@@ -61,7 +61,7 @@ public class TestOMBucketSetAclRequest extends
TestBucketRequest {
.getModificationTime();
// When preExecute() of setting acl,
// the new modification time is greater than origin one.
- assertTrue(newModTime > originModTime);
+ assertThat(newModTime).isGreaterThan(originModTime);
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequest.java
index 308a239b08..c7ed392226 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequest.java
@@ -49,8 +49,8 @@ import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.
import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.FILE_ALREADY_EXISTS;
import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.NOT_A_FILE;
import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.DIRECTORY_NOT_FOUND;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -76,11 +76,11 @@ public class TestOMFileCreateRequest extends
TestOMKeyRequest {
// Check clientID and modification time is set or not.
assertTrue(modifiedOmRequest.hasCreateFileRequest());
- assertTrue(modifiedOmRequest.getCreateFileRequest().getClientID() > 0);
+
assertThat(modifiedOmRequest.getCreateFileRequest().getClientID()).isGreaterThan(0);
KeyArgs keyArgs = modifiedOmRequest.getCreateFileRequest().getKeyArgs();
assertNotNull(keyArgs);
- assertTrue(keyArgs.getModificationTime() > 0);
+ assertThat(keyArgs.getModificationTime()).isGreaterThan(0);
// As our data size is 100, and scmBlockSize is default to 1000, so we
// shall have only one block.
@@ -115,7 +115,7 @@ public class TestOMFileCreateRequest extends
TestOMKeyRequest {
// When KeyName is root, nothing will be set.
assertTrue(modifiedOmRequest.hasCreateFileRequest());
- assertFalse(modifiedOmRequest.getCreateFileRequest().getClientID() > 0);
+
assertThat(modifiedOmRequest.getCreateFileRequest().getClientID()).isLessThanOrEqualTo(0);
KeyArgs keyArgs = modifiedOmRequest.getCreateFileRequest().getKeyArgs();
assertNotNull(keyArgs);
@@ -475,7 +475,7 @@ public class TestOMFileCreateRequest extends
TestOMKeyRequest {
.collect(Collectors.toList()), keyAcls,
"Failed to inherit bucket DEFAULT acls!");
// Should not inherit parent ACCESS acls
- assertFalse(keyAcls.contains(parentAccessAcl));
+ assertThat(keyAcls).doesNotContain(parentAccessAcl);
}
}
@@ -497,7 +497,7 @@ public class TestOMFileCreateRequest extends
TestOMKeyRequest {
OMException ex = assertThrows(OMException.class,
() -> omFileCreateRequest.preExecute(ozoneManager));
- assertTrue(ex.getMessage().contains(expectedErrorMessage));
+ assertThat(ex.getMessage()).contains(expectedErrorMessage);
}
protected void testNonRecursivePath(String key,
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
index bda96003cb..4ba406f659 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMAllocateBlockRequest.java
@@ -19,7 +19,7 @@
package org.apache.hadoop.ozone.om.request.key;
-
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -98,7 +98,8 @@ public class TestOMAllocateBlockRequest extends
TestOMKeyRequest {
// creationTime was assigned at OMRequestTestUtils.addKeyToTable
// modificationTime was assigned at
// doPreExecute(createAllocateBlockRequest())
- assertTrue(omKeyInfo.getCreationTime() <= omKeyInfo.getModificationTime());
+ assertThat(omKeyInfo.getCreationTime())
+ .isLessThanOrEqualTo(omKeyInfo.getModificationTime());
// Check data of the block
OzoneManagerProtocolProtos.KeyLocation keyLocation =
@@ -210,8 +211,8 @@ public class TestOMAllocateBlockRequest extends
TestOMKeyRequest {
AllocateBlockRequest allocateBlockRequest =
modifiedOmRequest.getAllocateBlockRequest();
// Time should be set
- assertTrue(allocateBlockRequest.getKeyArgs()
- .getModificationTime() > 0);
+ assertThat(allocateBlockRequest.getKeyArgs().getModificationTime())
+ .isGreaterThan(0);
// KeyLocation should be set.
assertTrue(allocateBlockRequest.hasKeyLocation());
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequest.java
index 7fd07942d0..c9559ff41e 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequest.java
@@ -17,9 +17,9 @@
*/
package org.apache.hadoop.ozone.om.request.key;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import java.util.UUID;
import org.apache.hadoop.ozone.OzoneAcl;
@@ -72,7 +72,7 @@ public class TestOMKeyAclRequest extends TestOMKeyRequest {
.getModificationTime();
long newModTime = preExecuteRequest.getAddAclRequest()
.getModificationTime();
- assertTrue(newModTime > originModTime);
+ assertThat(newModTime).isGreaterThan(originModTime);
// Execute original request
OMClientResponse omClientResponse = omKeyAddAclRequest
@@ -128,7 +128,7 @@ public class TestOMKeyAclRequest extends TestOMKeyRequest {
.getModificationTime();
long newModTime = preExecuteRequest.getRemoveAclRequest()
.getModificationTime();
- assertTrue(newModTime > originModTime);
+ assertThat(newModTime).isGreaterThan(originModTime);
OMClientResponse omClientRemoveAclResponse = omKeyRemoveAclRequest
.validateAndUpdateCache(ozoneManager, 100L);
@@ -169,7 +169,7 @@ public class TestOMKeyAclRequest extends TestOMKeyRequest {
.getModificationTime();
long newModTime = preExecuteRequest.getSetAclRequest()
.getModificationTime();
- assertTrue(newModTime > originModTime);
+ assertThat(newModTime).isGreaterThan(originModTime);
OMClientResponse omClientResponse = omKeySetAclRequest
.validateAndUpdateCache(ozoneManager, 100L);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
index 4b5c106a70..f71ddbf9b8 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequest.java
@@ -54,6 +54,7 @@ import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.OMRequest;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -650,7 +651,7 @@ public class TestOMKeyCommitRequest extends
TestOMKeyRequest {
private void verifyKeyArgs(KeyArgs originalKeyArgs, KeyArgs modifiedKeyArgs)
{
// Check modification time is set or not.
- assertTrue(modifiedKeyArgs.getModificationTime() > 0);
+ assertThat(modifiedKeyArgs.getModificationTime()).isGreaterThan(0);
assertEquals(0, originalKeyArgs.getModificationTime());
assertEquals(originalKeyArgs.getVolumeName(),
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequest.java
index 0c7d4ebde5..b765e90281 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCreateRequest.java
@@ -67,8 +67,9 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM
import static
org.apache.hadoop.ozone.om.request.OMRequestTestUtils.addVolumeAndBucketToDB;
import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.NOT_A_FILE;
import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.OK;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -494,12 +495,12 @@ public class TestOMKeyCreateRequest extends
TestOMKeyRequest {
(keyArgs.getDataSize() - 1) / (blockSize * dataGroupSize) + 1);
// Time should be set
- assertTrue(keyArgs.getModificationTime() > 0);
+ assertThat(keyArgs.getModificationTime()).isGreaterThan(0);
// Client ID should be set.
assertTrue(createKeyRequest.hasClientID());
- assertTrue(createKeyRequest.getClientID() > 0);
+ assertThat(createKeyRequest.getClientID()).isGreaterThan(0);
if (!originalOMRequest.getCreateKeyRequest().getKeyArgs()
@@ -716,7 +717,7 @@ public class TestOMKeyCreateRequest extends
TestOMKeyRequest {
OMException ex = assertThrows(OMException.class,
() -> getOMKeyCreateRequest(omRequest).preExecute(ozoneManager)
);
- assertTrue(ex.getMessage().contains(expectedErrorMessage));
+ assertThat(ex.getMessage()).contains(expectedErrorMessage);
}
}
@@ -789,7 +790,7 @@ public class TestOMKeyCreateRequest extends
TestOMKeyRequest {
"Failed to inherit parent DEFAULT acls!,");
// Should not inherit parent ACCESS Acls
- assertFalse(keyAcls.contains(parentAccessAcl));
+ assertThat(keyAcls).doesNotContain(parentAccessAcl);
}
protected void addToKeyTable(String keyName) throws Exception {
@@ -806,8 +807,7 @@ public class TestOMKeyCreateRequest extends
TestOMKeyRequest {
omKeyCreateRequest.preExecute(ozoneManager);
fail("checkNotAValidPath failed for path" + keyName);
} catch (IOException ex) {
- assertTrue(ex instanceof OMException);
- OMException omException = (OMException) ex;
+ OMException omException = assertInstanceOf(OMException.class, ex);
assertEquals(OMException.ResultCodes.INVALID_KEY_NAME,
omException.getResult());
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequest.java
index 359697980e..2056913bff 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequest.java
@@ -18,11 +18,11 @@
package org.apache.hadoop.ozone.om.request.key;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.UUID;
@@ -213,8 +213,8 @@ public class TestOMKeyRenameRequest extends
TestOMKeyRequest {
// set in KeyArgs.
assertNotEquals(originalOmRequest, modifiedOmRequest);
- assertTrue(modifiedOmRequest.getRenameKeyRequest()
- .getKeyArgs().getModificationTime() > 0);
+ assertThat(modifiedOmRequest.getRenameKeyRequest()
+ .getKeyArgs().getModificationTime()).isGreaterThan(0);
return modifiedOmRequest;
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequestWithFSO.java
index 603fc245a5..a1d7c83efd 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyRenameRequestWithFSO.java
@@ -18,10 +18,10 @@
package org.apache.hadoop.ozone.om.request.key;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.OmUtils;
@@ -171,8 +171,8 @@ public class TestOMKeyRenameRequestWithFSO extends
TestOMKeyRenameRequest {
// set in KeyArgs.
assertNotEquals(originalOmRequest, modifiedOmRequest);
- assertTrue(modifiedOmRequest.getRenameKeyRequest()
- .getKeyArgs().getModificationTime() > 0);
+ assertThat(modifiedOmRequest.getRenameKeyRequest()
+ .getKeyArgs().getModificationTime()).isGreaterThan(0);
return modifiedOmRequest;
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequest.java
index bf7e109609..40b0c23e5a 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3InitiateMultipartUploadRequest.java
@@ -19,8 +19,8 @@
package org.apache.hadoop.ozone.om.request.s3.multipart;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -238,7 +238,7 @@ public class TestS3InitiateMultipartUploadRequest
"Failed to inherit parent DEFAULT acls!");
// Should not inherit parent ACCESS Acls
- assertFalse(keyAcls.contains(parentAccessAcl));
+ assertThat(keyAcls).doesNotContain(parentAccessAcl);
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java
index 9c1ab508e4..d6ad7d189f 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartRequest.java
@@ -51,6 +51,7 @@ import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Part;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -144,8 +145,8 @@ public class TestS3MultipartRequest {
assertTrue(modifiedRequest.hasInitiateMultiPartUploadRequest());
assertNotNull(modifiedRequest.getInitiateMultiPartUploadRequest()
.getKeyArgs().getMultipartUploadID());
- assertTrue(modifiedRequest.getInitiateMultiPartUploadRequest()
- .getKeyArgs().getModificationTime() > 0);
+ assertThat(modifiedRequest.getInitiateMultiPartUploadRequest()
+ .getKeyArgs().getModificationTime()).isGreaterThan(0);
return modifiedRequest;
}
@@ -263,8 +264,8 @@ public class TestS3MultipartRequest {
assertTrue(modifiedRequest.hasInitiateMultiPartUploadRequest());
assertNotNull(modifiedRequest.getInitiateMultiPartUploadRequest()
.getKeyArgs().getMultipartUploadID());
- assertTrue(modifiedRequest.getInitiateMultiPartUploadRequest()
- .getKeyArgs().getModificationTime() > 0);
+ assertThat(modifiedRequest.getInitiateMultiPartUploadRequest()
+ .getKeyArgs().getModificationTime()).isGreaterThan(0);
return modifiedRequest;
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequestWithFSO.java
index dd9c56e310..4c8e4881d9 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCommitPartRequestWithFSO.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.ozone.om.request.s3.multipart;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -116,8 +117,8 @@ public class TestS3MultipartUploadCommitPartRequestWithFSO
assertTrue(modifiedRequest.hasInitiateMultiPartUploadRequest());
assertNotNull(modifiedRequest.getInitiateMultiPartUploadRequest()
.getKeyArgs().getMultipartUploadID());
- assertTrue(modifiedRequest.getInitiateMultiPartUploadRequest()
- .getKeyArgs().getModificationTime() > 0);
+ assertThat(modifiedRequest.getInitiateMultiPartUploadRequest()
+ .getKeyArgs().getModificationTime()).isGreaterThan(0);
return modifiedRequest;
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
index 8f858d359c..733c790bcf 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/multipart/TestS3MultipartUploadCompleteRequest.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.s3.multipart;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -95,7 +96,7 @@ public class TestS3MultipartUploadCompleteRequest
return;
}
- assertTrue(rangeKVs.size() >= 1);
+ assertThat(rangeKVs.size()).isGreaterThanOrEqualTo(1);
// Count must consider unused parts on commit
assertEquals(count,
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
index b57c6a247c..04b1524287 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/security/TestS3GetSecretRequest.java
@@ -73,6 +73,7 @@ import com.google.common.base.Optional;
import static
org.apache.hadoop.security.authentication.util.KerberosName.DEFAULT_MECHANISM;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -282,9 +283,8 @@ public class TestS3GetSecretRequest {
ozoneManager, 2);
// Verify that the revoke operation was successful.
- assertTrue(omRevokeResponse instanceof S3RevokeSecretResponse);
S3RevokeSecretResponse s3RevokeSecretResponse =
- (S3RevokeSecretResponse) omRevokeResponse;
+ assertInstanceOf(S3RevokeSecretResponse.class, omRevokeResponse);
assertEquals(OzoneManagerProtocolProtos.Status.OK.getNumber(),
s3RevokeSecretResponse.getOMResponse().getStatus().getNumber());
@@ -301,7 +301,7 @@ public class TestS3GetSecretRequest {
OMClientResponse omClientResponse =
s3GetSecretRequest.validateAndUpdateCache(ozoneManager, 3);
- assertTrue(omClientResponse instanceof S3GetSecretResponse);
+ assertInstanceOf(S3GetSecretResponse.class, omClientResponse);
S3GetSecretResponse s3GetSecretResponse =
(S3GetSecretResponse) omClientResponse;
@@ -387,7 +387,7 @@ public class TestS3GetSecretRequest {
OMClientResponse omClientResponse1 =
s3GetSecretRequest.validateAndUpdateCache(ozoneManager, 1);
// Check response type and cast
- assertTrue(omClientResponse1 instanceof S3GetSecretResponse);
+ assertInstanceOf(S3GetSecretResponse.class, omClientResponse1);
final S3GetSecretResponse s3GetSecretResponse1 =
(S3GetSecretResponse) omClientResponse1;
// Secret is returned the first time
@@ -407,7 +407,7 @@ public class TestS3GetSecretRequest {
OMClientResponse omClientResponse2 =
s3GetSecretRequest.validateAndUpdateCache(ozoneManager, 2);
// Check response type and cast
- assertTrue(omClientResponse2 instanceof S3GetSecretResponse);
+ assertInstanceOf(S3GetSecretResponse.class, omClientResponse2);
final S3GetSecretResponse s3GetSecretResponse2 =
(S3GetSecretResponse) omClientResponse2;
// no secret is returned as it is the second time
@@ -441,7 +441,7 @@ public class TestS3GetSecretRequest {
OMClientResponse omClientResponse =
omTenantCreateRequest.validateAndUpdateCache(ozoneManager, txLogIndex);
// Check response type and cast
- assertTrue(omClientResponse instanceof OMTenantCreateResponse);
+ assertInstanceOf(OMTenantCreateResponse.class, omClientResponse);
final OMTenantCreateResponse omTenantCreateResponse =
(OMTenantCreateResponse) omClientResponse;
// Check response
@@ -472,8 +472,7 @@ public class TestS3GetSecretRequest {
omTenantAssignUserAccessIdRequest.validateAndUpdateCache(ozoneManager,
txLogIndex);
// Check response type and cast
- assertTrue(
- omClientResponse instanceof OMTenantAssignUserAccessIdResponse);
+ assertInstanceOf(OMTenantAssignUserAccessIdResponse.class,
omClientResponse);
final OMTenantAssignUserAccessIdResponse
omTenantAssignUserAccessIdResponse =
(OMTenantAssignUserAccessIdResponse) omClientResponse;
@@ -507,7 +506,7 @@ public class TestS3GetSecretRequest {
s3GetSecretRequest.validateAndUpdateCache(ozoneManager, txLogIndex);
// Check response type and cast
- assertTrue(omClientResponse instanceof S3GetSecretResponse);
+ assertInstanceOf(S3GetSecretResponse.class, omClientResponse);
final S3GetSecretResponse s3GetSecretResponse =
(S3GetSecretResponse) omClientResponse;
@@ -539,7 +538,7 @@ public class TestS3GetSecretRequest {
s3GetSecretRequest.validateAndUpdateCache(ozoneManager, txLogIndex);
// Check response type and cast
- assertTrue(omClientResponse instanceof S3GetSecretResponse);
+ assertInstanceOf(S3GetSecretResponse.class, omClientResponse);
final S3GetSecretResponse s3GetSecretResponse =
(S3GetSecretResponse) omClientResponse;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tenant/TestSetRangerServiceVersionRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tenant/TestSetRangerServiceVersionRequest.java
index 0692b7bb1f..a6b87b1735 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tenant/TestSetRangerServiceVersionRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/s3/tenant/TestSetRangerServiceVersionRequest.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.ozone.om.request.s3.tenant;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.mockito.Mockito.framework;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -97,7 +97,7 @@ public class TestSetRangerServiceVersionRequest {
ozoneManager, txLogIndex);
// Check response type and cast
- assertTrue(clientResponse instanceof OMSetRangerServiceVersionResponse);
+ assertInstanceOf(OMSetRangerServiceVersionResponse.class, clientResponse);
final OMSetRangerServiceVersionResponse omSetRangerServiceVersionResponse =
(OMSetRangerServiceVersionResponse) clientResponse;
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotDeleteRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotDeleteRequest.java
index fe243664db..968c14d453 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotDeleteRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/snapshot/TestOMSnapshotDeleteRequest.java
@@ -55,6 +55,7 @@ import static
org.apache.hadoop.ozone.om.request.OMRequestTestUtils.createSnapsh
import static
org.apache.hadoop.ozone.om.request.OMRequestTestUtils.deleteSnapshotRequest;
import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status.OK;
import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type.DeleteSnapshot;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -287,7 +288,7 @@ public class TestOMSnapshotDeleteRequest {
// but marked as DELETED.
assertNotNull(snapshotInfo);
assertEquals(SNAPSHOT_DELETED, snapshotInfo.getSnapshotStatus());
- assertTrue(snapshotInfo.getDeletionTime() > 0L);
+ assertThat(snapshotInfo.getDeletionTime()).isGreaterThan(0L);
assertEquals(0, omMetrics.getNumSnapshotActive());
// Now delete snapshot entry again, expect error.
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/validation/TestValidatorRegistry.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/validation/TestValidatorRegistry.java
index 7ecc3ed67d..076ba01872 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/validation/TestValidatorRegistry.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/validation/TestValidatorRegistry.java
@@ -40,6 +40,7 @@ import static
org.apache.hadoop.ozone.om.request.validation.testvalidatorset1.Ge
import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type.CreateDirectory;
import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type.CreateKey;
import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Type.CreateVolume;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -111,8 +112,8 @@ public class TestValidatorRegistry {
assertEquals(2, validators.size());
List<String> methodNames =
validators.stream().map(Method::getName).collect(Collectors.toList());
- assertTrue(methodNames.contains("oldClientPreProcessCreateKeyValidator"));
- assertTrue(methodNames.contains("oldClientPreProcessCreateKeyValidator2"));
+ assertThat(methodNames).contains("oldClientPreProcessCreateKeyValidator");
+ assertThat(methodNames).contains("oldClientPreProcessCreateKeyValidator2");
}
@Test
@@ -125,8 +126,8 @@ public class TestValidatorRegistry {
assertEquals(2, validators.size());
List<String> methodNames =
validators.stream().map(Method::getName).collect(Collectors.toList());
- assertTrue(methodNames.contains("oldClientPostProcessCreateKeyValidator"));
-
assertTrue(methodNames.contains("oldClientPostProcessCreateKeyValidator2"));
+ assertThat(methodNames).contains("oldClientPostProcessCreateKeyValidator");
+
assertThat(methodNames).contains("oldClientPostProcessCreateKeyValidator2");
}
@Test
@@ -174,12 +175,9 @@ public class TestValidatorRegistry {
assertEquals(3, validators.size());
List<String> methodNames =
validators.stream().map(Method::getName).collect(Collectors.toList());
- assertTrue(
- methodNames.contains("preFinalizePostProcessCreateKeyValidator"));
- assertTrue(
- methodNames.contains("oldClientPostProcessCreateKeyValidator"));
- assertTrue(
- methodNames.contains("oldClientPostProcessCreateKeyValidator2"));
+
assertThat(methodNames).contains("preFinalizePostProcessCreateKeyValidator");
+ assertThat(methodNames).contains("oldClientPostProcessCreateKeyValidator");
+
assertThat(methodNames).contains("oldClientPostProcessCreateKeyValidator2");
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java
index aab8bb49f9..7a71f61dd2 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeCreateRequest.java
@@ -34,11 +34,11 @@ import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.VolumeI
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
/**
@@ -79,7 +79,7 @@ public class TestOMVolumeCreateRequest extends
TestOMVolumeRequest {
try {
OMClientResponse omClientResponse =
omVolumeCreateRequest.validateAndUpdateCache(ozoneManager,
txLogIndex);
- assertTrue(omClientResponse instanceof OMVolumeCreateResponse);
+ assertInstanceOf(OMVolumeCreateResponse.class, omClientResponse);
OMVolumeCreateResponse response = (OMVolumeCreateResponse)
omClientResponse;
assertEquals(expectedObjId, response.getOmVolumeArgs().getObjectID());
assertEquals(txLogIndex, response.getOmVolumeArgs().getUpdateID());
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java
index a084b8fa5b..8b893d6d13 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetOwnerRequest.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.request.volume;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -106,7 +107,7 @@ public class TestOMVolumeSetOwnerRequest extends
TestOMVolumeRequest {
// millisecond - since there is no time-consuming operation between
// OMRequestTestUtils.addVolumeToDB (sets creationTime) and
// preExecute (sets modificationTime).
- assertTrue(modificationTime >= creationTime);
+ assertThat(modificationTime).isGreaterThanOrEqualTo(creationTime);
OzoneManagerStorageProtos.PersistedUserVolumeInfo newOwnerVolumeList =
omMetadataManager.getUserTable().get(newOwnerKey);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java
index d206886ab9..dc2413f824 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java
@@ -32,11 +32,11 @@ import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import static org.apache.hadoop.ozone.OzoneConsts.GB;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Tests set volume property request.
@@ -116,7 +116,7 @@ public class TestOMVolumeSetQuotaRequest extends
TestOMVolumeRequest {
// millisecond - since there is no time-consuming operation between
// OMRequestTestUtils.addVolumeToDB (sets creationTime) and
// preExecute (sets modificationTime).
- assertTrue(modificationTime >= creationTime);
+ assertThat(modificationTime).isGreaterThanOrEqualTo(creationTime);
}
@Test
@@ -194,15 +194,15 @@ public class TestOMVolumeSetQuotaRequest extends
TestOMVolumeRequest {
OMClientResponse omClientResponse = omVolumeSetQuotaRequest
.validateAndUpdateCache(ozoneManager, 1);
//capture the error log
- assertTrue(logs.getOutput().contains(
- "Changing volume quota failed for volume"));
+ assertThat(logs.getOutput()).contains(
+ "Changing volume quota failed for volume");
assertFalse(omClientResponse.getOMResponse().getSuccess());
assertEquals(omClientResponse.getOMResponse().getStatus(),
OzoneManagerProtocolProtos.Status.QUOTA_EXCEEDED);
- assertTrue(omClientResponse.getOMResponse().getMessage().
+ assertThat(omClientResponse.getOMResponse().getMessage()).
contains("Total buckets quota in this volume " +
- "should not be greater than volume quota"));
+ "should not be greater than volume quota");
}
@Test
@@ -279,8 +279,7 @@ public class TestOMVolumeSetQuotaRequest extends
TestOMVolumeRequest {
.validateAndUpdateCache(ozoneManager, 1);
assertEquals(omClientResponse.getOMResponse().getStatus(),
OzoneManagerProtocolProtos.Status.QUOTA_EXCEEDED);
- assertTrue(omClientResponse.getOMResponse().getMessage()
- .contains(
- "this volume should not be greater than volume namespace quota"));
+ assertThat(omClientResponse.getOMResponse().getMessage())
+ .contains("this volume should not be greater than volume namespace
quota");
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeAddAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeAddAclRequest.java
index f9a10f7a2b..3c4c2df7b5 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeAddAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeAddAclRequest.java
@@ -18,10 +18,10 @@
package org.apache.hadoop.ozone.om.request.volume.acl;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
@@ -60,7 +60,7 @@ public class TestOMVolumeAddAclRequest extends
TestOMVolumeRequest {
long newModTime = modifiedRequest.getAddAclRequest().getModificationTime();
// When preExecute() of adding acl,
// the new modification time is greater than origin one.
- assertTrue(newModTime > originModTime);
+ assertThat(newModTime).isGreaterThan(originModTime);
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeRemoveAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeRemoveAclRequest.java
index 7ea8a4c4a9..c9319f3686 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeRemoveAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeRemoveAclRequest.java
@@ -18,10 +18,10 @@
package org.apache.hadoop.ozone.om.request.volume.acl;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
@@ -60,7 +60,7 @@ public class TestOMVolumeRemoveAclRequest extends
TestOMVolumeRequest {
.getModificationTime();
// When preExecute() of removing acl,
// the new modification time is greater than origin one.
- assertTrue(newModTime > originModTime);
+ assertThat(newModTime).isGreaterThan(originModTime);
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeSetAclRequest.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeSetAclRequest.java
index 91c1db73fc..9a7df361ed 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeSetAclRequest.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/acl/TestOMVolumeSetAclRequest.java
@@ -18,10 +18,10 @@
package org.apache.hadoop.ozone.om.request.volume.acl;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import com.google.common.collect.Lists;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
@@ -61,7 +61,7 @@ public class TestOMVolumeSetAclRequest extends
TestOMVolumeRequest {
long newModTime = modifiedRequest.getSetAclRequest().getModificationTime();
// When preExecute() of setting acl,
// the new modification time is greater than origin one.
- assertTrue(newModTime > originModTime);
+ assertThat(newModTime).isGreaterThan(originModTime);
}
@Test
@@ -106,10 +106,12 @@ public class TestOMVolumeSetAclRequest extends
TestOMVolumeRequest {
// Acl is added to aclMapAfterSet
assertEquals(2, aclsAfterSet.size());
- assertTrue(aclsAfterSet.contains(userAccessAcl),
- "Access Acl should be set.");
- assertTrue(aclsAfterSet.contains(groupDefaultAcl),
- "Default Acl should be set.");
+ assertThat(aclsAfterSet)
+ .withFailMessage("Access Acl should be set.")
+ .contains(userAccessAcl);
+ assertThat(aclsAfterSet)
+ .withFailMessage("Default Acl should be set.")
+ .contains(groupDefaultAcl);
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
index 8b1c8398a6..b73ed607ec 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponse.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.response.key;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -126,7 +127,7 @@ public class TestOMKeyCommitResponse extends
TestOMKeyResponse {
List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= omMetadataManager.getDeletedTable().getRangeKVs(
null, 100, deletedKey);
- assertTrue(rangeKVs.size() > 0);
+ assertThat(rangeKVs.size()).isGreaterThan(0);
assertEquals(1, rangeKVs.get(0).getValue().getOmKeyInfoList().size());
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
index 59edbf5e86..4690b6f56f 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponse.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.ozone.om.response.key;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.hadoop.hdds.client.BlockID;
@@ -128,7 +129,7 @@ public class TestOMKeyDeleteResponse extends
TestOMKeyResponse {
null, 100, deletedKey);
// Key has blocks, it should not be in deletedKeyTable.
- assertTrue(rangeKVs.size() > 0);
+ assertThat(rangeKVs.size()).isGreaterThan(0);
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponseWithFSO.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponseWithFSO.java
index 848451cd97..8044e4b692 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponseWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/s3/multipart/TestS3MultipartUploadCommitPartResponseWithFSO.java
@@ -18,10 +18,10 @@
package org.apache.hadoop.ozone.om.response.s3.multipart;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
@@ -235,7 +235,7 @@ public class TestS3MultipartUploadCommitPartResponseWithFSO
List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= omMetadataManager.getDeletedTable().getRangeKVs(
null, 100, deletedKey);
- assertTrue(rangeKVs.size() > 0);
+ assertThat(rangeKVs.size()).isGreaterThan(0);
}
private String getKeyName() {
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/snapshot/TestOMSnapshotCreateResponse.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/snapshot/TestOMSnapshotCreateResponse.java
index f4ece2927a..7f74f3d17e 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/snapshot/TestOMSnapshotCreateResponse.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/snapshot/TestOMSnapshotCreateResponse.java
@@ -51,6 +51,7 @@ import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos
.OMResponse;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
+import static org.assertj.core.api.Assertions.assertThat;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE;
import static org.apache.hadoop.ozone.om.OmSnapshotManager.getSnapshotPath;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -271,8 +272,7 @@ public class TestOMSnapshotCreateResponse {
while (keyIter.hasNext()) {
Table.KeyValue<String, ?> entry = keyIter.next();
String dbKey = entry.getKey();
- assertTrue(expectedKeys.contains(dbKey),
- table.getName() + " should contain key");
+ assertThat(expectedKeys).contains(dbKey);
expectedKeys.remove(dbKey);
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingService.java
index d5c1dfb251..c8a3faae4c 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestDirectoryDeletingService.java
@@ -48,6 +48,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DIR_DELETING_SERVICE_INTERVAL;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -155,6 +156,6 @@ public class TestDirectoryDeletingService {
() -> dirDeletingService.getMovedFilesCount() >= 1000
&& dirDeletingService.getMovedFilesCount() < 2000,
500, 60000);
- assertTrue(dirDeletingService.getRunCount().get() >= 1);
+
assertThat(dirDeletingService.getRunCount().get()).isGreaterThanOrEqualTo(1);
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
index d02bde7375..df27bae1ba 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
@@ -80,6 +80,7 @@ import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL;
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SNAPSHOT_DELETING_SERVICE_INTERVAL;
import static org.apache.hadoop.ozone.om.OmSnapshotManager.getSnapshotPrefix;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -163,7 +164,7 @@ public class TestKeyDeletingService {
GenericTestUtils.waitFor(
() -> keyDeletingService.getDeletedKeyCount().get() >= keyCount,
1000, 10000);
- assertTrue(keyDeletingService.getRunCount().get() > 1);
+ assertThat(keyDeletingService.getRunCount().get()).isGreaterThan(1);
assertEquals(0, keyManager.getPendingDeletionKeys(
Integer.MAX_VALUE).getKeyBlocksList().size());
}
@@ -365,7 +366,7 @@ public class TestKeyDeletingService {
GenericTestUtils.waitFor(
() -> keyDeletingService.getDeletedKeyCount().get() >= 1,
1000, 10000);
- assertTrue(keyDeletingService.getRunCount().get() > 1);
+ assertThat(keyDeletingService.getRunCount().get()).isGreaterThan(1);
assertEquals(0, keyManager.getPendingDeletionKeys(
Integer.MAX_VALUE).getKeyBlocksList().size());
@@ -374,8 +375,7 @@ public class TestKeyDeletingService {
// blocks for deletion from the KeyDeletionService
ScmBlockLocationTestingClient scmBlockTestingClient =
(ScmBlockLocationTestingClient) omTestManagers.getScmBlockClient();
- assertTrue(
- scmBlockTestingClient.getNumberOfDeletedBlocks() >= 3);
+
assertThat(scmBlockTestingClient.getNumberOfDeletedBlocks()).isGreaterThanOrEqualTo(3);
}
private void createAndDeleteKeys(KeyManager keyManager, int keyCount,
@@ -444,7 +444,7 @@ public class TestKeyDeletingService {
GenericTestUtils.waitFor(
() -> keyDeletingService.getDeletedKeyCount().get() >= 1,
1000, 10000);
- assertTrue(keyDeletingService.getRunCount().get() > 1);
+ assertThat(keyDeletingService.getRunCount().get()).isGreaterThan(1);
assertEquals(0, keyManager
.getPendingDeletionKeys(Integer.MAX_VALUE).getKeyBlocksList().size());
@@ -461,7 +461,7 @@ public class TestKeyDeletingService {
List<? extends Table.KeyValue<String, RepeatedOmKeyInfo>> rangeKVs
= metadataManager.getDeletedTable().getRangeKVs(
null, 100, ozoneKey1);
- assertTrue(rangeKVs.size() > 0);
+ assertThat(rangeKVs.size()).isGreaterThan(0);
rangeKVs
= metadataManager.getDeletedTable().getRangeKVs(
null, 100, ozoneKey2);
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestMultipartUploadCleanupService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestMultipartUploadCleanupService.java
index b65cfd0484..272b7b72db 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestMultipartUploadCleanupService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestMultipartUploadCleanupService.java
@@ -60,6 +60,7 @@ import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_MPU_CLEANUP_SERVICE_INTERVAL;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_MPU_EXPIRE_THRESHOLD;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_MPU_PARTS_CLEANUP_LIMIT_PER_TASK;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -152,8 +153,8 @@ public class TestMultipartUploadCleanupService {
// wait for requests to complete
Thread.sleep(10 * SERVICE_INTERVAL.toMillis());
- assertTrue(multipartUploadCleanupService.getSubmittedMpuInfoCount() >=
- oldMpuInfoCount + numDEFKeys + numFSOKeys);
+ assertThat(multipartUploadCleanupService.getSubmittedMpuInfoCount())
+ .isGreaterThanOrEqualTo(oldMpuInfoCount + numDEFKeys + numFSOKeys);
assertTrue(keyManager.getExpiredMultipartUploads(EXPIRE_THRESHOLD,
10000).isEmpty());
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestOpenKeyCleanupService.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestOpenKeyCleanupService.java
index fad99837e2..2f4016d0e9 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestOpenKeyCleanupService.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestOpenKeyCleanupService.java
@@ -64,8 +64,8 @@ import java.util.concurrent.TimeUnit;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_OPEN_KEY_CLEANUP_SERVICE_INTERVAL;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_OPEN_KEY_EXPIRE_THRESHOLD;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
class TestOpenKeyCleanupService {
private OzoneManagerProtocol writeClient;
@@ -313,8 +313,7 @@ class TestOpenKeyCleanupService {
}
private static void assertAtLeast(long expectedMinimum, long actual) {
- assertTrue(actual >= expectedMinimum,
- () -> actual + " < " + expectedMinimum);
+ assertThat(actual).isGreaterThanOrEqualTo(expectedMinimum);
}
private void assertExpiredOpenKeys(boolean expectedToEmpty, boolean hsync,
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotCache.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotCache.java
index fa3ac86096..f8c9392977 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotCache.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotCache.java
@@ -36,6 +36,7 @@ import java.io.IOException;
import static
org.apache.hadoop.ozone.om.helpers.SnapshotInfo.SnapshotStatus.SNAPSHOT_ACTIVE;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -99,7 +100,7 @@ class TestSnapshotCache {
snapshotCache.get(dbKey1);
assertNotNull(omSnapshot);
assertNotNull(omSnapshot.get());
- assertTrue(omSnapshot.get() instanceof OmSnapshot);
+ assertInstanceOf(OmSnapshot.class, omSnapshot.get());
assertEquals(1, snapshotCache.size());
assertTrue(snapshotCache.isConsistent());
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
index e5db8e828e..54d0a116ef 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
@@ -155,6 +155,7 @@ import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.FA
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.IN_PROGRESS;
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.QUEUED;
import static
org.apache.hadoop.ozone.snapshot.SnapshotDiffResponse.JobStatus.REJECTED;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -715,8 +716,8 @@ public class TestSnapshotDiffManager {
Map.Entry<byte[], byte[]> v = oldObjectIdIter.next();
long objectId = codecRegistry.asObject(v.getKey(), Long.class);
assertEquals(0, objectId % 2);
- assertTrue(objectId >= 50);
- assertTrue(objectId < 100);
+ assertThat(objectId).isGreaterThanOrEqualTo(50);
+ assertThat(objectId).isLessThan(100);
oldObjectIdCnt += 1;
}
assertEquals(nativeLibraryLoaded ? 25 : 0, oldObjectIdCnt);
@@ -729,8 +730,8 @@ public class TestSnapshotDiffManager {
Map.Entry<byte[], byte[]> v = newObjectIdIter.next();
long objectId = codecRegistry.asObject(v.getKey(), Long.class);
assertEquals(0, objectId % 2);
- assertTrue(objectId >= 26);
- assertTrue(objectId < 50);
+ assertThat(objectId).isGreaterThanOrEqualTo(26);
+ assertThat(objectId).isLessThan(50);
newObjectIdCnt += 1;
}
assertEquals(12, newObjectIdCnt);
@@ -744,8 +745,8 @@ public class TestSnapshotDiffManager {
byte[] v = entry.getKey();
long objectId = codecRegistry.asObject(v, Long.class);
assertEquals(0, objectId % 2);
- assertTrue(objectId >= 26);
- assertTrue(objectId < (nativeLibraryLoaded ? 100 : 50));
+ assertThat(objectId).isGreaterThanOrEqualTo(26);
+ assertThat(objectId).isLessThan(nativeLibraryLoaded ? 100 : 50);
objectIdCnt += 1;
}
assertEquals(nativeLibraryLoaded ? 37 : 12, objectIdCnt);
@@ -1146,7 +1147,7 @@ public class TestSnapshotDiffManager {
// the response list should be empty.
List<SnapshotDiffJob> jobList = snapshotDiffManager
.getSnapshotDiffJobList(volumeName, bucketName, jobStatus, listAll);
- assertTrue(jobList.isEmpty());
+ assertThat(jobList).isEmpty();
SnapshotDiffManager spy = spy(snapshotDiffManager);
doNothing().when(spy).generateSnapshotDiffReport(eq(diffJobKey),
@@ -1174,9 +1175,9 @@ public class TestSnapshotDiffManager {
// there should be a response.
// Otherwise, response list should be empty.
if (containsJob) {
- assertTrue(jobList.contains(diffJob));
+ assertThat(jobList).contains(diffJob);
} else {
- assertTrue(jobList.isEmpty());
+ assertThat(jobList).isEmpty();
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMLayoutFeatureAspect.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMLayoutFeatureAspect.java
index b26c9ef3cb..90f0b558d1 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMLayoutFeatureAspect.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMLayoutFeatureAspect.java
@@ -19,8 +19,8 @@
package org.apache.hadoop.ozone.om.upgrade;
import static
org.apache.hadoop.ozone.om.upgrade.OMLayoutFeature.INITIAL_VERSION;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -75,8 +75,8 @@ public class TestOMLayoutFeatureAspect {
OMException omException = assertThrows(OMException.class,
() -> aspect.checkLayoutFeature(joinPoint));
- assertTrue(omException.getMessage()
- .contains("cannot be invoked before finalization"));
+ assertThat(omException.getMessage())
+ .contains("cannot be invoked before finalization");
}
@Test
@@ -97,7 +97,7 @@ public class TestOMLayoutFeatureAspect {
OMException omException = assertThrows(OMException.class,
() -> aspect.beforeRequestApplyTxn(joinPoint));
- assertTrue(omException.getMessage()
- .contains("cannot be invoked before finalization"));
+ assertThat(omException.getMessage())
+ .contains("cannot be invoked before finalization");
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMVersionManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMVersionManager.java
index a75368dfaf..b7c1e2d9ab 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMVersionManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/upgrade/TestOMVersionManager.java
@@ -24,6 +24,7 @@ import static
org.apache.hadoop.ozone.om.upgrade.OMLayoutVersionManager.OM_REQUE
import static
org.apache.hadoop.ozone.om.upgrade.OMLayoutVersionManager.OM_UPGRADE_CLASS_PACKAGE;
import static
org.apache.hadoop.ozone.om.upgrade.OMLayoutVersionManager.getRequestClasses;
import static
org.apache.hadoop.ozone.upgrade.LayoutFeature.UpgradeActionType.VALIDATE_IN_PREFINALIZE;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -62,8 +63,8 @@ public class TestOMVersionManager {
// Initial Version is always allowed.
assertTrue(omVersionManager.isAllowed(INITIAL_VERSION));
- assertTrue(INITIAL_VERSION.layoutVersion() <=
- omVersionManager.getMetadataLayoutVersion());
+ assertThat(INITIAL_VERSION.layoutVersion())
+ .isLessThanOrEqualTo(omVersionManager.getMetadataLayoutVersion());
}
@Test
@@ -152,7 +153,7 @@ public class TestOMVersionManager {
.findFirst();
assertTrue(preExecuteMethod.isPresent());
- assertTrue(preExecuteMethod.get().getParameterCount() >= 1);
+
assertThat(preExecuteMethod.get().getParameterCount()).isGreaterThanOrEqualTo(1);
assertEquals(OzoneManager.class,
preExecuteMethod.get().getParameterTypes()[0]);
}
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneDelegationTokenSecretManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneDelegationTokenSecretManager.java
index c36f85f33c..49d19d3bc3 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneDelegationTokenSecretManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/TestOzoneDelegationTokenSecretManager.java
@@ -57,6 +57,7 @@ import org.apache.hadoop.util.Time;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY;
import static
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMTokenProto.Type.S3AUTHINFO;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -254,7 +255,7 @@ public class TestOzoneDelegationTokenSecretManager {
}
long renewalTime = secretManager.renewToken(token, TEST_USER.toString());
- assertTrue(renewalTime > 0);
+ assertThat(renewalTime).isGreaterThan(0);
}
@Test
@@ -320,7 +321,7 @@ public class TestOzoneDelegationTokenSecretManager {
IOException ioException =
assertThrows(IOException.class,
() -> secretManager.renewToken(token, TEST_USER.toString()));
- assertTrue(ioException.getMessage().contains("is expired"));
+ assertThat(ioException.getMessage()).contains("is expired");
}
@Test
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
index d821f2128d..e5723f0a2a 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/security/acl/TestOzoneNativeAuthorizer.java
@@ -78,6 +78,7 @@ import static
org.apache.hadoop.ozone.security.acl.OzoneObj.ResourceType.KEY;
import static
org.apache.hadoop.ozone.security.acl.OzoneObj.ResourceType.PREFIX;
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.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -401,7 +402,7 @@ public class TestOzoneNativeAuthorizer {
// Fetch current acls and validate.
acls = aclImplementor.getAcl(obj);
assertEquals(1, acls.size());
- assertTrue(acls.contains(newAcl));
+ assertThat(acls).contains(newAcl);
// Special handling for ALL.
if (a1.equals(ALL)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
