svn commit: r1305216 - in /logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender: FileAppenderTest.java OutputStreamAppenderTest.java

[rgoers]

Author: rgoers
Date: Mon Mar 26 04:41:28 2012
New Revision: 1305216

URL: http://svn.apache.org/viewvc?rev=1305216&view=rev
Log:
Fix FileAppenderTest and OutputStreamAppenderTest on Windows

Modified:
    
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
    
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java

Modified: 
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java?rev=1305216&r1=1305215&r2=1305216&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
 Mon Mar 26 04:41:28 2012
@@ -133,7 +133,7 @@ public class FileAppenderTest {
             while ((line = br.readLine()) != null) {
                 System.out.println(line);
             }
-
+            is.close();
             p.destroy();
         }
         verifyFile(count * processes);
@@ -164,7 +164,8 @@ public class FileAppenderTest {
         //String expected = "[\\w]* \\[\\s*\\] INFO TestLogger - Test$";
         String expected = "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{3} 
\\[[^\\]]*\\] INFO TestLogger - Test";
         Pattern pattern = Pattern.compile(expected);
-        DataInputStream is = new DataInputStream(new BufferedInputStream(new 
FileInputStream(FILENAME)));
+        FileInputStream fis = new FileInputStream(FILENAME);
+        DataInputStream is = new DataInputStream(new BufferedInputStream(fis));
         int counter = 0;
         String str = "";
         while (is.available() != 0) {
@@ -174,6 +175,7 @@ public class FileAppenderTest {
             Matcher matcher = pattern.matcher(str);
             assertTrue("Bad data: " + str, matcher.matches());
         }
+        fis.close();
         assertTrue("Incorrect count: was " + counter + " should be " + count, 
count == counter);
 
     }
@@ -182,7 +184,7 @@ public class FileAppenderTest {
     private static void deleteFile() {
         File file = new File(FILENAME);
         if (file.exists()) {
-            file.delete();
+            assertTrue(file.delete());
         }
     }
 

Modified: 
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java?rev=1305216&r1=1305215&r2=1305216&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
 Mon Mar 26 04:41:28 2012
@@ -46,8 +46,9 @@ public class OutputStreamAppenderTest {
         assertTrue("Appender did not start", app.isStarted());
         app.append(event);
         String msg = app.toString();
+        System.out.println("\"" + msg + "\"");
         assertNotNull("No message", msg);
-        assertTrue("Incorrect message: " + msg , msg.endsWith("Test\n"));
+        assertTrue("Incorrect message: " + msg , msg.endsWith("Test\n") || 
msg.endsWith("Test\r\n"));
         app.stop();
         assertFalse("Appender did not stop", app.isStarted());
     }