curcuru 01/03/22 11:55:40
Modified: test/java/src/org/apache/qetest/xsl XSLTestHarness.java
Log:
Use new Reporter.writeResultsStatus the same way as XSLProcessorTestBase does;
other minor logging cleanup
Revision Changes Path
1.3 +17 -6
xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestHarness.java
Index: XSLTestHarness.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XSLTestHarness.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSLTestHarness.java 2000/12/15 15:40:00 1.2
+++ XSLTestHarness.java 2001/03/22 19:55:39 1.3
@@ -88,7 +88,7 @@
* user doesn't call testCaseClose (where do results go?)
* @todo report on memory usage, etc.
* @author [EMAIL PROTECTED]
- * @version $Id: XSLTestHarness.java,v 1.2 2000/12/15 15:40:00 curcuru Exp $
+ * @version $Id: XSLTestHarness.java,v 1.3 2001/03/22 19:55:39 curcuru Exp $
*/
public class XSLTestHarness
{
@@ -226,6 +226,7 @@
// default package - otherwise assume it's FQCN
// thus 'trax.TransformerAPITest' becomes
// 'org.apache.qetest.trax.TransformerAPITest'
+ //@todo use QetestUtils.testClassForName instead!
if (s.startsWith("org"))
{
// Assume user specified complete package.ClassName
@@ -281,7 +282,7 @@
// Note that we're hackishly re-using the 'test' metaphor
// on a grand scale here, where each of the harness'
// testCases corresponds to one entire Test
- reporter.testFileInit("XSLTestHarness", "Harness executing " +
testList.length + " tests");
+ reporter.testFileInit("Harness", "Harness executing " +
testList.length + " tests");
logHarnessProps();
// Note 'passCount' is poorly named: a test may fail but
@@ -318,7 +319,12 @@
// Only for information; remember that the runTest status is not the
pass/fail of the test!
reporter.logCriticalMsg("All tests complete, testStatOK:" +
passCount + " testStatNOTOK:" + nonPassCount);
- // Close out our reporter and report pass only if all tests passed
+ // Have the reporter write out a summary file for us
+ reporter.writeResultsStatus(true);
+
+ // Close reporter and return true only if all tests passed
+ // Note the passCount/nonPassCount are misnomers, since they
+ // really only report if a test aborted, not passed
reporter.testFileClose();
if ((passCount < 0) && (nonPassCount == 0))
return true;
@@ -359,6 +365,7 @@
for (bareClassName = st.nextToken(); st.hasMoreTokens();
bareClassName = st.nextToken())
{ /* empty loop body */
}
+ st = null; // no longer needed
// Validate that the output directory exists for the test to put
it's results in
String testOutDir = hProps.getProperty(FileBasedTest.OPT_OUTPUTDIR);
@@ -408,7 +415,7 @@
// Disable the ConsoleReporter for the *individual* tests, it's too
confusing
testProps.put("noDefaultReporter", "true");
- reporter.logHashtable(reporter.STATUSMSG, testProps, "testProps
before test creation");
+ reporter.logHashtable(reporter.INFOMSG, testProps, "testProps before
test creation");
// Initialize the test with the properties we created
test.setProperties(testProps);
@@ -422,9 +429,13 @@
// Report where the test stored it's results - future use
// by multiViewResults.xsl or some other rolledup report
- Hashtable h = new Hashtable(1);
+ // Note we should really handle the filenames here better,
+ // especially for relative vs. absolute issues
+ Hashtable h = new Hashtable(2);
+ h.put("result",
reporter.resultToString(test.getReporter().getCurrentFileResult()));
h.put("fileRef", (String)testProps.get(Logger.OPT_LOGFILE));
- reporter.logElement(reporter.WARNINGMSG, "resultsfile", h, null);
+ reporter.logElement(reporter.WARNINGMSG, "resultsfile", h,
test.getTestDescription());
+ h = null; // no longer needed
// Call worker method to actually calculate the result and call
check*()
logTestResult(bareClassName,
test.getReporter().getCurrentFileResult(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
