You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/10/26 19:10:12 UTC

svn commit: r328684 [1/2] - in /beehive/trunk/netui: src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/ src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/schemas/ src/testRecorder/org/apache/beehive/netui/tools/testr...

Author: ekoneil
Date: Wed Oct 26 10:09:59 2005
New Revision: 328684

URL: http://svn.apache.org/viewcvs?rev=328684&view=rev
Log:
Move the test recorder off of XMLBeans for the testRecorderDiffSession.xsd file.

Also cleanup some code and rewrite the test recorder logger to break the dependence on Log4J.

BB: self
Test: NetUI pass / diffs work correctly when tests fail


Added:
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/schemas/testRecorderDiffSession.xsd
      - copied unchanged from r328474, beehive/trunk/netui/src/testRecorder/schema/testRecorderDiffSession.xsd
Removed:
    beehive/trunk/netui/src/testRecorder/schema/testRecorderDiffSession.xsd
Modified:
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/DiffFailedException.java
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/NVPair.java
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/PlaybackSessionBean.java
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RecordSessionBean.java
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Reporter.java
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RequestData.java
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/ResponseData.java
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionXMLException.java
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/TestResults.java
    beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/xmlbeans/XMLHelper.java
    beehive/trunk/netui/test/webapps/drt/build.xml

Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/DiffFailedException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/DiffFailedException.java?rev=328684&r1=328683&r2=328684&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/DiffFailedException.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/DiffFailedException.java Wed Oct 26 10:09:59 2005
@@ -15,15 +15,12 @@
  *
  * $Header:$
  */
-
 package org.apache.beehive.netui.tools.testrecorder.shared;
 
 /**
- * User: ozzy
- * Date: Mar 16, 2004
- * Time: 11:12:06 AM
  */
