Author: mrdon
Date: Thu Oct 25 03:01:04 2007
New Revision: 588186
URL: http://svn.apache.org/viewvc?rev=588186&view=rev
Log:
Cleaning up logging during unit tests WW-1715
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java?rev=588186&r1=588185&r2=588186&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsTestCase.java
Thu Oct 25 03:01:04 2007
@@ -20,18 +20,57 @@
*/
package org.apache.struts2;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.Map;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Formatter;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.util.StrutsTestCaseHelper;
import com.opensymphony.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import com.opensymphony.xwork2.util.logging.jdk.JdkLoggerFactory;
/**
* Base test case for JUnit testing Struts.
*/
public abstract class StrutsTestCase extends XWorkTestCase {
+ static {
+ ConsoleHandler handler = new ConsoleHandler();
+ final SimpleDateFormat df = new SimpleDateFormat("mm:ss.SSS");
+ Formatter formatter = new Formatter() {
+ @Override
+ public String format(LogRecord record) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(record.getLevel());
+ sb.append(':');
+ for (int x=9-record.getLevel().toString().length(); x>0; x--) {
+ sb.append(' ');
+ }
+ sb.append('[');
+ sb.append(df.format(new Date(record.getMillis())));
+ sb.append("] ");
+ sb.append(formatMessage(record));
+ sb.append('\n');
+ return sb.toString();
+ }
+ };
+ handler.setFormatter(formatter);
+ Logger logger = Logger.getLogger("");
+ if (logger.getHandlers().length > 0)
+ logger.removeHandler(logger.getHandlers ()[0]);
+ logger.addHandler(handler);
+ logger.setLevel(Level.WARNING);
+ LoggerFactory.setLoggerFactory(new JdkLoggerFactory());
+ }
+
/**
* Sets up the configuration settings, XWork configuration, and
* message resources
