diff options
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java')
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java | 55 |
1 files changed, 26 insertions, 29 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 d9659cf92d4..05e83de9157 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 @@ -17,17 +17,14 @@ import com.yahoo.container.logging.JSONAccessLog; import com.yahoo.container.logging.VespaAccessLog; import com.yahoo.vespa.model.container.ApplicationContainerCluster; import com.yahoo.vespa.model.container.component.Component; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Element; import java.util.logging.Level; import static com.yahoo.config.model.test.TestUtil.joinLines; import static com.yahoo.text.StringUtilities.quote; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.*; /** * @author gjoranv @@ -35,13 +32,13 @@ import static org.junit.Assert.assertNull; public class AccessLogTest extends ContainerModelBuilderTestBase { @Test - public void default_access_log_is_added_by_default() { + void default_access_log_is_added_by_default() { Element cluster1Elem = DomBuilderTest.parse( "<container id='cluster1' version='1.0'>", " <nodes>", " <node hostalias='mockhost' baseport='1234' />", " </nodes>", - "</container>" ); + "</container>"); createModel(root, cluster1Elem); @@ -50,14 +47,14 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { } @Test - public void default_search_access_log_can_be_disabled() { + void default_search_access_log_can_be_disabled() { final String jdiscClusterId = "jdisc-cluster"; Element clusterElem = DomBuilderTest.parse( "<container id=" + quote(jdiscClusterId) + " version='1.0'>" + " <search />" + " <accesslog type='disabled' />" + - "</container>" ); + "</container>"); createModel(root, clusterElem); assertNull(getVespaAccessLog(jdiscClusterId)); @@ -74,7 +71,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { } @Test - public void access_log_can_be_configured() { + void access_log_can_be_configured() { Element clusterElem = DomBuilderTest.parse( "<container id='default' version='1.0'>", " <accesslog type='vespa' ", @@ -82,7 +79,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { " <accesslog type='json' ", " fileNamePattern='pattern' rotationInterval='interval' queueSize='17' bufferSize='65536'/>", nodesXml, - "</container>" ); + "</container>"); createModel(root, clusterElem); assertNotNull(getJsonAccessLog("default")); @@ -91,19 +88,19 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { { // vespa Component<?, ?> accessLogComponent = getComponent("default", VespaAccessLog.class.getName()); assertNotNull(accessLogComponent); - assertEquals(VespaAccessLog.class.getName(), accessLogComponent.getClassId().getName(), VespaAccessLog.class.getName()); + assertEquals(accessLogComponent.getClassId().getName(), VespaAccessLog.class.getName(), VespaAccessLog.class.getName()); AccessLogConfig config = root.getConfig(AccessLogConfig.class, "default/component/com.yahoo.container.logging.VespaAccessLog"); AccessLogConfig.FileHandler fileHandlerConfig = config.fileHandler(); assertEquals("pattern", fileHandlerConfig.pattern()); assertEquals("interval", fileHandlerConfig.rotation()); assertEquals(256, fileHandlerConfig.queueSize()); - assertEquals(256*1024, fileHandlerConfig.bufferSize()); + assertEquals(256 * 1024, fileHandlerConfig.bufferSize()); } { // json Component<?, ?> accessLogComponent = getComponent("default", JSONAccessLog.class.getName()); assertNotNull(accessLogComponent); - assertEquals(JSONAccessLog.class.getName(), accessLogComponent.getClassId().getName(), JSONAccessLog.class.getName()); + assertEquals(accessLogComponent.getClassId().getName(), JSONAccessLog.class.getName(), JSONAccessLog.class.getName()); AccessLogConfig config = root.getConfig(AccessLogConfig.class, "default/component/com.yahoo.container.logging.JSONAccessLog"); AccessLogConfig.FileHandler fileHandlerConfig = config.fileHandler(); assertEquals("pattern", fileHandlerConfig.pattern()); @@ -114,7 +111,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { } @Test - public void connection_log_configured_when_access_log_not_disabled() { + void connection_log_configured_when_access_log_not_disabled() { Element clusterElem = DomBuilderTest.parse( "<container id='default' version='1.0'>", " <accesslog type='vespa' ", @@ -122,41 +119,41 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { " <accesslog type='json' ", " fileNamePattern='pattern' rotationInterval='interval' />", nodesXml, - "</container>" ); + "</container>"); createModel(root, clusterElem); Component<?, ?> connectionLogComponent = getComponent("default", FileConnectionLog.class.getName()); assertNotNull(connectionLogComponent); ConnectionLogConfig config = root.getConfig(ConnectionLogConfig.class, "default/component/com.yahoo.container.logging.FileConnectionLog"); assertEquals("default", config.cluster()); assertEquals(-1, config.queueSize()); - assertEquals(256*1024, config.bufferSize()); + assertEquals(256 * 1024, config.bufferSize()); } @Test - public void connection_log_disabled_when_access_log_disabled() { + void connection_log_disabled_when_access_log_disabled() { Element clusterElem = DomBuilderTest.parse( "<container id='default' version='1.0'>", " <accesslog type='disabled' />", nodesXml, - "</container>" ); + "</container>"); createModel(root, clusterElem); Component<?, ?> fileConnectionLogComponent = getComponent("default", FileConnectionLog.class.getName()); assertNull(fileConnectionLogComponent); } @Test - public void hosted_applications_get_a_log_warning_when_overriding_accesslog() { + void hosted_applications_get_a_log_warning_when_overriding_accesslog() { String containerService = joinLines("<container id='foo' version='1.0'>", - " <accesslog type='json' fileNamePattern='logs/vespa/qrs/access.%Y%m%d%H%M%S' symlinkName='json_access' />", - " <nodes count=\"2\">", - " </nodes>", - "</container>"); + " <accesslog type='json' fileNamePattern='logs/vespa/qrs/access.%Y%m%d%H%M%S' symlinkName='json_access' />", + " <nodes count=\"2\">", + " </nodes>", + "</container>"); String deploymentXml = joinLines("<deployment version='1.0'>", - " <prod>", - " <region>us-east-1</region>", - " </prod>", - "</deployment>"); + " <prod>", + " <region>us-east-1</region>", + " </prod>", + "</deployment>"); ApplicationPackage applicationPackage = new MockApplicationPackage.Builder() .withServices(containerService) @@ -174,7 +171,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase { assertFalse(logger.msgs.isEmpty()); assertEquals(Level.WARNING, logger.msgs.get(0).getFirst()); assertEquals("Applications are not allowed to override the 'accesslog' element", - logger.msgs.get(0).getSecond()); + logger.msgs.get(0).getSecond()); } } |