Remove usage of assertDoesNotThrow()

apache · Jan 10, 2025 · 1c92047 · 1c92047
1 parent 423ca0e
commit 1c92047
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 16 deletions.
diff --git a/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java b/src/test/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImplTestCase.java
@@ -21,8 +21,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-
 public class JXPathContextReferenceImplTestCase {
 
     /**
@@ -31,10 +29,12 @@ public class JXPathContextReferenceImplTestCase {
     @Test
     public void testInit() {
         final ContainerPointerFactory factory = new ContainerPointerFactory();
-        assertDoesNotThrow(() -> JXPathContextReferenceImpl.addNodePointerFactory(factory));
-
-        while (JXPathContextReferenceImpl.removeNodePointerFactory(factory)) {
-            // NOP
+        try {
+            JXPathContextReferenceImpl.addNodePointerFactory(factory);
+        } finally {
+            while (JXPathContextReferenceImpl.removeNodePointerFactory(factory)) {
+                // NOP
+            }
         }
     }
 }
diff --git a/src/test/java/org/apache/commons/jxpath/ri/StressTest.java b/src/test/java/org/apache/commons/jxpath/ri/StressTest.java
@@ -20,8 +20,8 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test thread safety.
@@ -32,6 +32,7 @@ public class StressTest {
     private static final int THREAD_DURATION = 1000;
     private static JXPathContext context;
     private static int count;
+    private static Throwable exception;
 
     @Test
     public void testThreads() throws Throwable {
@@ -46,16 +47,25 @@ public void testThreads() throws Throwable {
         }
 
         for (final Thread element : threadArray) {
-            assertDoesNotThrow(() -> element.join(), "Interrupted");
+            try {
+                element.join();
+            }
+            catch (final InterruptedException e) {
+                fail("Interrupted");
+            }
+        }
+
+        if (exception != null) {
+            throw exception;
         }
         assertEquals(THREAD_COUNT * THREAD_DURATION, count, "Test count");
     }
 
     private static final class StressRunnable implements Runnable {
         @Override
         public void run() {
-            for (int j = 0; j < THREAD_DURATION; j++) {
-                assertDoesNotThrow(() -> {
+            for (int j = 0; j < THREAD_DURATION && exception == null; j++) {
+                try {
                     final double random = 1 + Math.random();
                     final double sum =
                         ((Double) context.getValue("/ + " + random))
@@ -64,7 +74,10 @@ public void run() {
                     synchronized (context) {
                         count++;
                     }
-                });
+                }
+                catch (final Throwable t) {
+                    exception = t;
+                }
             }
         }
     }

diff --git a/src/test/java/org/apache/commons/jxpath/util/ClassLoaderUtilTest.java b/src/test/java/org/apache/commons/jxpath/util/ClassLoaderUtilTest.java
@@ -30,7 +30,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -125,8 +124,13 @@ public static void callExampleMessageMethodAndAssertClassNotFoundJXPathException
    */
   public static void callExampleMessageMethodAndAssertSuccess() {
     final JXPathContext context = JXPathContext.newContext(new Object());
-    Object value = assertDoesNotThrow(() -> context.selectSingleNode(EXAMPLE_CLASS_NAME+".getMessage()"));
-    assertEquals("an example class", value);
+    Object value;
+    try {
+      value = context.selectSingleNode(EXAMPLE_CLASS_NAME+".getMessage()");
+      assertEquals("an example class", value);
+    } catch ( final Exception e ) {
+      fail(e.getMessage());
+    }
   }
 
   /**
@@ -138,8 +142,18 @@ public static void callExampleMessageMethodAndAssertSuccess() {
    * to invoke.
    */
   private void executeTestMethodUnderClassLoader(final ClassLoader cl, final String methodName) {
-    Class testClass = assertDoesNotThrow(() -> cl.loadClass(TEST_CASE_CLASS_NAME));
-    Method testMethod = assertDoesNotThrow(() -> testClass.getMethod(methodName, null));
+    Class testClass = null;
+    try {
+      testClass = cl.loadClass(TEST_CASE_CLASS_NAME);
+    } catch (final ClassNotFoundException e) {
+      fail(e.getMessage());
+    }
+    Method testMethod = null;
+    try {
+      testMethod = testClass.getMethod(methodName, null);
+    } catch (final SecurityException | NoSuchMethodException e) {
+      fail(e.getMessage());
+    }
 
     try {
       testMethod.invoke(null, null);