Test cleanup and simplification (apache#4799)

* Simplified assert statements in the tests. Switch to usage of static imports in tests. (Part 1)

* Simplify assert statements in the tests and use the appropriate assert statements. Switch to usage of static imports in tests. Remove unused imports (Part 2)

Author: vzhikserg

managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/EntryCacheManagerTest.java

@@ -21,6 +21,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 import java.util.List;
@@ -29,8 +30,6 @@
 import org.apache.bookkeeper.common.util.OrderedScheduler;
 import org.apache.bookkeeper.mledger.Entry;
 import org.apache.bookkeeper.mledger.ManagedCursor;
-import org.apache.bookkeeper.mledger.ManagedLedger;
-import org.apache.bookkeeper.mledger.ManagedLedgerFactory;
 import org.apache.bookkeeper.mledger.ManagedLedgerFactoryConfig;
 import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
 import org.testng.annotations.BeforeClass;
@@ -128,13 +127,13 @@ void doubleInsert() throws Exception {
         EntryCacheManager cacheManager = factory.getEntryCacheManager();
         EntryCache cache1 = cacheManager.getEntryCache(ml1);
 
-        assertEquals(cache1.insert(EntryImpl.create(1, 1, new byte[4])), true);
-        assertEquals(cache1.insert(EntryImpl.create(1, 0, new byte[3])), true);
+        assertTrue(cache1.insert(EntryImpl.create(1, 1, new byte[4])));
+        assertTrue(cache1.insert(EntryImpl.create(1, 0, new byte[3])));
 
         assertEquals(cache1.getSize(), 7);
         assertEquals(cacheManager.getSize(), 7);
 
-        assertEquals(cache1.insert(EntryImpl.create(1, 0, new byte[5])), false);
+        assertFalse(cache1.insert(EntryImpl.create(1, 0, new byte[5])));
 
         assertEquals(cache1.getSize(), 7);
         assertEquals(cacheManager.getSize(), 7);

managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorConcurrencyTest.java

@@ -19,7 +19,9 @@
 package org.apache.bookkeeper.mledger.impl;
 
 import static org.apache.bookkeeper.mledger.util.SafeRun.safeRun;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
 
 import com.google.common.collect.Lists;
 import java.util.List;
@@ -126,7 +128,7 @@ public void run() {
 
         counter.await();
 
-        assertEquals(gotException.get(), false);
+        assertFalse(gotException.get());
     }
 
     @Test
@@ -210,7 +212,7 @@ public void closeFailed(ManagedLedgerException exception, Object ctx) {
 
         counter.await();
 
-        assertEquals(gotException.get(), false);
+        assertFalse(gotException.get());
         assertEquals(closeFuture.get(), CLOSED);
     }
 
@@ -266,7 +268,7 @@ public void testAckAndClose() throws Exception {
 
         counter.await();
 
-        assertEquals(gotException.get(), false);
+        assertFalse(gotException.get());
     }
 
     @Test(timeOut = 30000)
@@ -312,7 +314,7 @@ public void testConcurrentIndividualDeletes() throws Exception {
 
         counter.await();
 
-        assertEquals(gotException.get(), false);
+        assertFalse(gotException.get());
         assertEquals(cursor.getMarkDeletedPosition(), addedEntries.get(addedEntries.size() - 1));
     }
 
@@ -338,7 +340,7 @@ public void testConcurrentReadOfSameEntry() throws Exception {
         final CyclicBarrier barrier = new CyclicBarrier(numCursors);
         final CountDownLatch counter = new CountDownLatch(numCursors);
 
-        AtomicReference<String> result = new AtomicReference<String>();
+        AtomicReference<String> result = new AtomicReference<>();
 
         for (int i = 0; i < numCursors; i++) {
             final int cursorIndex = i;