From 47da5122d79bd101dcb45fa93fb665911cf00e5d Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@oath.com>
Date: Thu, 9 Nov 2017 18:03:32 +0100
Subject: Reduce log noise from HttpServerConformanceTest

---
 .../server/jetty/HttpServerConformanceTest.java    | 23 +++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'jdisc_http_service/src')

diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
index a349a4af87f..cc7095dadda 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
@@ -24,6 +24,7 @@ import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.net.URI;
@@ -33,6 +34,7 @@ import java.util.Collections;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
@@ -50,7 +52,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a>
+ * @author Simon Thoresen Hult
  */
 public class HttpServerConformanceTest extends ServerProviderConformanceTest {
 
@@ -59,6 +61,25 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
     private static final String REQUEST_CONTENT = "myRequestContent";
     private static final String RESPONSE_CONTENT = "myResponseContent";
 
+    @SuppressWarnings("LoggerInitializedWithForeignClass")
+    private static Logger httpRequestDispatchLogger = Logger.getLogger(HttpRequestDispatch.class.getName());
+    private static Level httpRequestDispatchLoggerOriginalLevel;
+
+    /*
+     * Reduce logging of every stack trace for {@link ServerProviderConformanceTest.ConformanceException} thrown.
+     * This makes the log more readable and the test faster as well.
+     */
+    @BeforeClass
+    public static void reduceExcessiveLogging() {
+        httpRequestDispatchLoggerOriginalLevel = httpRequestDispatchLogger.getLevel();
+        httpRequestDispatchLogger.setLevel(Level.SEVERE);
+    }
+
+    @AfterClass
+    public static void restoreExcessiveLogging() {
+        httpRequestDispatchLogger.setLevel(httpRequestDispatchLoggerOriginalLevel);
+    }
+
     @AfterClass
     public static void reportDiagnostics() {
         System.out.println(
-- 
cgit v1.2.3