Disable access logging in tests

10 files changed, 30 insertions, 18 deletions

diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java
index a2c6e84ecb7..b200244a21c 100644
--- a/application/src/main/java/com/yahoo/application/Application.java
+++ b/application/src/main/java/com/yahoo/application/Application.java
@@ -587,6 +587,7 @@ public final class Application implements AutoCloseable {
                     xml.println("</search>");
                 }
 
+                xml.println("<accesslog type=\"disabled\" />");
                 xml.println("</container>");
             }
 
diff --git a/application/src/test/app-packages/searcher-app/services.xml b/application/src/test/app-packages/searcher-app/services.xml
index 0fd37554c3b..5b9f4265b5a 100644
--- a/application/src/test/app-packages/searcher-app/services.xml
+++ b/application/src/test/app-packages/searcher-app/services.xml
@@ -12,4 +12,5 @@
 
     </chain>
   </search>
+  <accesslog type="disabled" />
 </container>
diff --git a/application/src/test/app-packages/withcontent/services.xml b/application/src/test/app-packages/withcontent/services.xml
index 251f591b6b8..4338579b49a 100644
--- a/application/src/test/app-packages/withcontent/services.xml
+++ b/application/src/test/app-packages/withcontent/services.xml
@@ -22,7 +22,7 @@
           </chain>
       </document-processing>
       -->
-
+    <accesslog type="disabled" />
   </container>
 
   <content version="1.0" id="foo">
diff --git a/application/src/test/java/com/yahoo/application/ApplicationTest.java b/application/src/test/java/com/yahoo/application/ApplicationTest.java
index f2af5537490..2c0b44c6d64 100644
--- a/application/src/test/java/com/yahoo/application/ApplicationTest.java
+++ b/application/src/test/java/com/yahoo/application/ApplicationTest.java
@@ -183,6 +183,7 @@ public class ApplicationTest {
     }
 
     @Test
