Excavator: Prefer AssertJ

atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/priority/StreamStoreRemappingSweepPriorityCalculatorTest.java

@@ -501,17 +501,17 @@ private void whenCalculatingSweepPriorities() {
 
     // Then
     private void thenNoTablesToSweep() {
-        assertThat(priorities.isEmpty()).isEqualTo(true);
+        assertThat(priorities).isEmpty();
     }
 
     private void thenOnlyTablePrioritisedIs(TableReference table) {
-        assertThat(priorities.size()).isEqualTo(1);
-        assertThat(priorities.containsKey(table)).isEqualTo(true);
+        assertThat(priorities).hasSize(1);
+        assertThat(priorities).containsKey(table);
     }
 
     private void thenOnlyTablePrioritisedIs(SweepPriorityHistory sweepPriorityHistory) {
-        assertThat(priorities.size()).isEqualTo(1);
-        assertThat(priorities.containsKey(sweepPriorityHistory.tableRef)).isEqualTo(true);
+        assertThat(priorities).hasSize(1);
+        assertThat(priorities).containsKey(sweepPriorityHistory.tableRef);
     }
 
     private void thenTableHasPriority(TableReference table) {
@@ -527,7 +527,7 @@ private void thenTableHasZeroPriority(SweepPriorityHistory sweepPriorityHistory)
     }
 
     private void thenNumberOfTablesIs(int expectedNumberOfTables) {
-        assertThat(priorities.size()).isEqualTo(expectedNumberOfTables);
+        assertThat(priorities).hasSize(expectedNumberOfTables);
     }
 
     private void thenFirstTableHasHigherPriorityThanSecond(

atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/queue/SweepableCellsTest.java

@@ -318,7 +318,7 @@ public void canReadMultipleEntriesInSingleShardSameTransactionMultipleDedicated(
         List<WriteInfo> writes = writeCommittedConservativeRowForTimestamp(TS + 1, MAX_CELLS_DEDICATED + 1);
 
         SweepBatch conservativeBatch = readConservative(0, TS_FINE_PARTITION, TS, TS + 2);
-        assertThat(conservativeBatch.writes()).hasSize(writes.size());
+        assertThat(conservativeBatch.writes()).hasSameSizeAs(writes);
         assertThat(conservativeBatch.writes()).contains(writes.get(0), writes.get(writes.size() - 1));
     }
 

atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/encoding/TicketsEncodingStrategyTest.java

@@ -169,6 +169,6 @@ private static void assertStartTimestampsCanBeDistinguished(long... timestamps)
                 .boxed()
                 .map(STRATEGY::encodeStartTimestampAsCell)
                 .collect(Collectors.toSet());
-        assertThat(convertedCells).hasSize(timestamps.length);
+        assertThat(convertedCells).hasSameSizeAs(timestamps);
     }
 }

atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/http/JepsenLockClientTest.java

@@ -79,7 +79,7 @@ public void refreshSingleCallsRefreshWithMatchingArgument() throws InterruptedEx
     @Test
     public void refreshSingleReturnsTokenIfCanBeRefreshed() throws InterruptedException {
         when(mockClient.refresh(any())).then(REPLY_WITH_FIRST_TOKEN);
-        assertThat(LOCK_TOKEN).isEqualTo(client.refreshSingle(LOCK_TOKEN));
+        assertThat(client.refreshSingle(LOCK_TOKEN)).isEqualTo(LOCK_TOKEN);
     }
 
     @Test

atlasdb-jepsen-tests/src/test/java/com/palantir/atlasdb/jepsen/PartitionByInvokeNameCheckerHelperTest.java

@@ -123,7 +123,7 @@ public void partitioningOnlyReordersEvents() {
         CheckerResult checkerResult = runPartitionChecker(() -> identityChecker, eventList);
 
         assertThat(checkerResult.valid()).isFalse();
-        assertThat(checkerResult.errors()).hasSize(eventList.size());
+        assertThat(checkerResult.errors()).hasSameSizeAs(eventList);
         assertThat(checkerResult.errors()).containsOnlyElementsOf(eventList);
     }
 

atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractGetCandidateCellsForSweepingTest.java

@@ -211,7 +211,7 @@ private void doTestLargerTable(boolean checkIfLatestValueIsEmpty) {
                 }
             }
         }
-        assertThat(expectedCells.size()).isEqualTo((1 + 50) * 50 / 2);
+        assertThat(expectedCells).hasSize((1 + 50) * 50 / 2);
         builder.store();
         List<CandidateCellForSweeping> candidates = getAllCandidates(ImmutableCandidateCellForSweepingRequest.builder()
                 .startRowInclusive(PtBytes.EMPTY_BYTE_ARRAY)

atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTaskRunnerTest.java

@@ -117,7 +117,7 @@ public void testSweepBatchesUpToDeleteBatchSize() {
                 runSweep(cellsSweeper, spiedSweepRunner, 8, 1, 4);
         List<List<Cell>> sweptCells = sweptCellsAndSweepResults.getLhSide();
 
-        assertThat(sweptCells.size()).isEqualTo(1);
+        assertThat(sweptCells).hasSize(1);
         assertThat(sweptCells.get(0)).isEqualTo(SMALL_LIST_OF_CELLS);
     }
 
@@ -215,7 +215,7 @@ public void testSweepManyValuesIncludingUncommittedConservative() {
         assertThat(results.getStaleValuesDeleted()).isEqualTo(4);
         assertThat(results.getCellTsPairsExamined()).isGreaterThanOrEqualTo(5);
         assertThat(getFromDefaultColumn("foo", 200)).isEqualTo("buzz");
-        assertThat(getFromDefaultColumn("foo", 124)).isEqualTo("");
+        assertThat(getFromDefaultColumn("foo", 124)).isEmpty();
         assertThat(getAllTsFromDefaultColumn("foo")).isEqualTo(ImmutableSet.of(-1L, 125L));
     }
 
@@ -269,7 +269,7 @@ public void testSweepManyLatestDeletedThoroughIncludingUncommitted1() {
         // this check is a nuance of SweepTaskRunner: the value at timestamp 125 is actually eligible for deletion,
         // but we don't delete it on the first pass due to the later uncommitted value. below we sweep again and make
         // sure it's deleted
-        assertThat(getFromDefaultColumn("foo", 200)).isEqualTo("");
+        assertThat(getFromDefaultColumn("foo", 200)).isEmpty();
         assertThat(getAllTsFromDefaultColumn("foo")).isEqualTo(ImmutableSet.of(125L));
 
         results = completeSweep(175).get();

atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweepTest.java

@@ -126,7 +126,7 @@ public void testSweepOneConservative() {
         });
 
         assertThat(getFromDefaultColumn("foo", 150)).isEqualTo("baz");
-        assertThat(getFromDefaultColumn("foo", 80)).isEqualTo("");
+        assertThat(getFromDefaultColumn("foo", 80)).isEmpty();
         assertThat(getAllTsFromDefaultColumn("foo")).isEqualTo(ImmutableSet.of(-1L, 100L));
     }
 
@@ -159,7 +159,7 @@ public void testSweepManyValuesConservative() {
         });
 
         assertThat(getFromDefaultColumn("foo", 200)).isEqualTo("buzz");
-        assertThat(getFromDefaultColumn("foo", 124)).isEqualTo("");
+        assertThat(getFromDefaultColumn("foo", 124)).isEmpty();
         assertThat(getAllTsFromDefaultColumn("foo")).isEqualTo(ImmutableSet.of(-1L, 125L));
     }
 
@@ -268,7 +268,7 @@ public void testSweepLatestDeletedMultiValConservative() {
             assertThat(results.getCellTsPairsExamined()).isGreaterThanOrEqualTo(1);
         });
 
-        assertThat(getFromDefaultColumn("foo", 150)).isEqualTo("");
+        assertThat(getFromDefaultColumn("foo", 150)).isEmpty();
         assertThat(getAllTsFromDefaultColumn("foo")).isEqualTo(ImmutableSet.of(-1L, 50L));
     }