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=1aaeb7fb7be77431ec61cac7dff273dd38e838b7;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=8c47a40945974fc9d8660f2f49ee38e59cd3c3fb;hpb=656c303eeb020d0763996a71d8a9705357013eb6;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 8c47a409..1aaeb7fb 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
@@ -18,76 +18,75 @@
  * ============LICENSE_END====================================================
  *
  */
+
 package org.onap.aaf.misc.env.log4j;
 
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 public class JU_LogFileNamerTest {
-	private File dir = new File(".");
-
-	private String ending = new SimpleDateFormat("YYYYMMdd").format(new Date());
-
-	@Before
-	public void setUp() throws Exception {
-	}
-
-	@Test
-	public void test() throws IOException {
-		LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "log");
-		assertEquals(logFileNamer, logFileNamer.noPID());
-
-		logFileNamer.setAppender("Append");
-		assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
-			dir.getCanonicalFile() + File.separator + "log-Append" + ending + "_0.log");
+    private File dir = new File(".");
 
-		logFileNamer.setAppender("Append");
-		assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
-			dir.getCanonicalFile() + File.separator + "log-Append" + ending + "_1.log");
-	}
+    @Before
+    public void setUp() throws Exception {
+    }
 
-	@Test
-	public void testBlankRoot() throws IOException {
-		LogFileNamer logFileNamer = new LogFileNamer(dir.getCanonicalPath(), "");
-		assertEquals(logFileNamer, logFileNamer.noPID());
+    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();
+        };
+    }
 
-		logFileNamer.setAppender("Append");
-		assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
-			dir.getCanonicalPath() + File.separator + "Append" + ending + "_0.log");
 
-		logFileNamer.setAppender("Append");
-		assertEquals(System.getProperty("LOG4J_FILENAME_Append"),
-			dir.getCanonicalPath() + File.separator + "Append" + ending + "_1.log");
-	}
+    @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);
+        }
+    }
 
-	@After
-	public void tearDown() throws IOException {
-		File file = new File("./log-Append" + ending + "_0.log");
-		if (file.exists()) {
-			Files.delete(Paths.get(file.getAbsolutePath()));
-		}
-		file = new File("./log-Append" + ending + "_1.log");
-		if (file.exists()) {
-			Files.delete(Paths.get(file.getAbsolutePath()));
-		}
-		file = new File("./Append" + ending + "_0.log");
-		if (file.exists()) {
-			Files.delete(Paths.get(file.getAbsolutePath()));
-		}
-		file = new File("./Append" + ending + "_1.log");
-		if (file.exists()) {
-			Files.delete(Paths.get(file.getAbsolutePath()));
-		}
-	}
+    @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);
+        }
+    }
 
 }