You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2002/07/28 15:38:41 UTC
cvs commit: jakarta-cactus/framework/src/java/share/org/apache/cactus/util StringUtil.java
vmassol 2002/07/28 06:38:41
Modified: framework/src/java/share/org/apache/cactus/server/runner
XMLFormatter.java
Added: framework/src/java/share/org/apache/cactus/util
StringUtil.java
Log:
fixed issues with JUnit (I must have been using a non-offical version of junit.jar somehow as it was wokring before ... !?). Anyway, it now works with any version of JUnit ...
Revision Changes Path
1.4 +11 -5 jakarta-cactus/framework/src/java/share/org/apache/cactus/server/runner/XMLFormatter.java
Index: XMLFormatter.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share/org/apache/cactus/server/runner/XMLFormatter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLFormatter.java 21 Jul 2002 12:09:16 -0000 1.3
+++ XMLFormatter.java 28 Jul 2002 13:38:41 -0000 1.4
@@ -64,6 +64,7 @@
import junit.framework.TestListener;
import junit.framework.AssertionFailedError;
import org.apache.cactus.util.JUnitVersionHelper;
+import org.apache.cactus.util.StringUtil;
/**
* Format the test results in XML.
@@ -222,9 +223,11 @@
StringBuffer xml = new StringBuffer();
xml.append("<" + ERROR + " " + ATTR_MESSAGE + "=\""
- + xmlEncode(failure.exceptionMessage()) + "\" " + ATTR_TYPE + "=\""
+ + xmlEncode(failure.thrownException().getMessage()) + "\" "
+ + ATTR_TYPE + "=\""
+ failure.thrownException().getClass().getName() + "\">");
- xml.append(xmlEncode(failure.trace()));
+ xml.append(xmlEncode(
+ StringUtil.exceptionToString(failure.thrownException())));
xml.append("</" + ERROR + ">");
this.currentTestFailure = xml.toString();
@@ -242,9 +245,11 @@
StringBuffer xml = new StringBuffer();
xml.append("<" + FAILURE + " " + ATTR_MESSAGE + "=\""
- + xmlEncode(failure.exceptionMessage()) + "\" " + ATTR_TYPE + "=\""
+ + xmlEncode(failure.thrownException().getMessage())
+ + "\" " + ATTR_TYPE + "=\""
+ failure.thrownException().getClass().getName() + "\">");
- xml.append(xmlEncode(failure.trace()));
+ xml.append(xmlEncode(
+ StringUtil.exceptionToString(failure.thrownException())));
xml.append("</" + FAILURE + ">");
this.currentTestFailure = xml.toString();
@@ -290,6 +295,7 @@
newString = XMLFormatter.replace(newString, '<', "<");
newString = XMLFormatter.replace(newString, '>', ">");
+ newString = XMLFormatter.replace(newString, '\"', """);
return newString;
}
1.1 jakarta-cactus/framework/src/java/share/org/apache/cactus/util/StringUtil.java
Index: StringUtil.java
===================================================================
/*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Cactus" and "Apache Software
* Foundation" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.cactus.util;
import java.io.StringWriter;
import java.io.PrintWriter;
/**
* Various utility methods for string manipulation.
*
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
*
* @version $Id: StringUtil.java,v 1.1 2002/07/28 13:38:41 vmassol Exp $
*/
public class StringUtil
{
/**
* @param theThrowable the exception from which to extract the stack trace
* as a String
* @return the exception stack trace as a String
*/
public static String exceptionToString(Throwable theThrowable)
{
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
theThrowable.printStackTrace(pw);
return sw.toString();
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>