-public class DiffFailedException extends Exception {
+public class DiffFailedException
+    extends Exception {
 
     public DiffFailedException() {
         super();

Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java?rev=328684&r1=328683&r2=328684&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Logger.java Wed Oct 26 10:09:59 2005
@@ -22,141 +22,113 @@
 import java.io.StringWriter;
 
 import org.apache.commons.logging.Log;
-import org.apache.log4j.Level;
 
 public class Logger
     implements Log {
 
-    private static final String STRUTS_APPENDER = "commons-logging";
-
-    public static Logger getInstance( Class clazz ) {
-        return new Logger( clazz );
+    public static Logger getInstance(Class loggerClient) {
+        return new Logger(org.apache.commons.logging.LogFactory.getLog(loggerClient.getName()));
     }
 
-    private org.apache.log4j.Logger logInstance;
+    private Log _logDelegate = null;
 
-    public Logger( Class clazz ) {
-        logInstance = org.apache.log4j.Logger.getLogger( clazz.getName() );
+    public Logger(Log logDelegate) {
+        _logDelegate = logDelegate;
     }
 
     public boolean isDebugEnabled() {
-        return logInstance.isEnabledFor( Level.DEBUG );
+        return _logDelegate.isDebugEnabled();
     }
 
     public boolean isErrorEnabled() {
-        return logInstance.isEnabledFor( Level.ERROR );
+        return _logDelegate.isErrorEnabled();
     }
 
     public boolean isFatalEnabled() {
-        return logInstance.isEnabledFor( Level.FATAL );
+        return _logDelegate.isFatalEnabled();
     }
 
     public boolean isInfoEnabled() {
-        return logInstance.isEnabledFor( Level.INFO );
+        return _logDelegate.isInfoEnabled();
     }
 
     public boolean isTraceEnabled() {
-        return logInstance.isEnabledFor( Level.DEBUG );
+        return _logDelegate.isTraceEnabled();
     }
 
     public boolean isWarnEnabled() {
-        return logInstance.isEnabledFor( Level.WARN );
+        return _logDelegate.isWarnEnabled();
     }
 
     public void debug( Object message ) {
-        if ( logInstance.isEnabledFor( Level.DEBUG ) ) {
-            logInstance.debug( message );
-        }
+        if(isDebugEnabled())
+            _logDelegate.debug(message);
     }
 
-    public void debug( Object message, Throwable t ) {
-        if ( logInstance.isEnabledFor( Level.DEBUG ) ) {
-            logInstance.debug( format( message, t ) );
-        }
+    public void debug(Object message, Throwable t) {
+        if(isDebugEnabled())
+            _logDelegate.debug(format(message, t));
     }
 
-    public void trace( Object message ) {
-        if ( logInstance.isEnabledFor( Level.DEBUG ) ) {
-            logInstance.debug( message );
-        }
+    public void trace(Object message) {
+        if(isTraceEnabled())
+            _logDelegate.trace(message);
     }
 
-    public void trace( Object message, Throwable t ) {
-        if ( logInstance.isEnabledFor( Level.DEBUG ) ) {
-            logInstance.debug( format( message, t ) );
-        }
+    public void trace(Object message, Throwable t) {
+        if(isTraceEnabled())
+            _logDelegate.trace(format(message, t));
     }
 
-    public void info( Object message ) {
-        if ( logInstance.isEnabledFor( Level.INFO ) ) {
-            logInstance.info( message );
-        }
+    public void info(Object message) {
+        if(isInfoEnabled())
+            _logDelegate.info(message);
     }
 
-    public void info( Object message, Throwable t ) {
-        if ( logInstance.isEnabledFor( Level.INFO ) ) {
-            logInstance.info( format( message, t ) );
-        }
+    public void info(Object message, Throwable t) {
+        if(isInfoEnabled())
+            _logDelegate.info(format(message, t));
     }
 
-    public void warn( Object message ) {
-        if ( logInstance.isEnabledFor( Level.WARN ) ) {
-            logInstance.warn( message );
-        }
+    public void warn(Object message) {
+        if(isWarnEnabled())
+            _logDelegate.warn(message);
     }
 
-    public void warn( Object message, Throwable t ) {
-        if ( logInstance.isEnabledFor( Level.WARN ) ) {
-            logInstance.warn( format( message, t ) );
-        }
+    public void warn(Object message, Throwable t) {
+        if(isWarnEnabled())
+            _logDelegate.warn(format(message, t));
     }
 
-    public void error( Object message ) {
-        if ( logInstance.isEnabledFor( Level.ERROR ) ) {
-            logInstance.error( message );
-        }
+    public void error(Object message) {
+        if(isErrorEnabled())
+            _logDelegate.error(message);
     }
 
-    public void error( Object message, Throwable t ) {
-        if ( logInstance.isEnabledFor( Level.ERROR ) ) {
-            logInstance.error( format( message, t ) );
-        }
+    public void error(Object message, Throwable t) {
+        if(isErrorEnabled())
+            _logDelegate.error(format(message, t));
     }
 
-    public void fatal( Object message ) {
-        if ( logInstance.isEnabledFor( Level.FATAL ) ) {
-            logInstance.fatal( message );
-        }
+    public void fatal(Object message) {
+        if(isFatalEnabled())
+            _logDelegate.fatal(message);
     }
 
-    public void fatal( Object message, Throwable t ) {
-        if ( logInstance.isEnabledFor( Level.FATAL ) ) {
-            logInstance.fatal( format( message, t ) );
-        }
+    public void fatal(Object message, Throwable t) {
+        if(isFatalEnabled())
+            _logDelegate.fatal(format(message, t));
     }
 
-    public static String format( final Object obj, final Throwable t ) {
-        if ( t == null ) {
-            return obj.toString();
-        }
-        Throwable ex = t;
-        StringBuffer sb = new StringBuffer( 512 );
-        sb.append( "object( " + obj + " )\n" );
-        while ( ex != null ) {
-            sb.append( format( ex ) + "\n");
-            ex = ex.getCause();
-        }
-        return sb.toString();
-    }
+    public static String format(Object m, Throwable t) {
+        if(t == null)
+            return m.toString();
 
-    public static String format( Throwable t ) {
-        if ( t == null ) {
-            return "NULL";
-        }
         StringWriter sw = new StringWriter();
-        t.printStackTrace( new PrintWriter( sw ) );
-        return "throwable: msg( " + t.getMessage() + " )\ntoString( " + t.toString() +
-                " )\nstack trace:\n" + sw.toString();
-    }
+        t.printStackTrace(new PrintWriter(sw));
 
+        /* note, no reason to close a StringWriter */
+
+        return m + "\n\n" + "Throwable: " + t.toString() + "\nStack Trace:\n" + sw.toString();
+    }
 }

Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/NVPair.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/NVPair.java?rev=328684&r1=328683&r2=328684&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/NVPair.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/NVPair.java Wed Oct 26 10:09:59 2005
@@ -15,24 +15,19 @@
  *
  * $Header:$
  */
-
 package org.apache.beehive.netui.tools.testrecorder.shared;
 
 /**
- * User: ozzy
- * Date: Jun 15, 2004
- * Time: 9:48:04 AM
  */
-
 public class NVPair {
 
     private String name;
     private String value;
 
     public NVPair( String name, String value ) {
-        if ( name == null || value == null ) {
+        if ( name == null || value == null )
             throw new RuntimeException( "name( " + name + " ) and value( " + value + " ) must not be null." );
-        }
+
         this.name = name;
         this.value = value;
     }
@@ -46,17 +41,15 @@
     }
 
     public boolean equals( Object object ) {
-        if ( this == object ) {
+        if ( this == object )
             return true;
-        }
-        else if ( object == null || getClass() != object.getClass() ) {
+        else if ( object == null || getClass() != object.getClass() )
             return false;
-        }
+
         NVPair other = (NVPair) object;
-        if ( this.getName().equals( other.getName() ) && this.getValue().equals( other.getValue() ) ) {
+        if ( this.getName().equals( other.getName() ) && this.getValue().equals( other.getValue() ) )
             return true;
-        }
-        return false;
+        else return false;
     }
 
     public String toString () {

Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/PlaybackSessionBean.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/PlaybackSessionBean.java?rev=328684&r1=328683&r2=328684&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/PlaybackSessionBean.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/PlaybackSessionBean.java Wed Oct 26 10:09:59 2005
@@ -15,7 +15,6 @@
  *
  * $Header:$
  */
-
 package org.apache.beehive.netui.tools.testrecorder.shared;
 
 import java.util.List;
@@ -105,7 +104,7 @@
     public boolean isSessionPassed() {
         if (isError())
             return false;
-        
+
         return _passedCount == getRecordedTestCount();
     }
 

Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RecordSessionBean.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RecordSessionBean.java?rev=328684&r1=328683&r2=328684&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RecordSessionBean.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RecordSessionBean.java Wed Oct 26 10:09:59 2005
@@ -15,7 +15,6 @@
  *
  * $Header:$
  */
-
 package org.apache.beehive.netui.tools.testrecorder.shared;
 
 import java.util.List;
@@ -85,9 +84,9 @@
      * @param response
      */
     public void updateRequestResponseData(RequestData request, ResponseData response) {
-        if (_requestData.size() == 0 || _responseData.size() == 0) {
+        if (_requestData.size() == 0 || _responseData.size() == 0)
             throw new IllegalStateException("data size is zero, unable to update");
-        }
+
         _requestData.set(_requestData.size() - 1, request);
         _responseData.add(_responseData.size() - 1, response);
     }

Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Reporter.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Reporter.java?rev=328684&r1=328683&r2=328684&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Reporter.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/Reporter.java Wed Oct 26 10:09:59 2005
@@ -15,7 +15,6 @@
  *
  * $Header:$
  */
-
 package org.apache.beehive.netui.tools.testrecorder.shared;
 
 import java.io.IOException;
@@ -26,16 +25,14 @@
 import org.apache.beehive.netui.tools.testrecorder.shared.xmlbeans.XMLHelper;
 import org.apache.beehive.netui.tools.testrecorder.server.TestRecorderServlet;
 
-
 public class Reporter {
 
-    private static final Logger log = Logger.getInstance( TestRecorderServlet.class );
-
     public static String genDetails( RecordSessionBean bean ) {
         return formatDetails( bean );
     }
 
-    public static String genDiffDetails( File diffFile ) throws IOException, SessionXMLException {
+    public static String genDiffDetails( File diffFile )
+        throws IOException, SessionXMLException {
         List results = XMLHelper.getDiffResults( diffFile );
         StringBuffer sb = new StringBuffer( results.size() * 128 );
         TestResults testResults = null;
@@ -66,6 +63,22 @@
         return sb.toString();
     }
 
+    public static String escape( String in ) {
+        char[] c = in.toCharArray();
+        return escape( c, in.length() );
+    }
+    public static String escape( char[] c, int size ) {
+        StringBuffer sb = new StringBuffer();
+        for ( int i = 0; i < size; i++ ) {
+            if ( c[i] == '<' ) {
+                sb.append( "&lt;" );
+                continue;
+            }
+            sb.append( c[i] );
+        }
+        return sb.toString();
+    }
+
     private static String formatDetails( RecordSessionBean bean ) {
         StringBuffer sb = new StringBuffer();
         // the header information
@@ -167,21 +180,4 @@
     private static String getRecordMarker() {
         return "<b>R:</b>";
     }
-
-    public static String escape( String in ) {
-        char[] c = in.toCharArray();
-        return escape( c, in.length() );
-    }
-    public static String escape( char[] c, int size ) {
-        StringBuffer sb = new StringBuffer();
-        for ( int i = 0; i < size; i++ ) {
-            if ( c[i] == '<' ) {
-                sb.append( "&lt;" );
-                continue;
-            }
-            sb.append( c[i] );
-        }
-        return sb.toString();
-    }
-
 }

Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RequestData.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RequestData.java?rev=328684&r1=328683&r2=328684&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RequestData.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/RequestData.java Wed Oct 26 10:09:59 2005
@@ -15,7 +15,6 @@
  *
  * $Header:$
  */
-
 package org.apache.beehive.netui.tools.testrecorder.shared;
 
 import java.io.UnsupportedEncodingException;
@@ -24,18 +23,13 @@
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
-
-// J2EE dependencies
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.Cookie;
 
-
 /**
  * This class has a dependency on javax.servlet.http
  */
 public class RequestData {
-
-    private static final Logger log = Logger.getInstance( RequestData.class );
 
     private String protocol;
     private String protocolVersion;

Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/ResponseData.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/ResponseData.java?rev=328684&r1=328683&r2=328684&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/ResponseData.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/ResponseData.java Wed Oct 26 10:09:59 2005
@@ -15,7 +15,6 @@
  *
  * $Header:$
  */
-
 package org.apache.beehive.netui.tools.testrecorder.shared;
 
 import java.text.DecimalFormat;
@@ -26,20 +25,17 @@
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 
-
 public class ResponseData {
 
-    private static final Logger log = Logger.getInstance( ResponseData.class );
-
     public static final String NON_UNIQUE_SESSION_ID = "";
     public static final String NON_UNIQUE_HOST = "@NON_UNIQUE_HOST@";
     public static final String NON_UNIQUE_PORT = "@NON_UNIQUE_PORT@";
+
     private static final String COLON = ":";
     private static final String HTTP = "http://";
     private static final String HTTPS = "https://";
 
-    private static final DecimalFormat format = (DecimalFormat)
-            NumberFormat.getInstance( Locale.US );
+    private static final DecimalFormat format = (DecimalFormat)NumberFormat.getInstance(Locale.US);
 
     static {
         // we just want the integer portion
@@ -55,7 +51,6 @@
     private Map headerMap;
     // non-normalized
     private String body;
-
 
     public ResponseData( String host, int port ) {
         this.host = host;

Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionXMLException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionXMLException.java?rev=328684&r1=328683&r2=328684&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionXMLException.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/SessionXMLException.java Wed Oct 26 10:09:59 2005
@@ -15,15 +15,12 @@
  *
  * $Header:$
  */
-
 package org.apache.beehive.netui.tools.testrecorder.shared;
 
 /**
- * User: ozzy
- * Date: Mar 16, 2004
- * Time: 11:12:06 AM
  */
-public class SessionXMLException extends Exception {
+public class SessionXMLException
+    extends Exception {
 
     public SessionXMLException() {
         super();

Modified: beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/TestResults.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/TestResults.java?rev=328684&r1=328683&r2=328684&view=diff
==============================================================================
--- beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/TestResults.java (original)
+++ beehive/trunk/netui/src/testRecorder/org/apache/beehive/netui/tools/testrecorder/shared/TestResults.java Wed Oct 26 10:09:59 2005
@@ -15,14 +15,12 @@
  *
  * $Header:$
  */
-
 package org.apache.beehive.netui.tools.testrecorder.shared;
 
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
 
-
 public class TestResults {
 
     private String uri;
@@ -79,22 +77,20 @@
     }
 
     public void addDiffResult( String result, final boolean error ) {
-        if ( error ) {
+        if ( error )
             this.error = true;
-        }
+
         testPassed = false;
-        if ( diffResults == null ) {
+        if ( diffResults == null )
             diffResults = new ArrayList();
-        }
+        
         diffResults.add( result );
     }
 
-    // may return null.
     public List getDiffResults() {
-        if ( diffResults == null ) {
+        if ( diffResults == null )
             return null;
-        }
-        return Collections.unmodifiableList( diffResults );
+        else return Collections.unmodifiableList( diffResults );
     }
 
     public String toString() {