Fix breakage introduced by logback bump

[controller.git] / opendaylight / config / logback-config / src / test / java / org / opendaylight / controller / config / yang / logback / config / LogbackModuleWithInitialConfigurationTest.java

diff --git a/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleWithInitialConfigurationTest.java b/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleWithInitialConfigurationTest.java
index 999d8346e6c4dc27d675c31d43b3d9ce3b8ba4ef..eeed459a8cdf86374924522a968346fc295a8607 100644 (file)
--- a/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleWithInitialConfigurationTest.java
+++ b/opendaylight/config/logback-config/src/test/java/org/opendaylight/controller/config/yang/logback/config/LogbackModuleWithInitialConfigurationTest.java
@@ -28,7 +28,6 @@ import javax.management.InstanceNotFoundException;
 import javax.management.JMX;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
-import org.apache.commons.io.FileUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.ConflictingVersionException;
@@ -151,8 +150,9 @@ public class LogbackModuleWithInitialConfigurationTest extends AbstractConfigTes
         configurator.setContext(lc);
         configurator.doConfigure("src/test/resources/simple_config_logback.xml");
         File f = new File("target/it");
-        if (f.exists())
-            FileUtils.cleanDirectory(f);
+        if (f.exists()) {
+            cleanDirectory(f);
+        }
         ch.qos.logback.classic.Logger logger = lc.getLogger(ch.qos.logback.classic.Logger.ROOT_LOGGER_NAME);
         ch.qos.logback.core.rolling.RollingFileAppender<ILoggingEvent> fileAppender = (ch.qos.logback.core.rolling.RollingFileAppender<ILoggingEvent>) logger
                 .getAppender("VARLOGFILE");
@@ -173,14 +173,14 @@ public class LogbackModuleWithInitialConfigurationTest extends AbstractConfigTes
         rollingApp.setMinIndex(rollingPolicy.getMinIndex());
         SizeBasedTriggeringPolicy<ILoggingEvent> triggeringPolicy = (SizeBasedTriggeringPolicy<ILoggingEvent>) fileAppender
                 .getTriggeringPolicy();
-        rollingApp.setMaxFileSize(triggeringPolicy.getMaxFileSize());
+        rollingApp.setMaxFileSize(LogbackModuleFactory.getMaxFileSize(triggeringPolicy).toString());
         rollingApp.setName(fileAppender.getName());
         rollingApp.setFileNamePattern(rollingPolicy.getFileNamePattern());
         rollingAppenders.add(rollingApp);
 
-        assertEquals(rollingApp.getFileName(), "target/osgi.log");
-        assertEquals(rollingApp.getMaxFileSize(), "50MB");
-        assertEquals(rollingApp.getName(), "VARLOGFILE");
+        assertEquals("target/osgi.log", rollingApp.getFileName());
+        assertEquals("50 MB", rollingApp.getMaxFileSize());
+        assertEquals("VARLOGFILE", rollingApp.getName());
 
         List<ConsoleAppenderTO> consoleAppenders = new ArrayList<>();
         ConsoleAppenderTO consoleApp = new ConsoleAppenderTO();