1 files changed, 13 insertions, 8 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
index a4a8eef74dd..d545723241e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
@@ -39,8 +39,10 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
 
         createModel(root, cluster1Elem, cluster2Elem);
 
-        assertNotNull(getVespaAccessLog("cluster1"));
-        assertNull(   getVespaAccessLog("cluster2"));
+        assertNotNull(getJsonAccessLog("cluster1"));
+        assertNull(   getJsonAccessLog("cluster2"));
+        assertNull(getVespaAccessLog("cluster1"));
+        assertNull(getVespaAccessLog("cluster2"));
     }
 
     @Test
@@ -55,27 +57,32 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
 
         createModel(root, clusterElem);
         assertNull(getVespaAccessLog(jdiscClusterId));
+        assertNull(getJsonAccessLog(jdiscClusterId));
     }
 
     private Component<?, ?> getVespaAccessLog(String clusterName) {
         ContainerCluster cluster = (ContainerCluster) root.getChildren().get(clusterName);
         return cluster.getComponentsMap().get(ComponentId.fromString((VespaAccessLog.class.getName())));
     }
+    private Component<?, ?> getJsonAccessLog(String clusterName) {
+        ContainerCluster cluster = (ContainerCluster) root.getChildren().get(clusterName);
+        return cluster.getComponentsMap().get(ComponentId.fromString((JSONAccessLog.class.getName())));
+    }
 
     @Test
     public void access_log_can_be_configured() throws Exception {
         Element clusterElem = DomBuilderTest.parse(
                 "<jdisc id='default' version='1.0'>",
                 "  <accesslog type='yapache' ",
-                "             fileNamePattern='pattern' rotationInterval='interval'",
-                "             rotationScheme='date' />",
+                "             fileNamePattern='pattern' rotationInterval='interval' />",
                 "  <accesslog type='json' ",
-                "             fileNamePattern='pattern' rotationInterval='interval'",
-                "             rotationScheme='date' />",
+                "             fileNamePattern='pattern' rotationInterval='interval' />",
                 nodesXml,
                 "</jdisc>" );
 
         createModel(root, clusterElem);
+        assertNotNull(getJsonAccessLog("default"));
+        assertNull(getVespaAccessLog("default"));
 
         { // yapache
             Component<?, ?> accessLogComponent = getContainerComponent("default", YApacheAccessLog.class.getName());
@@ -85,7 +92,6 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
             AccessLogConfig.FileHandler fileHandlerConfig = config.fileHandler();
             assertEquals("pattern", fileHandlerConfig.pattern());
             assertEquals("interval", fileHandlerConfig.rotation());
-            assertEquals(AccessLogConfig.FileHandler.RotateScheme.DATE, fileHandlerConfig.rotateScheme());
         }
 
         { // json
@@ -96,7 +102,6 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
             AccessLogConfig.FileHandler fileHandlerConfig = config.fileHandler();
             assertEquals("pattern", fileHandlerConfig.pattern());
             assertEquals("interval", fileHandlerConfig.rotation());
-            assertEquals(AccessLogConfig.FileHandler.RotateScheme.DATE, fileHandlerConfig.rotateScheme());
         }
     }