refactor: replace try/catch blocks with assertThrows for exception testing

Author: Rian-Ismael

janusgraph-backend-testutils/src/main/java/org/janusgraph/diskstorage/log/LogTest.java

@@ -146,6 +146,28 @@ public void testLogIsDurableAcrossReopenSerial() throws Exception {
         assertEquals(3L, count.totalValue.get());
     }
 
+    @Test
+    public void testSeparateReadersAndLogsInSharedManager() throws Exception {
+        final int n = 5;
+        Log[] logs = new Log[n];
+        CountingReader[] counts = new CountingReader[n];
+        for (int i = 0; i < n; i++) {
+            counts[i] = new CountingReader(1, true);
+            logs[i] = manager.openLog("loner" + i);
+        }
+        for (int i = 0; i < n; i++) {
+            logs[i].registerReader(ReadMarker.fromNow(),counts[i]);
+            logs[i].add(BufferUtil.getLongBuffer(1L << (i + 1)));
+        }
+        // Check message receipt.
+        for (int i = 0; i < n; i++) {
+            log.debug("Awaiting CountingReader[{}]", i);
+            counts[i].await(TIMEOUT_MS);
+            assertEquals(1L << (i + 1), counts[i].totalValue.get());
+            assertEquals(1, counts[i].totalMsg.get());
+        }
+    }
+
     @Test
     @Tag(LogTest.requiresOrderPreserving)
     public void testMultipleLogsWithSingleReaderSerial() throws Exception {
@@ -174,28 +196,6 @@ public void testMultipleLogsWithSingleReaderSerial() throws Exception {
         assertEquals(value - 1, count.totalValue.get());
     }
 
-    @Test
-    public void testSeparateReadersAndLogsInSharedManager() throws Exception {
-        final int n = 5;
-        Log[] logs = new Log[n];
-        CountingReader[] counts = new CountingReader[n];
-        for (int i = 0; i < n; i++) {
-            counts[i] = new CountingReader(1, true);
-            logs[i] = manager.openLog("loner" + i);
-        }
-        for (int i = 0; i < n; i++) {
-            logs[i].registerReader(ReadMarker.fromNow(),counts[i]);
-            logs[i].add(BufferUtil.getLongBuffer(1L << (i + 1)));
-        }
-        // Check message receipt.
-        for (int i = 0; i < n; i++) {
-            log.debug("Awaiting CountingReader[{}]", i);
-            counts[i].await(TIMEOUT_MS);
-            assertEquals(1L << (i + 1), counts[i].totalValue.get());
-            assertEquals(1, counts[i].totalMsg.get());
-        }
-    }
-
     @Test
     @Tag(LogTest.requiresOrderPreserving)
     public void testFuzzMessagesSerial() throws Exception {

janusgraph-backend-testutils/src/main/java/org/janusgraph/graphdb/database/management/ManagementTest.java

@@ -23,6 +23,7 @@
 
 import java.util.Set;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public abstract class ManagementTest extends JanusGraphBaseTest {
@@ -47,14 +48,9 @@ public abstract class ManagementTest extends JanusGraphBaseTest {
     public void testReservedNamesRejectedForPropertyKeys() {
         for (String s : ILLEGAL_USER_DEFINED_NAMES) {
             JanusGraphManagement tm = graph.openManagement();
-            try {
-                tm.makePropertyKey(s);
-                fail("Property key  \"" + s + "\" must be rejected");
-            } catch (IllegalArgumentException e) {
-                log.debug("Caught expected exception", e);
-            } finally {
-                tm.commit();
-            }
+            assertThrows(IllegalArgumentException.class, () -> tm.makePropertyKey(s), "Property key \"" + s + "\" must be rejected");
+            log.debug("Caught expected exception");
+            tm.commit();
         }
     }