Refactor unit test to make it shorter

dropwizard · May 26, 2016 · f60425e · f60425e
1 parent 274f13d
commit f60425e
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/dropwizard-logging/src/test/java/io/dropwizard/logging/FileAppenderFactoryTest.java b/dropwizard-logging/src/test/java/io/dropwizard/logging/FileAppenderFactoryTest.java
@@ -14,6 +14,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.io.Files;
 
 import ch.qos.logback.classic.AsyncAppender;
 import ch.qos.logback.classic.Logger;
@@ -159,17 +160,14 @@ public void testCurrentFileNameCanBeNullWhenArchiveIsEnabled() throws Exception
 
     @Test
     public void testCurrentLogFileNameIsEmptyAndAppenderUsesArchivedNameInstead() throws Exception {
-        final Logger root = (Logger) LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
         final FileAppenderFactory<ILoggingEvent> appenderFactory = new FileAppenderFactory<>();
         appenderFactory.setArchivedLogFilenamePattern(folder.newFile("test-archived-name-%d.log").toString());
-        final Appender<ILoggingEvent> appender = appenderFactory.build(root.getLoggerContext(), "test", new DropwizardLayoutFactory(), new NullLevelFilterFactory<>(), new AsyncLoggingEventAppenderFactory());
+        final FileAppender<ILoggingEvent> rollingAppender = appenderFactory.buildAppender(new LoggerContext());
 
-        RollingFileAppender<ILoggingEvent> rollingAppender = (RollingFileAppender<ILoggingEvent>) ((AsyncAppender) appender).getAppender("file-appender");
+        final String file = rollingAppender.getFile();
-
+        final String dateSuffix = LocalDateTime.now().format(DateTimeFormatter.ofPattern("YYYY-MM-dd"));
-        String file = rollingAppender.getFile();
+        final String name = Files.getNameWithoutExtension(file);
-        String dateSuffic = LocalDateTime.now().format(DateTimeFormatter.ofPattern("YYYY-MM-dd"));
+        Assert.assertEquals("test-archived-name-" + dateSuffix, name);
-        String[] split = file.split("/");
-        Assert.assertEquals("test-archived-name-" + dateSuffic + ".log", split[split.length-1]);
     }
 
     @Test