Changed exception check by JUnit API usage (#6133)

jetty · Apr 5, 2021 · e3c87fc · e3c87fc
1 parent 25b96fa
commit e3c87fc
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/SyntaxTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/SyntaxTest.java
@@ -18,6 +18,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class SyntaxTest
@@ -61,17 +62,11 @@ public void testRequireValidRFC2616TokenBad()
 
         for (String token : tokens)
         {
-            try
-            {
-                Syntax.requireValidRFC2616Token(token, "Test Based");
-                fail("RFC2616 Token [" + token + "] Should have thrown " + IllegalArgumentException.class.getName());
-            }
-            catch (IllegalArgumentException e)
-            {
-                assertThat("Testing Bad RFC2616 Token [" + token + "]", e.getMessage(),
+            Throwable e = assertThrows(IllegalArgumentException.class,
+                    () -> Syntax.requireValidRFC2616Token(token, "Test Based"));
+            assertThat("Testing Bad RFC2616 Token [" + token + "]", e.getMessage(),
                     allOf(containsString("Test Based"),
-                        containsString("RFC2616")));
-            }
+                            containsString("RFC2616")));
         }
     }