use assertThrows instead of catching and asserting exception class in…

… TimTransmogrifierTest
CDOT-CV · Nov 1, 2024 · dc674c8 · dc674c8
1 parent d8f3fac
commit dc674c8
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/traveler/TimTransmogrifierTest.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/traveler/TimTransmogrifierTest.java
@@ -119,12 +119,7 @@ void testBuildASDNullTimeRethrowsTimeParsingExceptionFromSNMP() {
         inputServiceRequest.setSdw(new SDW());
         inputServiceRequest.setSnmp(new SNMP());
 
-        try {
-            TimTransmogrifier.buildASD(inputServiceRequest);
-            fail("Expected TimTransmogrifierException");
-        } catch (Exception e) {
-            assertInstanceOf(TimTransmogrifierException.class, e);
-        }
+        assertThrows(TimTransmogrifierException.class, () -> TimTransmogrifier.buildASD(inputServiceRequest));
     }
 
     @Test
@@ -133,12 +128,7 @@ void testBuildASDNullTimeRethrowsTimeParsingExceptionFromSDW() {
         ServiceRequest inputServiceRequest = new ServiceRequest();
         inputServiceRequest.setSdw(new SDW());
 
-        try {
-            TimTransmogrifier.buildASD(inputServiceRequest);
-            fail("Expected TimTransmogrifierException");
-        } catch (Exception e) {
-            assertInstanceOf(TimTransmogrifierException.class, e);
-        }
+        assertThrows(TimTransmogrifierException.class, () -> TimTransmogrifier.buildASD(inputServiceRequest));
     }
 
     @Test
@@ -274,12 +264,8 @@ void testConstructorIsPrivate() throws NoSuchMethodException {
         Constructor<TimTransmogrifier> constructor = TimTransmogrifier.class.getDeclaredConstructor();
         assertTrue(Modifier.isPrivate(constructor.getModifiers()));
         constructor.setAccessible(true);
-        try {
-            constructor.newInstance();
-            fail("Expected IllegalAccessException.class");
-        } catch (Exception e) {
-            assertEquals(InvocationTargetException.class, e.getClass());
-        }
+
+        assertThrows(InvocationTargetException.class, constructor::newInstance);
     }
 
 }