X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=misc%2Flog4j%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fmisc%2Fenv%2Flog4j%2FJU_LogFileNamerTest.java;h=1aca545eeeff80ffd5aeca17e3a9165f8d4f9dd0;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=8657e1d631079f83c575d8837fec845dcaab06ef;hpb=ff1417ff60baee231a28272f9a16ef2c9c8ea0a2;p=aaf%2Fauthz.git diff --git a/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java b/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java index 8657e1d6..1aca545e 100644 --- a/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java +++ b/misc/log4j/src/test/java/org/onap/aaf/misc/env/log4j/JU_LogFileNamerTest.java @@ -38,55 +38,55 @@ public class JU_LogFileNamerTest { } private void cleanup(String name) { -// System.out.println("XXXX" + dir.getAbsolutePath()); - for(File f : dir.listFiles(new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.contains(name) && name.endsWith(".log"); - } - })) { -// System.out.println("Deleting " + f.getAbsolutePath()); - f.delete(); - }; +// System.out.println("XXXX" + dir.getAbsolutePath()); + for(File f : dir.listFiles(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.contains(name) && name.endsWith(".log"); + } + })) { +// System.out.println("Deleting " + f.getAbsolutePath()); + f.delete(); + }; } @Test public void test() throws IOException { - String name = "Append"; - try { - LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "log"); - assertEquals(logFileNamer, logFileNamer.noPID()); - - logFileNamer.setAppender(name); - assertEquals(System.getProperty("LOG4J_FILENAME_Append"), - dir.getCanonicalFile() + File.separator + "log-" + name + ".log"); - - logFileNamer.setAppender(name); - assertEquals(System.getProperty("LOG4J_FILENAME_Append"), - dir.getCanonicalFile() + File.separator + "log-" + name + ".0.log"); - } finally { - cleanup("log-" + name); - } + String name = "Append"; + try { + LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "log"); + assertEquals(logFileNamer, logFileNamer.noPID()); + + logFileNamer.setAppender(name); + assertEquals(System.getProperty("LOG4J_FILENAME_Append"), + dir.getCanonicalFile() + File.separator + "log-" + name + ".log"); + + logFileNamer.setAppender(name); + assertEquals(System.getProperty("LOG4J_FILENAME_Append"), + dir.getCanonicalFile() + File.separator + "log-" + name + ".0.log"); + } finally { + cleanup("log-" + name); + } } @Test public void testBlankRoot() throws IOException { - String name = "Different"; - try { - LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), ""); - assertEquals(logFileNamer, logFileNamer.noPID()); - - logFileNamer.setAppender(name); - assertEquals(System.getProperty("LOG4J_FILENAME_Different"), - dir.getCanonicalPath() + File.separator + name + ".log"); - - logFileNamer.setAppender(name); - assertEquals(System.getProperty("LOG4J_FILENAME_Different"), - dir.getCanonicalPath() + File.separator + name + ".0.log"); - } finally { - cleanup(name); - } + String name = "Different"; + try { + LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), ""); + assertEquals(logFileNamer, logFileNamer.noPID()); + + logFileNamer.setAppender(name); + assertEquals(System.getProperty("LOG4J_FILENAME_Different"), + dir.getCanonicalPath() + File.separator + name + ".log"); + + logFileNamer.setAppender(name); + assertEquals(System.getProperty("LOG4J_FILENAME_Different"), + dir.getCanonicalPath() + File.separator + name + ".0.log"); + } finally { + cleanup(name); + } } }