pauldick 01/11/16 13:20:30
Modified: c/Tests/Harness FileUtility.cpp FileUtility.hpp
Log:
Changed signature of analyzeResults
Revision Changes Path
1.23 +10 -6 xml-xalan/c/Tests/Harness/FileUtility.cpp
Index: FileUtility.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/FileUtility.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FileUtility.cpp 2001/11/09 19:28:16 1.22
+++ FileUtility.cpp 2001/11/16 21:20:29 1.23
@@ -1026,29 +1026,33 @@
// Returns: Void
*/
void
-FileUtility::analyzeResults(XalanTransformer& xalan, const XalanDOMString& base,
const XalanDOMString& resultsFile)
+FileUtility::analyzeResults(XalanTransformer& xalan, const XalanDOMString&
resultsFile)
{
XalanDOMString paramValue;
+ // Pass the results .xml file as a parameter to the stylesheet. It must be
wrapped in single
+ // quotes so that it is not considered an expression.
assign(paramValue, XalanDOMString("'"));
append(paramValue, resultsFile);
append(paramValue, XalanDOMString("'"));
+ // Set the parameter
xalan.setStylesheetParam(XalanDOMString("testfile"), paramValue);
-
+ // Generate the input and output file names.
const XalanDOMString theHTMLFile = generateFileName(resultsFile,"html");
- const XalanDOMString theStylesheet = base + XalanDOMString("\cconf.xsl");
- const XalanDOMString theXMLSource = base + XalanDOMString("\cconf.xml");
+ const XalanDOMString theStylesheet = data.testBase +
XalanDOMString("\cconf.xsl");
+ const XalanDOMString theXMLSource = data.testBase +
XalanDOMString("\cconf.xml");
+ // Create the InputSources and ResultTarget.
const XSLTInputSource xslInputSource(c_wstr(theStylesheet));
const XSLTInputSource xmlInputSource(c_wstr(theXMLSource));
const XSLTResultTarget resultFile(theHTMLFile);
-
+ // Do the transform, display the output HTML, or report any failure.
int result = xalan.transform(xmlInputSource, xslInputSource, resultFile);
if (!result)
- {
+ {
system(c_str(TranscodeToLocalCodePage(theHTMLFile)));
}
else
1.18 +2 -2 xml-xalan/c/Tests/Harness/FileUtility.hpp
Index: FileUtility.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/FileUtility.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FileUtility.hpp 2001/11/09 19:28:50 1.17
+++ FileUtility.hpp 2001/11/16 21:20:29 1.18
@@ -99,7 +99,7 @@
/**
* Utility call that extracts test file names from testsuite.
* @author Paul [EMAIL PROTECTED]
- * @version $Id: FileUtility.hpp,v 1.17 2001/11/09 19:28:50 pauldick Exp $
+ * @version $Id: FileUtility.hpp,v 1.18 2001/11/16 21:20:29 pauldick Exp $
*/
#if defined HARNESS_EXPORTS
@@ -308,7 +308,7 @@
FileUtility::reportPassFail(XMLFileReporter& logfile, const XalanDOMString&
runid);
void
- FileUtility::analyzeResults(XalanTransformer& xalan, const XalanDOMString&
base, const XalanDOMString& resultsFile);
+ FileUtility::analyzeResults(XalanTransformer& xalan, const XalanDOMString&
resultsFile);
// FileUtility::analyzeResults(const XalanDOMString& resultsFile);
private:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
