pauldick 01/11/16 13:24:02
Modified: c/Tests/Extensions extensions.cpp
Log:
Changed signature of analyzeResults and output test specific
result files
Revision Changes Path
1.12 +15 -14 xml-xalan/c/Tests/Extensions/extensions.cpp
Index: extensions.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Extensions/extensions.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- extensions.cpp 2001/11/09 19:26:46 1.11
+++ extensions.cpp 2001/11/16 21:24:02 1.12
@@ -219,17 +219,17 @@
const char* test)
{
// Set up the input/output files.
- const XalanDOMString testName(test + XalanDOMString(".out"));
+ const XalanDOMString testName(futil.generateFileName(fileName,"out"));
xsl = baseDir + currentDir + pathSep + fileName;
xml = futil.generateFileName(xsl,"xml");
futil.data.xmlFileURL = xml;
futil.data.xslFileURL = xsl;
- out = outputRoot + currentDir + pathSep + testName;
+ out = outputRoot + currentDir + pathSep + XalanDOMString(test) +
testName;
- gold = goldRoot +currentDir + pathSep + fileName;
- gold = futil.generateFileName(gold, "out");
+ gold = goldRoot +currentDir + pathSep + testName;
+ //gold = futil.generateFileName(gold, "out");
}
@@ -247,7 +247,7 @@
XalanDOMString xml, xsl, theOutputFile, theGoldFile;
- generateFiles(fileName, xml, xsl, theOutputFile, theGoldFile,
"TestCase1");
+ generateFiles(fileName, xml, xsl, theOutputFile, theGoldFile, "tc1-");
futil.data.testOrFile = XalanDOMString("TestCase1: ") + fileName;
futil.data.xmlFileURL = xml;
@@ -276,7 +276,7 @@
XalanDOMString xml, xsl, theOutputFile, theGoldFile;
- generateFiles(fileName, xml, xsl, theOutputFile, theGoldFile,
"TestCase2");
+ generateFiles(fileName, xml, xsl, theOutputFile, theGoldFile, "tc2-");
futil.data.testOrFile = XalanDOMString("TestCase2");
futil.data.xmlFileURL = xml;
futil.data.xslFileURL = xsl;
@@ -316,7 +316,7 @@
XalanDOMString xml, xsl, theOutputFile, theGoldFile;
- generateFiles(fileName, xml, xsl, theOutputFile, theGoldFile,
"TestCase3");
+ generateFiles(fileName, xml, xsl, theOutputFile, theGoldFile, "tc3-");
futil.data.testOrFile = XalanDOMString("TestCase3a");
futil.data.xmlFileURL = xml;
futil.data.xslFileURL = xsl;
@@ -336,8 +336,8 @@
futil.checkResults(theOutputFile, theGoldFile, logFile);
- // Because we install the function locally, this second instance of the
transformer should not run the
- // test successfully.
+ // Because we install the function locally, this second instance of the
transformer
+ // should _NOT_ run the test successfully.
XalanTransformer newEngine;
futil.data.testOrFile = XalanDOMString("TestCase3b");
@@ -350,7 +350,8 @@
theOutputFile,
theGoldFile);
- // Now unInstall the external function "nodeset"
+ // Now unInstall the external function "nodeset". Once again the
transform should
+ // _NOT_ run the test successfully
futil.data.testOrFile = XalanDOMString("TestCase3c");
xalan.uninstallExternalFunction(theNamespace,
XalanDOMString("nodeset"));
@@ -377,7 +378,7 @@
XalanDOMString xml, xsl, theOutputFile, theGoldFile;
- generateFiles(fileName, xml, xsl, theOutputFile, theGoldFile,
"TestCase5");
+ generateFiles(fileName, xml, xsl, theOutputFile, theGoldFile, "tc4-");
futil.data.testOrFile = XalanDOMString("TestCase4a");
futil.data.xmlFileURL = xml;
futil.data.xslFileURL = xsl;
@@ -455,8 +456,8 @@
TestCase1(xalan, files[2], logFile); // Evaluate
TestCase1(xalan, files[3], logFile); // HasSameNodes
TestCase1(xalan, files[4], logFile); // Intersection
- TestCase1(xalan, files[5], logFile); // NodeSet - basic
testing
- TestCase1(xalan, files[6], logFile); // NodeSet - extensive
RTF testing.
+ TestCase1(xalan, files[5], logFile); // NodeSet01 - basic
testing
+ TestCase1(xalan, files[6], logFile); // NodeSet02 -
extensive RTF testing.
// These testcases are used to excerise the Install/Uninstall
Function API's of the transformer.
TestCase2(xalan, files[5], logFile);
@@ -469,7 +470,7 @@
logFile.logTestFileClose("C++ Extension Testing: ", "Done");
logFile.close();
- futil.analyzeResults(xalan, baseDir, resultsFile);
+ futil.analyzeResults(xalan, resultsFile);
XalanTransformer::terminate();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
