curcuru 02/02/05 10:59:00
Modified: test/java/src/org/apache/qetest/xsl
ThreadedStylesheetTestlet.java
Log:
Remove extraneous logging of fileref elements;
fileChecker should now output most of that for us
Revision Changes Path
1.3 +9 -52
xml-xalan/test/java/src/org/apache/qetest/xsl/ThreadedStylesheetTestlet.java
Index: ThreadedStylesheetTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/ThreadedStylesheetTestlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ThreadedStylesheetTestlet.java 21 Jun 2001 19:19:37 -0000 1.2
+++ ThreadedStylesheetTestlet.java 5 Feb 2002 18:59:00 -0000 1.3
@@ -91,7 +91,7 @@
* of calling execute(). @todo find a better way to integrate!
*
* @author [EMAIL PROTECTED]
- * @version $Id: ThreadedStylesheetTestlet.java,v 1.2 2001/06/21 19:19:37 curcuru
Exp $
+ * @version $Id: ThreadedStylesheetTestlet.java,v 1.3 2002/02/05 18:59:00 curcuru
Exp $
*/
public class ThreadedStylesheetTestlet
extends TestletImpl
@@ -350,31 +350,10 @@
// Supply default value
if (null == fileChecker)
fileChecker = new XHTFileCheckService();
- if (Logger.PASS_RESULT
- != fileChecker.check(logger,
- new File(datalet.outputName + "-" +
threadIdentifier),
- new File(datalet.goldName),
- "Shared Templates of: " +
datalet.getDescription())
- )
- {
- // Log a custom element with all the file refs first
- // Closely related to viewResults.xsl select='fileref"
- //@todo check that these links are valid when base
- // paths are either relative or absolute!
- Hashtable attrs = new Hashtable();
- attrs.put("inputName", "Shared Templates");
- attrs.put("xmlName", datalet.xmlName);
- attrs.put("outputName", datalet.outputName + "-" +
threadIdentifier);
- attrs.put("goldName", datalet.goldName);
- logger.logElement(Logger.STATUSMSG, "fileref", attrs, "Conformance
test file references2");
- // Then log the failure reason
- logger.logArbitrary(Logger.STATUSMSG, (new
File(datalet.inputName)).getName()
- + " failure reason: " +
fileChecker.getExtendedInfo());
- // Also force our result to fail (Note: we should really
- // use a Reporter to track our status, since this might
- // just be AMBG or ERRR instead of FAIL)
- result = Logger.FAIL_RESULT;
- }
+ fileChecker.check(logger,
+ new File(datalet.outputName + "-" +
threadIdentifier),
+ new File(datalet.goldName),
+ "Shared Templates of: " + datalet.getDescription());
}
// Note that this class can only validate positive test
// cases - we don't handle ExpectedExceptions
@@ -452,32 +431,10 @@
// Supply default value
if (null == fileChecker)
fileChecker = new XHTFileCheckService();
- if (Logger.PASS_RESULT
- != fileChecker.check(logger,
- new File(datalet.outputName + "-" +
threadIdentifier),
- new File(datalet.goldName),
- getDescription() + " " +
datalet.getDescription())
- )
- {
- // Log a custom element with all the file refs first
- // Closely related to viewResults.xsl select='fileref"
- //@todo check that these links are valid when base
- // paths are either relative or absolute!
- Hashtable attrs = new Hashtable();
- attrs.put("idref", (new File(datalet.inputName)).getName());
- attrs.put("inputName", datalet.inputName);
- attrs.put("xmlName", datalet.xmlName);
- attrs.put("outputName", datalet.outputName + "-" +
threadIdentifier);
- attrs.put("goldName", datalet.goldName);
- logger.logElement(Logger.STATUSMSG, "fileref", attrs, "Conformance
test file references");
- // Then log the failure reason
- logger.logArbitrary(Logger.STATUSMSG, (new
File(datalet.inputName)).getName()
- + " failure reason: " +
fileChecker.getExtendedInfo());
- // Also force our result to fail (Note: we should really
- // use a Reporter to track our status, since this might
- // just be AMBG or ERRR instead of FAIL)
- result = Logger.FAIL_RESULT;
- }
+ fileChecker.check(logger,
+ new File(datalet.outputName + "-" +
threadIdentifier),
+ new File(datalet.goldName),
+ getDescription() + " " + datalet.getDescription())
}
// Note that this class can only validate positive test
// cases - we don't handle ExpectedExceptions
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
