From 7e5a87b923ab93b38be110b64c2d14546c8192cd Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 21 Jun 2019 09:18:19 +0200 Subject: [PATCH] Fixed test verbosity Signed-off-by: Greg Wilkins --- .../eclipse/jetty/servlet/DispatcherTest.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java index 75cacda899e..6856f854b9d 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java @@ -18,20 +18,11 @@ package org.eclipse.jetty.servlet; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.startsWith; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.io.IOException; import java.util.Arrays; import java.util.Collections; import java.util.EnumSet; import java.util.List; - import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -52,6 +43,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; import org.eclipse.jetty.server.Dispatcher; +import org.eclipse.jetty.server.HttpChannel; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.LocalConnector; import org.eclipse.jetty.server.Server; @@ -67,6 +59,14 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.startsWith; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class DispatcherTest { private Server _server; @@ -163,7 +163,7 @@ public class DispatcherTest @Test public void testForwardWithBadParams() throws Exception { - try(StacklessLogging nostack = new StacklessLogging(ServletHandler.class)) + try(StacklessLogging nostack = new StacklessLogging(HttpChannel.class)) { Log.getLogger(ServletHandler.class).info("Expect Not valid UTF8 warnings..."); _contextHandler.addServlet(AlwaysForwardServlet.class, "/forward/*");