adoroszlai commented on code in PR #5846:
URL: https://github.com/apache/ozone/pull/5846#discussion_r1433683041
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmBlockVersioning.java:
##########
@@ -144,7 +143,7 @@ public void testAllocateCommit() throws Exception {
List<OmKeyLocationInfo> locationInfoList =
openKey.getKeyInfo().getLatestVersionLocations()
.getBlocksLatestVersionOnly();
- assertTrue(locationInfoList.size() == 1);
+ assertEquals(locationInfoList.size(), 1);
Review Comment:
```suggestion
assertEquals(1, locationInfoList.size());
```
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileInterfaces.java:
##########
@@ -259,12 +261,9 @@ public void testOzFsReadWrite() throws IOException {
o3fs.pathToKey(path));
// verify prefix directories and the file, do not already exist
- assertTrue(
- metadataManager.getKeyTable(getBucketLayout()).get(lev1key) == null);
- assertTrue(
- metadataManager.getKeyTable(getBucketLayout()).get(lev2key) == null);
- assertTrue(
- metadataManager.getKeyTable(getBucketLayout()).get(fileKey) == null);
+ assertNull(metadataManager.getKeyTable(getBucketLayout()).get(lev1key));
+ assertNull(metadataManager.getKeyTable(getBucketLayout()).get(lev2key));
+ assertNull(metadataManager.getKeyTable(getBucketLayout()).get(fileKey));
Review Comment:
Note that `TestOzoneFileInterfaces` is being migrated to JUnit5 in #5838.
The same changes are done in that PR, too. Please remove
`TestOzoneFileInterfaces` from the patch to avoid conflicts.
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java:
##########
@@ -94,9 +94,9 @@ private void checkLeaderBalance(int dnNum, int
leaderNumOfEachDn)
leaderCount.put(leader, leaderCount.get(leader) + 1);
}
- assertTrue(leaderCount.size() == dnNum);
+ assertEquals(leaderCount.size(), dnNum);
Review Comment:
Let's also flip the arguments to match `expected, actual` order:
```suggestion
assertEquals(dnNum, leaderCount.size());
```
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java:
##########
@@ -3796,7 +3796,7 @@ private void doMultipartUpload(OzoneBucket bucket, String
keyName, byte val,
assertTrue(latestVersionLocations.isMultipartKey());
latestVersionLocations.getBlocksLatestVersionOnly()
.forEach(omKeyLocationInfo ->
- assertTrue(omKeyLocationInfo.getPartNumber() != -1));
+ assertNotEquals(omKeyLocationInfo.getPartNumber(), -1));
Review Comment:
```suggestion
assertNotEquals(-1, omKeyLocationInfo.getPartNumber()));
```
##########
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestLeaderChoosePolicy.java:
##########
@@ -94,9 +94,9 @@ private void checkLeaderBalance(int dnNum, int
leaderNumOfEachDn)
leaderCount.put(leader, leaderCount.get(leader) + 1);
}
- assertTrue(leaderCount.size() == dnNum);
+ assertEquals(leaderCount.size(), dnNum);
for (Map.Entry<UUID, Integer> entry: leaderCount.entrySet()) {
- assertTrue(leaderCount.get(entry.getKey()) == leaderNumOfEachDn);
+ assertEquals(leaderCount.get(entry.getKey()), leaderNumOfEachDn);
Review Comment:
```suggestion
assertEquals(leaderNumOfEachDn, leaderCount.get(entry.getKey()));
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