+    // TODO: Creates access log
     public void renderer() throws Exception {
         try (
                 ApplicationFacade app = new ApplicationFacade(Application.fromBuilder(new Application.Builder().container("default", new Application.Builder.Container()
@@ -375,7 +376,8 @@ public class ApplicationTest {
     private static String servicesXmlWithServer(int port) {
         return "<container version='1.0'>" +
                 "  <http> <server port='" + port +"' id='foo'/> </http>" +
-                "</container>";
+               "  <accesslog type=\"disabled\" />" +
+               "</container>";
     }
 
     @Test
@@ -392,7 +394,8 @@ public class ApplicationTest {
                 "      <access-control domain='foo' />" +
                 "    </filtering>" +
                 "  </http>" +
-                "</container>";
+               "  <accesslog type=\"disabled\" />" +
+               "</container>";
     }
 
 }
diff --git a/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java b/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java
index 529f6a60c0d..81f5a681f1a 100644
--- a/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java
+++ b/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java
@@ -44,6 +44,7 @@ public class ContainerDocprocTest {
         xml +=
                 "    </chain>\n" +
                 "  </document-processing>\n" +
+                "  <accesslog type=\"disabled\" />" +
                 "</container>\n";
         return xml;
     }
diff --git a/application/src/test/java/com/yahoo/application/container/ContainerProcessingTest.java b/application/src/test/java/com/yahoo/application/container/ContainerProcessingTest.java
index 93ca09ac5fc..22c307c0a0c 100644
--- a/application/src/test/java/com/yahoo/application/container/ContainerProcessingTest.java
+++ b/application/src/test/java/com/yahoo/application/container/ContainerProcessingTest.java
@@ -31,6 +31,7 @@ public class ContainerProcessingTest {
         xml +=
                 "    </chain>\n" +
                 "  </processing>\n" +
+                "  <accesslog type=\"disabled\" />" +
                 "</container>\n";
         return xml;
     }
diff --git a/application/src/test/java/com/yahoo/application/container/ContainerRequestTest.java b/application/src/test/java/com/yahoo/application/container/ContainerRequestTest.java
index 8f3e7693bc5..a66547e6ed9 100644
--- a/application/src/test/java/com/yahoo/application/container/ContainerRequestTest.java
+++ b/application/src/test/java/com/yahoo/application/container/ContainerRequestTest.java
@@ -33,6 +33,7 @@ public class ContainerRequestTest {
                binding +
                "</binding>\n" +
                "  </handler>\n" +
+               "  <accesslog type=\"disabled\" />" +
                "</container>";
     }
 
diff --git a/application/src/test/java/com/yahoo/application/container/ContainerSearchTest.java b/application/src/test/java/com/yahoo/application/container/ContainerSearchTest.java
index d133b71b8da..793ee9ab094 100644
--- a/application/src/test/java/com/yahoo/application/container/ContainerSearchTest.java
+++ b/application/src/test/java/com/yahoo/application/container/ContainerSearchTest.java
@@ -8,6 +8,8 @@ import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import org.junit.Test;
 
+import java.nio.charset.StandardCharsets;
+
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -25,7 +27,7 @@ public class ContainerSearchTest {
         try (JDisc container = containerWithSearch(searcherId)) {
             byte[] rendered = container.search().processAndRender(ComponentSpecification.fromString("mychain"),
                     ComponentSpecification.fromString("XmlRenderer"), new Query(""));
-            String renderedAsString = new String(rendered, "utf-8");
+            String renderedAsString = new String(rendered, StandardCharsets.UTF_8);
             assertThat(renderedAsString, containsString(searcherId));
         }
     }
@@ -44,11 +46,12 @@ public class ContainerSearchTest {
 
     public JDisc containerWithSearch(String searcherId) {
         return JDisc.fromServicesXml("<container version=\"1.0\">" + //
-                "<search>" + //
-                "<chain id=\"mychain\">" + //
-                "<searcher id=\"" + searcherId + "\"/>" + //
-                "</chain>" + //
-                "</search>" + //
+                "  <search>" + //
+                "    <chain id=\"mychain\">" + //
+                "      <searcher id=\"" + searcherId + "\"/>" + //
+                "    </chain>" + //
+                "  </search>" + //
+                "  <accesslog type=\"disabled\" />" + //
                 "</container>", Networking.disable);
     }
 
diff --git a/application/src/test/java/com/yahoo/application/container/ContainerTest.java b/application/src/test/java/com/yahoo/application/container/ContainerTest.java
index c284087243d..63347c2475a 100644
--- a/application/src/test/java/com/yahoo/application/container/ContainerTest.java
+++ b/application/src/test/java/com/yahoo/application/container/ContainerTest.java
@@ -164,6 +164,7 @@ public class ContainerTest {
                         "<http>\n" + //
                         "<server id=\"main\" port=\"9999\" />\n" + //
                         "</http>\n" + //
+                        "<accesslog type=\"disabled\" />" +
                         "</container>";
         return JDisc.fromServicesXml(xml, Networking.disable);
     }
diff --git a/application/src/test/java/com/yahoo/application/container/jersey/JerseyTest.java b/application/src/test/java/com/yahoo/application/container/jersey/JerseyTest.java
index 0eb308f124c..caddabff8ed 100644
--- a/application/src/test/java/com/yahoo/application/container/jersey/JerseyTest.java
+++ b/application/src/test/java/com/yahoo/application/container/jersey/JerseyTest.java
@@ -66,11 +66,10 @@ public class JerseyTest {
 
     @Test
     public void jersey_resources_in_provided_dependencies_can_be_invoked_from_application() throws Exception {
-        BundleClasspathMapping providedDependency = new BundleClasspathMapping(bundleSymbolicName,
-                Arrays.asList(testClassesDirectory));
+        BundleClasspathMapping providedDependency =
+                new BundleClasspathMapping(bundleSymbolicName, List.of(testClassesDirectory));
 
-        save(new ProjectBundleClassPaths(new BundleClasspathMapping("main", emptyList()),
-                Arrays.asList(providedDependency)));
+        save(new ProjectBundleClassPaths(new BundleClasspathMapping("main", emptyList()), List.of(providedDependency)));
         with_jersey_resources(emptyList(), httpGetter -> assertResourcesResponds(classPathResources, httpGetter));
     }
 
@@ -113,16 +112,16 @@ public class JerseyTest {
     }
 
     private interface ThrowingConsumer<T> {
-        public void accept(T arg) throws Exception;
+        void accept(T arg) throws Exception;
     }
 
     private interface HttpGetter {
-        public HttpResponse get(String path) throws Exception;
+        HttpResponse get(String path) throws Exception;
     }
 
     @SuppressWarnings("try") // jdisc unreferenced inside try
     private void with_jersey_resources(List<String> packagesToScan, ThrowingConsumer<HttpGetter> f) throws Exception {
-        StringBuffer packageElements = new StringBuffer();
+        StringBuilder packageElements = new StringBuilder();
         for (String p : packagesToScan) {
             packageElements.append("<package>");
             packageElements.append(p);
@@ -140,6 +139,7 @@ public class JerseyTest {
                         "<http>" + //
                         "<server id=\"mainServer\" port=\"0\" />" + //
                         "</http>" + //
+                        "<accesslog type=\"disabled\" />" +
                         "</container>" + //
                         "</services>", //
                 Networking.enable)) {
@@ -177,8 +177,8 @@ public class JerseyTest {
     }
 
     public void saveMainBundleClassPathMappings(String classPathElement) throws Exception {
-        BundleClasspathMapping mainBundleClassPathMappings = new BundleClasspathMapping(bundleSymbolicName,
-                Arrays.asList(classPathElement));
+        BundleClasspathMapping mainBundleClassPathMappings =
+                new BundleClasspathMapping(bundleSymbolicName, List.of(classPathElement));
         save(new ProjectBundleClassPaths(mainBundleClassPathMappings, emptyList()));
     }