curcuru 01/08/03 12:07:17
Modified: test/java/src/org/apache/qetest/xsl XHTFileCheckService.java
Log:
Automatically logs message with basic information on non-Passes
about why it failed or was ambiguous; either at WARNINGMSG or ERRORMSG
Revision Changes Path
1.6 +20 -8
xml-xalan/test/java/src/org/apache/qetest/xsl/XHTFileCheckService.java
Index: XHTFileCheckService.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XHTFileCheckService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XHTFileCheckService.java 2001/02/09 00:35:05 1.5
+++ XHTFileCheckService.java 2001/08/03 19:07:17 1.6
@@ -69,12 +69,13 @@
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.util.Hashtable;
/**
* Uses an XML/HTML/Text diff comparator to check or diff two files.
* @see #check(Logger logger, Object actual, Object reference, String msg,
String id)
* @author [EMAIL PROTECTED]
- * @version $Id: XHTFileCheckService.java,v 1.5 2001/02/09 00:35:05 curcuru
Exp $
+ * @version $Id: XHTFileCheckService.java,v 1.6 2001/08/03 19:07:17 curcuru
Exp $
*/
public class XHTFileCheckService implements CheckService
{
@@ -145,18 +146,22 @@
// Fail if Actual file doesn't exist or is 0 len
if ((!actualFile.exists()) || (actualFile.length() == 0))
{
- logger.checkFail(msg, id);
- pw.println("actual(" + actualFile.toString() + ") did not exist
or was 0 len");
+ String errMsg = "actual(" + actualFile.toString() + ") did not
exist or was 0 len";
+ logger.logMsg(Logger.WARNINGMSG, errMsg);
+ pw.println(errMsg);
pw.flush();
+ logger.checkFail(msg, id);
return logger.FAIL_RESULT;
}
// Ambiguous if gold file doesn't exist or is 0 len
if ((!referenceFile.exists()) || (referenceFile.length() == 0))
{
- logger.checkAmbiguous(msg, id);
- pw.println("reference(" + referenceFile.toString() + ") did not
exist or was 0 len");
+ String errMsg = "reference(" + referenceFile.toString() + ") did
not exist or was 0 len";
+ logger.logMsg(Logger.WARNINGMSG, errMsg);
+ pw.println(errMsg);
pw.flush();
+ logger.checkAmbiguous(msg, id);
return Logger.AMBG_RESULT;
}
@@ -177,6 +182,7 @@
catch (Throwable t)
{
// Add any exception info to pw/sw
+ logger.logThrowable(Logger.ERRORMSG, t, "XHTFileCheckService
threw");
pw.println("XHTFileCheckService threw: " + t.toString());
t.printStackTrace(pw);
isEqual = false;
@@ -184,11 +190,17 @@
if (!isEqual)
{
- // We fail, obviously!
- logger.checkFail(msg, id);
pw.println("XHTFileCheckService files were not equal");
pw.flush();
-
+ // We fail, obviously! Bunch up info for logging
+ // a special element about fail
+ Hashtable attrs = new Hashtable();
+ attrs.put("actual", actualFile.toString());
+ attrs.put("reference", referenceFile.toString());
+ attrs.put("reportedBy", "XHTFileCheckService");
+ String elementBody = msg + "(" + id + ") \n" + sw.toString();
+ logger.logElement(Logger.STATUSMSG, "fileCheck", attrs,
elementBody);
+ logger.checkFail(msg, id);
return Logger.FAIL_RESULT;
}
else if (warning[0])
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
