curcuru 01/12/05 11:58:50
Modified: test/java/src/org/apache/qetest/xsl
XSLProcessorTestBase.java
Log:
Use new QetestFactory to create our fileChecker instead of
trying to do it ourself
Revision Changes Path
1.14 +10 -28
xml-xalan/test/java/src/org/apache/qetest/xsl/XSLProcessorTestBase.java
Index: XSLProcessorTestBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/XSLProcessorTestBase.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XSLProcessorTestBase.java 2001/11/08 20:15:34 1.13
+++ XSLProcessorTestBase.java 2001/12/05 19:58:50 1.14
@@ -95,7 +95,7 @@
* <li>runErr</li>
* </ul>
* @author [EMAIL PROTECTED]
- * @version $Id: XSLProcessorTestBase.java,v 1.13 2001/11/08 20:15:34
curcuru Exp $
+ * @version $Id: XSLProcessorTestBase.java,v 1.14 2001/12/05 19:58:50
curcuru Exp $
*/
public class XSLProcessorTestBase extends FileBasedTest
{
@@ -342,37 +342,19 @@
reporter.testFileInit(testName, testComment);
// Create a file-based CheckService for later use
- if (fileChecker == null)
+ if (null == fileChecker)
{
- try
+ if ((null != fileCheckerName) && (fileCheckerName.length() > 0))
{
- String[] testPackages =
- {
- "org.apache.qetest.xsl",
- "org.apache.qetest.trax",
- "org.apache.qetest.xalanj2",
- "org.apache.qetest.xalanj1",
- "org.apache.qetest"
- };
- // Use utility method to attempt to guess classnames
- // that are not fully specified, if needed
- Class fClass = QetestUtils.testClassForName(fileCheckerName,
- testPackages,
- fileCheckerName);
-
- fileChecker = (CheckService) fClass.newInstance();
-
- reporter.logTraceMsg("Using file-based CheckService: "
- + fileChecker);
+ // Use the user's specified class; if not available
+ // will return null which gets covered below
+ fileChecker = QetestFactory.newCheckService(reporter,
fileCheckerName);
}
- catch (Exception e)
+
+ if (null == fileChecker)
{
- reporter.logErrorMsg("Failed to create an instance of "
- + fileCheckerName + ": "
- + e.toString());
-
- // This could cause NullPointerExceptions for those
- // tests that rely on our fileChecker...
+ // If that didn't work, then ask for default one that does
files
+ fileChecker = QetestFactory.newCheckService(reporter,
QetestFactory.TYPE_FILES);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
