*/
package org.opendaylight.controller.config.yang.logback.config;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.junit.matchers.JUnitMatchers.containsString;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.opendaylight.controller.config.api.ConflictingVersionException;
import org.opendaylight.controller.config.api.ValidationException;
import org.opendaylight.controller.config.api.jmx.CommitStatus;
import org.opendaylight.controller.config.manager.impl.AbstractConfigTest;
import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver;
import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
+import javax.management.ObjectName;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.junit.matchers.JUnitMatchers.containsString;
+
public class LogbackModuleTest extends AbstractConfigTest {
private static final String INSTANCE_NAME = "singleton";
private LogbackModuleFactory factory;
@Before
- public void setUp() throws IOException, ClassNotFoundException,
- InterruptedException {
+ public void setUp() throws Exception {
factory = new LogbackModuleFactory();
- super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(
- factory));
+ super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext,factory));
}
@Test
- public void testCreateBean() throws InstanceAlreadyExistsException {
+ public void testCreateBean() throws Exception {
- CommitStatus status = createBeans(
- true, "target/rollingApp",
- "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB",
- 1, 5, "target/%i.log", "rolling", "consoleName", "ALL",
- "logger1", "DEBUG").commit();
+ CommitStatus status = createBeans(true, "target/rollingApp",
+ "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1, 5, "target/%i.log", "rolling",
+ "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender").commit();
assertBeanCount(1, factory.getImplementationName());
assertStatus(status, 1, 0, 0);
}
@Test
- public void testReusingInstance() throws InstanceAlreadyExistsException {
- createBeans(
- true, "target/rollingApp",
- "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB",
- 1, 5, "target/%i.log", "rolling", "consoleName", "ALL",
- "logger1", "DEBUG").commit();
+ public void testReusingInstance() throws Exception {
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1, 5,
+ "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0,
+ "FileAppender").commit();
assertBeanCount(1, factory.getImplementationName());
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
+ ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
CommitStatus status = transaction.commit();
assertBeanCount(1, factory.getImplementationName());
}
@Test
- public void testRecreateInstance() throws InstanceAlreadyExistsException,
- ValidationException, ConflictingVersionException,
- InstanceNotFoundException {
- createBeans(
- true, "target/rollingApp",
- "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB",
- 1, 5, "target/%i.log", "rolling", "consoleName", "ALL",
- "logger1", "DEBUG").commit();
+ public void testRecreateInstance() throws Exception {
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1, 5,
+ "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0,
+ "FileAppender").commit();
assertBeanCount(1, LogbackModuleFactory.NAME);
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
+ ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
- ObjectName logback = transaction.lookupConfigBean(
- LogbackModuleFactory.NAME, "singleton");
- LogbackModuleMXBean nwBean = transaction.newMXBeanProxy(logback,
- LogbackModuleMXBean.class);
+ ObjectName logback = transaction.lookupConfigBean(LogbackModuleFactory.NAME, "singleton");
+ LogbackModuleMXBean nwBean = transaction.newMXBeanProxy(logback, LogbackModuleMXBean.class);
CommitStatus status = transaction.commit();
assertBeanCount(1, LogbackModuleFactory.NAME);
}
@Test
- public void testDestroyInstance() throws InstanceNotFoundException,
- InstanceAlreadyExistsException {
- createBeans(
- true, "target/rollingApp",
- "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB",
- 1, 5, "target/%i.log", "rolling", "consoleName", "ALL",
- "logger1", "DEBUG").commit();
+ public void testDestroyInstance() throws Exception {
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1, 5,
+ "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0,
+ "FileAppender").commit();
assertBeanCount(1, factory.getImplementationName());
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- transaction.destroyConfigBean(factory.getImplementationName(),
- INSTANCE_NAME);
+ ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
+ transaction.destroyConfigBean(factory.getImplementationName(), INSTANCE_NAME);
CommitStatus status = transaction.commit();
assertBeanCount(0, factory.getImplementationName());
@Ignore
@Test
- public void testValidation1() throws InstanceAlreadyExistsException {
+ public void testValidation1() throws Exception {
try {
- createBeans(
- true, "target/rollingApp",
- "%-4relative [%thread] %-5level %logger{35} - %msg%n",
- "30MB", 1, 5, "target/%i.log", "rolling", "consoleName",
- "ALL", "logger1", "DEBUG").commit();
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1, 5,
+ "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy",
+ 0, "FileAppender").commit();
fail();
} catch (ValidationException e) {
- assertThat(e.getFailedValidations().toString(),
- containsString("FileName is null"));
+ assertThat(e.getFailedValidations().toString(), containsString("FileName is null"));
}
}
@Test
- public void testValidation2() throws InstanceAlreadyExistsException {
+ public void testValidation2() throws Exception {
try {
- createBeans(
- true, "target/rollingApp", null, "30MB", 1, 5, "target/%i.log",
- "rolling", "consoleName", "ALL", "logger1", "DEBUG")
+ createBeans(true, "target/rollingApp", null, "30MB", 1, 5, "target/%i.log", "rolling", "consoleName",
+ "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender").commit();
+ fail();
+ } catch (ValidationException e) {
+ assertThat(e.getFailedValidations().toString(), containsString("EncoderPattern is null"));
+ }
+ }
+
+ @Test
+ public void testValidation4() throws Exception {
+ try {
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", null, 1, 5,
+ "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy",
+ 0, "FileAppender").commit();
+ fail();
+ } catch (ValidationException e) {
+ assertThat(e.getFailedValidations().toString(), containsString("MaxFileSize is null"));
+ }
+ }
+
+ @Test
+ public void testValidation6() throws Exception {
+ try {
+ createBeans(true, "", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1, 5, "target/%i.log",
+ "rolling", "consoleName", "ALL", "logger1", "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender")
.commit();
fail();
} catch (ValidationException e) {
- assertThat(e.getFailedValidations().toString(),
- containsString("EncoderPattern is null"));
+ assertThat(e.getFailedValidations().toString(), containsString("FileName needs to be set"));
}
}
@Test
- public void testValidation4() throws InstanceAlreadyExistsException {
+ public void testValidation7() throws Exception {
try {
createBeans(
- true, "target/rollingApp",
- "%-4relative [%thread] %-5level %logger{35} - %msg%n",
- null, 1, 5, "target/%i.log", "rolling", "consoleName",
- "ALL", "logger1", "DEBUG").commit();
+
+ true, "target/rollingApp", "", "30MB", 1, 5, "target/%i.log", "rolling", "consoleName", "ALL", "logger1",
+ "DEBUG", "FixedWindowRollingPolicy", 0, "FileAppender").commit();
fail();
} catch (ValidationException e) {
- assertThat(e.getFailedValidations().toString(),
- containsString("MaxFileSize is null"));
+ assertThat(e.getFailedValidations().toString(), containsString("EncoderPattern needs to be set"));
}
}
@Test
- public void testValidation6() throws InstanceAlreadyExistsException {
+ public void testValidation8() throws Exception {
try {
- createBeans(
- true, "", "%-4relative [%thread] %-5level %logger{35} - %msg%n",
- "30MB", 1, 5, "target/%i.log", "rolling", "consoleName",
- "ALL", "logger1", "DEBUG").commit();
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1, 5,
+ "target/%i.log", "rolling", "consoleName", "ALL", null, "DEBUG", "FixedWindowRollingPolicy", 0,
+ "FileAppender").commit();
fail();
} catch (ValidationException e) {
- assertThat(e.getFailedValidations().toString(),
- containsString("FileName needs to be set"));
+ assertThat(e.getFailedValidations().toString(), containsString("LoggerName is null"));
}
}
@Test
- public void testValidation7() throws InstanceAlreadyExistsException {
+ public void testValidation9() throws Exception {
try {
- createBeans(
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1, 5,
+ "target/%i.log", "rolling", "consoleName", "ALL", "", "DEBUG", "FixedWindowRollingPolicy", 0,
+ "FileAppender").commit();
+ fail();
+ } catch (ValidationException e) {
+ assertThat(e.getFailedValidations().toString(), containsString("LoggerName needs to be set"));
+ }
+ }
- true, "target/rollingApp", "", "30MB", 1, 5, "target/%i.log",
- "rolling", "consoleName", "ALL", "logger1", "DEBUG")
- .commit();
+ @Test
+ public void testValidation10() throws Exception {
+ try {
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", null,
+ 5, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG",
+ "FixedWindowRollingPolicy", 0, "FileAppender").commit();
fail();
} catch (ValidationException e) {
- assertThat(e.getFailedValidations().toString(),
- containsString("EncoderPattern needs to be set"));
+ assertThat(e.getFailedValidations().toString(), containsString("MinIndex is null"));
}
}
@Test
- public void testValidation8() throws InstanceAlreadyExistsException {
+ public void testValidation11() throws Exception {
try {
- createBeans(
- true, "target/rollingApp",
- "%-4relative [%thread] %-5level %logger{35} - %msg%n",
- "30MB", 1, 5, "target/%i.log", "rolling", "consoleName",
- "ALL", null, "DEBUG").commit();
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1,
+ null, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG",
+ "FixedWindowRollingPolicy", 0, "FileAppender").commit();
fail();
} catch (ValidationException e) {
- assertThat(e.getFailedValidations().toString(),
- containsString("LoggerName is null"));
+ assertThat(e.getFailedValidations().toString(), containsString("MaxIndex is null"));
}
}
@Test
- public void testValidation9() throws InstanceAlreadyExistsException {
+ public void testValidation12() throws Exception {
try {
- createBeans(
- true, "target/rollingApp",
- "%-4relative [%thread] %-5level %logger{35} - %msg%n",
- "30MB", 1, 5, "target/%i.log", "rolling", "consoleName",
- "ALL", "", "DEBUG").commit();
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1,
+ null, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", null, 1, "FileAppender")
+ .commit();
fail();
} catch (ValidationException e) {
- assertThat(e.getFailedValidations().toString(),
- containsString("LoggerName needs to be set"));
+ assertThat(e.getFailedValidations().toString(), containsString("RollingPolicyType is null"));
}
}
@Test
- public void testValidation10() throws InstanceAlreadyExistsException {
+ public void testValidation13() throws Exception {
try {
- createBeans(
- true, "target/rollingApp",
- "%-4relative [%thread] %-5level %logger{35} - %msg%n",
- "30MB", null, 5, "target/%i.log", "rolling", "consoleName",
- "ALL", "logger1", "DEBUG").commit();
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1,
+ null, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "", 1, "FileAppender")
+ .commit();
fail();
} catch (ValidationException e) {
- assertThat(e.getFailedValidations().toString(),
- containsString("MinIndex is null"));
+ assertThat(e.getFailedValidations().toString(), containsString("RollingPolicyType is not set"));
}
}
@Test
- public void testValidation11() throws InstanceAlreadyExistsException {
+ public void testValidation14() throws Exception {
try {
- createBeans(
- true, "target/rollingApp",
- "%-4relative [%thread] %-5level %logger{35} - %msg%n",
- "30MB", 1, null, "target/%i.log", "rolling", "consoleName",
- "ALL", "logger1", "DEBUG").commit();
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", 1,
+ null, "target/%i.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "RollingPolicy", 1,
+ "FileAppender").commit();
fail();
} catch (ValidationException e) {
- assertThat(e.getFailedValidations().toString(),
- containsString("MaxIndex is null"));
+ assertThat(e.getFailedValidations().toString(), containsString("RollingPolicyType is not supported"));
}
}
- private ConfigTransactionJMXClient createBeans(
- Boolean isAppend, String rollingFileName, String encoderPattern,
- String maxFileSize, Integer minIndex, Integer maxIndex,
- String fileNamePattern, String rollingName, String consoleName,
- String thresholdFilter, String loggerName, String level )
- throws InstanceAlreadyExistsException {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- ObjectName nameCreated = transaction.createModule(
- factory.getImplementationName(), INSTANCE_NAME);
- LogbackModuleMXBean bean = transaction.newMXBeanProxy(nameCreated,
- LogbackModuleMXBean.class);
+ @Test
+ public void testTimeBasedRollingPolicy() throws Exception {
+ createBeans(true, "target/rollingApp", "%-4relative [%thread] %-5level %logger{35} - %msg%n", "30MB", null,
+ null, "target/%d.log", "rolling", "consoleName", "ALL", "logger1", "DEBUG", "TimeBasedRollingPolicy",
+ 1, "FileAppender").commit();
+ }
+
+ private ConfigTransactionJMXClient createBeans(Boolean isAppend, String rollingFileName, String encoderPattern,
+ String maxFileSize, Integer minIndex, Integer maxIndex, String fileNamePattern, String rollingName,
+ String consoleName, String thresholdFilter, String loggerName, String level, String rollingPolicyType,
+ int maxHistory, String fileAppName) throws Exception {
+ ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction();
+ ObjectName nameRetrieved = transaction.lookupConfigBean(factory.getImplementationName(), INSTANCE_NAME);
+ LogbackModuleMXBean bean = transaction.newMXBeanProxy(nameRetrieved, LogbackModuleMXBean.class);
List<RollingFileAppenderTO> rollingAppenders = new ArrayList<>();
RollingFileAppenderTO rollingAppender = new RollingFileAppenderTO();
rollingAppender.setMinIndex(minIndex);
rollingAppender.setFileNamePattern(fileNamePattern);
rollingAppender.setName(rollingName);
+ rollingAppender.setRollingPolicyType(rollingPolicyType);
+ rollingAppender.setMaxHistory(maxHistory);
rollingAppenders.add(rollingAppender);
List<ConsoleAppenderTO> consoleAppenders = new ArrayList<>();
consoleAppender.setThresholdFilter(thresholdFilter);
consoleAppenders.add(consoleAppender);
+ List<FileAppenderTO> fileAppenders = new ArrayList<>();
+ FileAppenderTO fileAppender = new FileAppenderTO();
+ fileAppender.setName(fileAppName);
+ fileAppender.setAppend(isAppend);
+ fileAppender.setEncoderPattern(encoderPattern);
+ fileAppender.setFileName(rollingFileName);
+ fileAppenders.add(fileAppender);
+
List<LoggerTO> loggers = new ArrayList<>();
LoggerTO logger = new LoggerTO();
bean.setLoggerTO(loggers);
bean.setRollingFileAppenderTO(rollingAppenders);
bean.setConsoleAppenderTO(consoleAppenders);
+ bean.setFileAppenderTO(fileAppenders);
transaction.validateConfig();
Code Review / controller.git / blobdiff