Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-03-04 05:40:18 +0000
committerGreg Wilkins2013-03-04 05:40:18 +0000
commit056be85766b8d37581abc818842b351b851831c2 (patch)
tree4ca8fad3026183e41d1ae097cc1ae65f4d78f9eb /jetty-proxy
parent8933a8bdcaf16b8c22253e5f13311b95f0dd3178 (diff)
downloadorg.eclipse.jetty.project-056be85766b8d37581abc818842b351b851831c2.tar.gz
org.eclipse.jetty.project-056be85766b8d37581abc818842b351b851831c2.tar.xz
org.eclipse.jetty.project-056be85766b8d37581abc818842b351b851831c2.zip
less verbose exception
Diffstat (limited to 'jetty-proxy')
-rw-r--r--jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java29
1 files changed, 20 insertions, 9 deletions
diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
index 6767fd5da2..c16cbba984 100644
--- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
+++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
@@ -59,12 +59,15 @@ import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.toolchain.test.AdvancedRunner;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.toolchain.test.TestTracker;
import org.eclipse.jetty.toolchain.test.annotation.Slow;
import org.eclipse.jetty.util.IO;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.StdErrLog;
import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Assert;
@@ -179,21 +182,29 @@ public class ProxyServletTest
@Test
public void testServerException() throws Exception
{
- prepareProxy(new ProxyServlet());
- prepareServer(new HttpServlet()
+ ((StdErrLog)Log.getLogger(ServletHandler.class)).setHideStacks(true);
+ try
{
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ prepareProxy(new ProxyServlet());
+ prepareServer(new HttpServlet()
{
- throw new ServletException();
- }
- });
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ throw new ServletException("Expected Test Exception");
+ }
+ });
- ContentResponse response = client.newRequest("localhost", serverConnector.getLocalPort())
+ ContentResponse response = client.newRequest("localhost", serverConnector.getLocalPort())
.timeout(5, TimeUnit.SECONDS)
.send();
- Assert.assertEquals(500, response.getStatus());
+ Assert.assertEquals(500, response.getStatus());
+ }
+ finally
+ {
+ ((StdErrLog)Log.getLogger(ServletHandler.class)).setHideStacks(false);
+ }
}
@Test

Back to the top