Some jetty-servlet test cleanup

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Jul 16, 2020 · 8e7bfa0 · 8e7bfa0
1 parent beca81c
commit 8e7bfa0
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 122 deletions.
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/FilterHolderTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/FilterHolderTest.java
@@ -18,20 +18,18 @@
 
 package org.eclipse.jetty.servlet;
 
-import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
 import org.eclipse.jetty.util.log.StacklessLogging;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * FilterHolderTest
@@ -49,13 +47,13 @@ public void testInitialize()
         Filter filter = new Filter()
         {
             @Override
-            public void init(FilterConfig filterConfig) throws ServletException
+            public void init(FilterConfig filterConfig)
             {
                 counter.incrementAndGet();
             }
 
             @Override
-            public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
+            public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
             {
             }
 
@@ -71,14 +69,9 @@ public void destroy()
         fh.setName("xx");
         fh.setFilter(filter);
 
-        try (StacklessLogging stackless = new StacklessLogging(FilterHolder.class))
+        try (StacklessLogging ignored = new StacklessLogging(FilterHolder.class))
         {
-            fh.initialize();
-            fail("Not started");
-        }
-        catch (Exception e)
-        {
-            //expected
+            assertThrows(IllegalStateException.class, fh::initialize);
         }
 
         fh.start();