using a special Layout instance to make sure this test is more robust

Author: Constantino Cronemberger

src/test/java/org/owasp/esapi/reference/Log4JLoggerTest.java

@@ -15,23 +15,24 @@
  */
 package org.owasp.esapi.reference;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Arrays;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-
-import org.apache.log4j.*;
-import org.apache.log4j.xml.XMLLayout;
+import org.apache.log4j.Appender;
+import org.apache.log4j.Layout;
+import org.apache.log4j.WriterAppender;
+import org.apache.log4j.spi.LoggingEvent;
 import org.owasp.esapi.ESAPI;
 import org.owasp.esapi.Logger;
 import org.owasp.esapi.errors.AuthenticationException;
 import org.owasp.esapi.errors.ValidationException;
 import org.owasp.esapi.http.MockHttpServletRequest;
 import org.owasp.esapi.http.MockHttpServletResponse;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Arrays;
+
 /**
  * The Class LoggerTest.
  * 
@@ -468,17 +469,30 @@ public void testAlways() {
 	 * Line number must be the line of the caller and not of the wrapper.
 	 */
 	public void testLine() {
+		final String message = "testing only";
 		StringWriter sw = new StringWriter();
-		Layout layout = new PatternLayout("%d{ISO8601}%5p [%t] %C:%L - %m%n");
+		Layout layout = new Layout() {
+			@Override
+			public String format(LoggingEvent event) {
+				assertEquals("the calling class is this test class", Log4JLoggerTest.class.getName(),event.getLocationInformation().getClassName());
+				return message;
+			}
+
+			@Override
+			public boolean ignoresThrowable() {
+				return false;
+			}
+
+			@Override
+			public void activateOptions() {
+
+			}
+		};
 		Appender appender = new WriterAppender(layout, sw);
 		log4JLogger.addAppender(appender);
 		try {
 			log4JLogger.fatal("testLine");
-			String generatedLine = sw.toString();
-			System.out.println("-> " + generatedLine + " <-");
-			assertTrue("generated line should not have the name of the wrapper class",
-					// need to add the ":" sufix otherwise the test would also fail with this test class name
-					!generatedLine.contains(Log4JLogger.class.getName()+":"));
+			assertEquals("message not generated as expected", message, sw.toString());
 		} finally {
 			log4JLogger.removeAppender(appender);
 		}