dbertoni 2004/08/05 16:36:20
Modified: c/Tests/Compare compare.cpp
c/Tests/Conf conf.cpp
c/Tests/Dom2Dom dom2dom.cpp
c/Tests/Errortests Errortests.cpp
c/Tests/Extensions extensions.cpp
c/Tests/InputSource inputsource.cpp
c/Tests/Memory Stressmem.cpp
c/Tests/Params Params.cpp
c/Tests/PerfT perft.cpp
c/Tests/Performance perf.cpp perf.dsp
Log:
Changes for moving Harness project into the main DLL.
Revision Changes Path
1.24 +12 -17 xml-xalan/c/Tests/Compare/compare.cpp
Index: compare.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Compare/compare.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- compare.cpp 26 Feb 2004 22:26:07 -0000 1.23
+++ compare.cpp 5 Aug 2004 23:36:18 -0000 1.24
@@ -56,9 +56,8 @@
-#include <Harness/XMLFileReporter.hpp>
-#include <Harness/FileUtility.hpp>
-#include <Harness/HarnessInit.hpp>
+#include <xalanc/Harness/XalanXMLFileReporter.hpp>
+#include <xalanc/Harness/XalanFileUtility.hpp>
@@ -69,12 +68,12 @@
-XALAN_USING_XALAN(FileUtility)
+XALAN_USING_XALAN(XalanFileUtility)
void
-setHelp(FileUtility& h)
+setHelp(XalanFileUtility& h)
{
h.args.getHelpStream() << endl
<< "compare dirname [-out -gold]"
@@ -95,11 +94,7 @@
int argc,
char* argv[])
{
- XALAN_USING_XALAN(HarnessInit)
-
- HarnessInit xmlPlatformUtils;
-
- FileUtility h;
+ XalanFileUtility h;
bool setGold = true;
@@ -117,7 +112,7 @@
XALAN_USING_XALAN(XalanSourceTreeDOMSupport)
XALAN_USING_XALAN(XalanSourceTreeParserLiaison)
XALAN_USING_XALAN(XalanTransformer)
- XALAN_USING_XALAN(XMLFileReporter)
+ XALAN_USING_XALAN(XalanXMLFileReporter)
XALAN_USING_XALAN(XSLTInputSource)
XALAN_USING_XALAN(XSLTResultTarget)
@@ -134,9 +129,9 @@
// Generate Unique Run id and processor info
const XalanDOMString UniqRunid = h.generateUniqRunid();
const XalanDOMString resultFilePrefix("cpp");
- const XalanDOMString resultsFile(h.args.output +
resultFilePrefix + UniqRunid + FileUtility::s_xmlSuffix);
+ const XalanDOMString resultsFile(h.args.output +
resultFilePrefix + UniqRunid + XalanFileUtility::s_xmlSuffix);
- XMLFileReporter logFile(resultsFile);
+ XalanXMLFileReporter logFile(resultsFile);
logFile.logTestFileInit("Comparison Testing:");
// Specify the "test" directory for both input and output.
@@ -149,7 +144,7 @@
//
logFile.logTestCaseInit(currentDir);
- typedef FileUtility::FileNameVectorType
FileNameVectorType;
+ typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
const FileNameVectorType files =
h.getTestFileNames(h.args.base, currentDir, true);
@@ -159,12 +154,12 @@
h.data.reset();
h.data.testOrFile = fileName;
- const XalanDOMString theXSLFile= h.args.base +
currentDir + FileUtility::s_pathSep + fileName;
+ const XalanDOMString theXSLFile= h.args.base +
currentDir + XalanFileUtility::s_pathSep + fileName;
const XalanDOMString theXMLFile =
h.generateFileName(theXSLFile,"xml");
- XalanDOMString theGoldFile = h.args.gold + currentDir
+ FileUtility::s_pathSep + fileName;
+ XalanDOMString theGoldFile = h.args.gold + currentDir
+ XalanFileUtility::s_pathSep + fileName;
theGoldFile = h.generateFileName(theGoldFile, "out");
- const XalanDOMString outbase = h.args.output +
currentDir + FileUtility::s_pathSep + fileName;
+ const XalanDOMString outbase = h.args.output +
currentDir + XalanFileUtility::s_pathSep + fileName;
const XalanDOMString theOutputFile =
h.generateFileName(outbase, "out");
const XSLTInputSource xslInputSource(theXSLFile);
1.39 +45 -27 xml-xalan/c/Tests/Conf/conf.cpp
Index: conf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Conf/conf.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- conf.cpp 26 Feb 2004 22:26:07 -0000 1.38
+++ conf.cpp 5 Aug 2004 23:36:18 -0000 1.39
@@ -54,9 +54,8 @@
// HARNESS HEADERS...
-#include <Harness/XMLFileReporter.hpp>
-#include <Harness/FileUtility.hpp>
-#include <Harness/HarnessInit.hpp>
+#include "xalanc/Harness/XalanXMLFileReporter.hpp"
+#include "xalanc/Harness/XalanFileUtility.hpp"
@@ -80,7 +79,7 @@
void
-setHelp(FileUtility& h)
+setHelp(XalanFileUtility& h)
{
h.args.getHelpStream() << endl
<< "conf dir [-sub -out -gold -source (XST | XPL | DOM)]"
@@ -125,28 +124,30 @@
-void
+int
parseWithTransformer(
int
sourceType,
XalanTransformer& xalan,
const XSLTInputSource& xmlInput,
const XalanCompiledStylesheet* styleSheet,
const XSLTResultTarget& output,
- XMLFileReporter& logFile,
- FileUtility& h)
+ XalanXMLFileReporter& logFile,
+ XalanFileUtility&
h)
{
const XalanParsedSource* parsedSource = 0;
+ int theResult = 0;
+
// Parse the XML source accordingly.
//
if (sourceType != 0 )
{
- xalan.parseSource(xmlInput, parsedSource, true);
+ theResult = xalan.parseSource(xmlInput, parsedSource, true);
h.data.xmlFormat = XalanDOMString("XercesParserLiasion");
}
else
{
- xalan.parseSource(xmlInput, parsedSource, false);
+ theResult = xalan.parseSource(xmlInput, parsedSource, false);
h.data.xmlFormat = XalanDOMString("XalanSourceTree");
}
@@ -162,21 +163,23 @@
}
else
{
- xalan.transform(*parsedSource, styleSheet, output);
+ theResult = xalan.transform(*parsedSource, styleSheet, output);
xalan.destroyParsedSource(parsedSource);
}
+
+ return theResult;
}
-void
+int
parseWithXerces(
XalanTransformer& xalan,
const XSLTInputSource& xmlInput,
const XalanCompiledStylesheet* styleSheet,
const XSLTResultTarget& output,
- XMLFileReporter& logFile,
- FileUtility& h)
+ XalanXMLFileReporter& logFile,
+ XalanFileUtility& h)
{
XALAN_USING_XERCES(XercesDOMParser)
XALAN_USING_XERCES(DOMDocument)
@@ -197,6 +200,8 @@
XercesDOMSupport theDOMSupport;
XercesParserLiaison theParserLiaison;
+ int theResult = 0;
+
try
{
const XercesDOMWrapperParsedSource parsedSource(
@@ -205,7 +210,7 @@
theDOMSupport,
XalanDOMString(xmlInput.getSystemId()));
- xalan.transform(parsedSource, styleSheet, output);
+ theResult = xalan.transform(parsedSource, styleSheet, output);
}
catch(...)
{
@@ -215,6 +220,8 @@
++h.data.fail;
logFile.logErrorResult(h.data.testOrFile,
XalanDOMString("Failed to parse source document. ") + xalan.getLastError());
}
+
+ return theResult;
}
@@ -228,9 +235,7 @@
try
{
- HarnessInit xmlPlatformUtils;
-
- FileUtility h;
+ XalanFileUtility h;
// Set the program help string, then get the command line
parameters.
//
@@ -245,11 +250,11 @@
const XalanDOMString drive(h.getDrive());
// This is used to get stylesheet for final analysis
const XalanDOMString resultFilePrefix("conf");
// This & UniqRunid used for log file name.
const XalanDOMString UniqRunid =
h.generateUniqRunid();
- const XalanDOMString resultsFile(drive + h.args.output
+ resultFilePrefix + UniqRunid + FileUtility::s_xmlSuffix);
+ const XalanDOMString resultsFile(drive + h.args.output
+ resultFilePrefix + UniqRunid + XalanFileUtility::s_xmlSuffix);
// Open results log, and do some initialization of
result data.
//
- XMLFileReporter logFile(resultsFile);
+ XalanXMLFileReporter logFile(resultsFile);
logFile.logTestFileInit("Conformance Testing:");
h.data.xmlFormat = XalanDOMString("NotSet");
@@ -259,11 +264,15 @@
// Flag indicates directory found. Used in conjunction
with -sub cmd-line arg.
bool foundDir = false;
- typedef FileUtility::FileNameVectorType
FileNameVectorType;
+ typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
const FileNameVectorType dirs =
h.getDirectoryNames(h.args.base);
- for(FileNameVectorType::size_type j = 0; j <
dirs.size(); ++j)
+ int theResult = 0;
+
+ for(FileNameVectorType::size_type j = 0;
+ j < dirs.size() && theResult == 0;
+ ++j)
{
// Skip all but the specified directory if the
-sub cmd-line option was used.
//
@@ -287,14 +296,14 @@
for(FileNameVectorType::size_type i =
0; i < files.size(); i++)
{
- XMLFileReporter::Hashtable
attrs;
+ XalanXMLFileReporter::Hashtable
attrs;
const XalanDOMString&
currentFile = files[i];
if
(checkForExclusion(currentFile))
continue;
h.data.testOrFile = currentFile;
- const XalanDOMString
theXSLFile = h.args.base + currentDir + FileUtility::s_pathSep + currentFile;
+ const XalanDOMString
theXSLFile = h.args.base + currentDir + XalanFileUtility::s_pathSep +
currentFile;
// Check and see if the .xml
file exists. If not skip this .xsl file and continue.
bool fileStatus = true;
@@ -306,10 +315,10 @@
h.data.xslFileURL = theXSLFile;
- XalanDOMString theGoldFile =
h.args.gold + currentDir + FileUtility::s_pathSep + currentFile;
+ XalanDOMString theGoldFile =
h.args.gold + currentDir + XalanFileUtility::s_pathSep + currentFile;
theGoldFile =
h.generateFileName(theGoldFile, "out");
- const XalanDOMString outbase =
h.args.output + currentDir + FileUtility::s_pathSep + currentFile;
+ const XalanDOMString outbase =
h.args.output + currentDir + XalanFileUtility::s_pathSep + currentFile;
const XalanDOMString
theOutputFile = h.generateFileName(outbase, "out");
const XSLTInputSource
xslInputSource(theXSLFile);
@@ -336,11 +345,11 @@
{
case 0:
case 1:
-
parseWithTransformer(h.args.source, xalan, xmlInputSource, compiledSS,
resultFile, logFile, h);
+ theResult =
parseWithTransformer(h.args.source, xalan, xmlInputSource, compiledSS,
resultFile, logFile, h);
break;
case 2:
-
parseWithXerces(xalan, xmlInputSource, compiledSS, resultFile, logFile, h);
+ theResult =
parseWithXerces(xalan, xmlInputSource, compiledSS, resultFile, logFile, h);
break;
}
@@ -360,6 +369,15 @@
{
cout << "Specified test directory: \"" <<
c_str(TranscodeToLocalCodePage(h.args.sub)) << "\" not found" << endl;
}
+ else if (theResult != 0)
+ {
+ cout << "An unexpected tranformer error
occurred. The error code is "
+ << theResult
+ << "\n"
+ << "The error message is \""
+ << xalan.getLastError()
+ << endl;
+ }
h.reportPassFail(logFile, UniqRunid);
logFile.logTestFileClose("Conformance ", "Done");
1.17 +13 -17 xml-xalan/c/Tests/Dom2Dom/dom2dom.cpp
Index: dom2dom.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Dom2Dom/dom2dom.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dom2dom.cpp 26 Feb 2004 22:26:07 -0000 1.16
+++ dom2dom.cpp 5 Aug 2004 23:36:19 -0000 1.17
@@ -65,9 +65,8 @@
-#include <Harness/XMLFileReporter.hpp>
-#include <Harness/FileUtility.hpp>
-#include <Harness/HarnessInit.hpp>
+#include <xalanc/Harness/XalanXMLFileReporter.hpp>
+#include <xalanc/Harness/XalanFileUtility.hpp>
@@ -108,7 +107,7 @@
getParams(
int argc,
char* argv[],
- FileUtility& f,
+ XalanFileUtility& f,
XalanDOMString& basedir,
XalanDOMString& outdir)
{
@@ -123,10 +122,10 @@
}
else
{
- if (f.checkDir(FileUtility::s_pathSep +
XalanDOMString(argv[1])))
+ if (f.checkDir(XalanFileUtility::s_pathSep +
XalanDOMString(argv[1])))
{
assign(basedir, XalanDOMString(argv[1]));
- insert(basedir, 0, FileUtility::s_pathSep);
+ insert(basedir, 0, XalanFileUtility::s_pathSep);
}
else
{
@@ -167,14 +166,14 @@
// Do we need to set the default output directory??
if (fSetOut)
{
- unsigned int ii =
lastIndexOf(basedir,charAt(FileUtility::s_pathSep,0));
+ unsigned int ii = lastIndexOf(basedir,
XalanFileUtility::s_pathSep[0]);
outdir = substring(basedir, 0, ii+1);
append(outdir, "Dom2Dom-RESULTS\\");
f.checkAndCreateDir(outdir);
}
// Add the path seperator to the end of the base directory
- append(basedir, FileUtility::s_pathSep);
+ append(basedir, XalanFileUtility::s_pathSep);
return fSuccess;
}
@@ -237,10 +236,7 @@
int argc,
char* argv[])
{
-
- HarnessInit xmlPlatformUtils;
-
- FileUtility f;
+ XalanFileUtility f;
XalanDOMString category; // Test all of base dir by default
XalanDOMString baseDir;
@@ -248,7 +244,7 @@
if (getParams(argc, argv, f, baseDir, outputRoot) == true)
{
- typedef FileUtility::FileNameVectorType
FileNameVectorType;
+ typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
// Get the list of Directories that are below perf
const FileNameVectorType dirs =
f.getDirectoryNames(baseDir);
@@ -259,9 +255,9 @@
// Defined basic constants for file manipulation
const XalanDOMString resultFilePrefix("dom2dom");
- const XalanDOMString resultsFile(outputRoot + resultFilePrefix
+ UniqRunid + FileUtility::s_xmlSuffix);
+ const XalanDOMString resultsFile(outputRoot + resultFilePrefix
+ UniqRunid + XalanFileUtility::s_xmlSuffix);
- XMLFileReporter logFile(resultsFile);
+ XalanXMLFileReporter logFile(resultsFile);
logFile.logTestFileInit("Dom2Dom Testing: Treating all inputs
and outputs as DOM's. ");
try
@@ -286,9 +282,9 @@
cout << files[i] << endl;
// Set up the input/output files.
- const XalanDOMString theXSLFile= baseDir +
xMan + FileUtility::s_pathSep + files[i];
+ const XalanDOMString theXSLFile= baseDir +
xMan + XalanFileUtility::s_pathSep + files[i];
const XalanDOMString theXMLFile =
f.generateFileName(theXSLFile,"xml");
- const XalanDOMString theOutput = outputRoot +
xMan + FileUtility::s_pathSep + files[i];
+ const XalanDOMString theOutput = outputRoot +
xMan + XalanFileUtility::s_pathSep + files[i];
const XalanDOMString theOutputFile =
f.generateFileName(theOutput, "out");
XALAN_USING_XERCES(DOMDocument)
1.20 +14 -18 xml-xalan/c/Tests/Errortests/Errortests.cpp
Index: Errortests.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Errortests/Errortests.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Errortests.cpp 26 Feb 2004 22:26:07 -0000 1.19
+++ Errortests.cpp 5 Aug 2004 23:36:19 -0000 1.20
@@ -55,9 +55,8 @@
-#include <Harness/XMLFileReporter.hpp>
-#include <Harness/FileUtility.hpp>
-#include <Harness/HarnessInit.hpp>
+#include <xalanc/Harness/XalanXMLFileReporter.hpp>
+#include <xalanc/Harness/XalanFileUtility.hpp>
@@ -73,13 +72,13 @@
-XALAN_USING_XALAN(FileUtility)
+XALAN_USING_XALAN(XalanFileUtility)
XALAN_USING_XALAN(XalanDOMString)
void
-setHelp(FileUtility& h)
+setHelp(XalanFileUtility& h)
{
h.args.getHelpStream() << endl
<< "errortests dir [-sub -out]"
@@ -116,11 +115,7 @@
int argc,
char* argv[])
{
- XALAN_USING_XALAN(HarnessInit)
-
- HarnessInit xmlPlatformUtils;
-
- FileUtility h;
+ XalanFileUtility h;
// Set the program help string, then get the command line parameters.
//
@@ -133,7 +128,7 @@
XALAN_USING_XALAN(XalanTransformer)
XALAN_USING_XALAN(XalanSourceTreeDOMSupport)
XALAN_USING_XALAN(XalanSourceTreeParserLiaison)
- XALAN_USING_XALAN(XMLFileReporter)
+ XALAN_USING_XALAN(XalanXMLFileReporter)
XalanTransformer xalan;
@@ -147,15 +142,16 @@
// Defined basic constants for file manipulation and open
results file
const XalanDOMString resultFilePrefix("cpperr");
- const XalanDOMString resultsFile(h.args.output +
resultFilePrefix + UniqRunid + FileUtility::s_xmlSuffix);
+ const XalanDOMString resultsFile(h.args.output +
resultFilePrefix + UniqRunid + XalanFileUtility::s_xmlSuffix);
+
+ XalanXMLFileReporter logFile(resultsFile);
- XMLFileReporter logFile(resultsFile);
logFile.logTestFileInit("Error Testing:");
// Get the list of Directories that are below conf
bool foundDir = false; // Flag indicates directory
found. Used in conjunction with -sub cmd-line arg.
- typedef FileUtility::FileNameVectorType
FileNameVectorType;
+ typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
const FileNameVectorType dirs =
h.getDirectoryNames(h.args.base);
@@ -189,7 +185,7 @@
XALAN_USING_XALAN(XalanCompiledStylesheet)
XALAN_USING_XALAN(XalanParsedSource)
- XMLFileReporter::Hashtable
attrs;
+ XalanXMLFileReporter::Hashtable
attrs;
const XalanDOMString
currentFile(files[i]);
h.data.testOrFile = currentFile;
@@ -197,12 +193,12 @@
if
(checkForExclusion(currentFile))
continue;
- const XalanDOMString
theXSLFile= h.args.base + currentDir + FileUtility::s_pathSep + currentFile;
+ const XalanDOMString
theXSLFile= h.args.base + currentDir + XalanFileUtility::s_pathSep +
currentFile;
const XalanDOMString
theXMLFile = h.generateFileName(theXSLFile,"xml");
- XalanDOMString theGoldFile =
h.args.gold + currentDir + FileUtility::s_pathSep + currentFile;
+ XalanDOMString theGoldFile =
h.args.gold + currentDir + XalanFileUtility::s_pathSep + currentFile;
theGoldFile =
h.generateFileName(theGoldFile, "out");
- const XalanDOMString outbase =
h.args.output + currentDir + FileUtility::s_pathSep + currentFile;
+ const XalanDOMString outbase =
h.args.output + currentDir + XalanFileUtility::s_pathSep + currentFile;
const XalanDOMString
theOutputFile = h.generateFileName(outbase, "out");
const XSLTInputSource
xslInputSource(theXSLFile);
1.26 +21 -26 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- extensions.cpp 26 Feb 2004 22:26:07 -0000 1.25
+++ extensions.cpp 5 Aug 2004 23:36:19 -0000 1.26
@@ -56,9 +56,8 @@
// HARNESS HEADERS...
-#include <Harness/XMLFileReporter.hpp>
-#include <Harness/FileUtility.hpp>
-#include <Harness/HarnessInit.hpp>
+#include <xalanc/Harness/XalanXMLFileReporter.hpp>
+#include <xalanc/Harness/XalanFileUtility.hpp>
@@ -72,17 +71,17 @@
const char* const resultString = "The specified function is not
available: http://xml.apache.org/xalan:nodeset";;
-XALAN_USING_XALAN(FileUtility)
+XALAN_USING_XALAN(XalanFileUtility)
XALAN_USING_XALAN(XalanDOMString)
XALAN_USING_XALAN(XalanTransformer)
-XALAN_USING_XALAN(XMLFileReporter)
+XALAN_USING_XALAN(XalanXMLFileReporter)
XALAN_USING_XALAN(XSLTInputSource)
XALAN_USING_XALAN(XSLTResultTarget)
void
-setHelp(FileUtility& h)
+setHelp(XalanFileUtility& h)
{
h.args.getHelpStream() << endl
<< "extensions dirname [-out]"
@@ -105,19 +104,19 @@
XalanDOMString& out,
XalanDOMString& gold,
const char* test,
- FileUtility& h)
+ XalanFileUtility& h)
{
// Set up the input/output files.
const XalanDOMString testName(h.generateFileName(fileName,"out"));
- xsl = h.args.base + currentDir + FileUtility::s_pathSep + fileName;
+ xsl = h.args.base + currentDir + XalanFileUtility::s_pathSep + fileName;
xml = h.generateFileName(xsl,"xml");
h.data.xmlFileURL = xml;
h.data.xslFileURL = xsl;
- out = h.args.output + currentDir + FileUtility::s_pathSep +
XalanDOMString(test) + testName;
+ out = h.args.output + currentDir + XalanFileUtility::s_pathSep +
XalanDOMString(test) + testName;
- gold = h.args.gold + currentDir + FileUtility::s_pathSep + testName;
+ gold = h.args.gold + currentDir + XalanFileUtility::s_pathSep +
testName;
}
@@ -135,8 +134,8 @@
XalanTransformer& xalan,
const XalanDOMString& fileName,
const XalanDOMString& currentDir,
- XMLFileReporter& logFile,
- FileUtility& h)
+ XalanXMLFileReporter& logFile,
+ XalanFileUtility& h)
{
XalanDOMString xml, xsl, theOutputFile, theGoldFile;
@@ -171,8 +170,8 @@
const XalanDOMString& fileName,
const XalanDOMString& currentDir,
const XalanDOMString& theNamespace,
- XMLFileReporter& logFile,
- FileUtility& h)
+ XalanXMLFileReporter& logFile,
+ XalanFileUtility& h)
{
XalanDOMString xml, xsl, theOutputFile, theGoldFile;
@@ -216,8 +215,8 @@
const XalanDOMString& fileName,
const XalanDOMString& currentDir,
const XalanDOMString& theNamespace,
- XMLFileReporter& logFile,
- FileUtility& h)
+ XalanXMLFileReporter& logFile,
+ XalanFileUtility& h)
{
XALAN_USING_XALAN(FunctionNodeSet)
@@ -288,8 +287,8 @@
const XalanDOMString& fileName,
const XalanDOMString& currentDir,
const XalanDOMString& theNamespace,
- XMLFileReporter& logFile,
- FileUtility& h)
+ XalanXMLFileReporter& logFile,
+ XalanFileUtility& h)
{
XALAN_USING_XALAN(FunctionNodeSet)
@@ -332,11 +331,7 @@
{
int theResult = 0;
- XALAN_USING_XALAN(HarnessInit)
-
- HarnessInit xmlPlatformUtils;
-
- FileUtility h;
+ XalanFileUtility h;
// Set the program help string, then get the command line parameters.
//
@@ -364,9 +359,9 @@
// Defined basic constants for file
manipulation
const XalanDOMString drive(h.getDrive());
- const XalanDOMString resultsFile(drive +
h.args.output + currentDir + UniqRunid + FileUtility::s_xmlSuffix);
+ const XalanDOMString resultsFile(drive +
h.args.output + currentDir + UniqRunid + XalanFileUtility::s_xmlSuffix);
- XMLFileReporter logFile(resultsFile);
+ XalanXMLFileReporter logFile(resultsFile);
logFile.logTestFileInit("C++ Extension Testing.
");
logFile.logTestCaseInit(currentDir);
@@ -381,7 +376,7 @@
h.checkAndCreateDir(theOutputDir);
- typedef FileUtility::FileNameVectorType
FileNameVectorType;
+ typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
// Get the files found in the "cextension"
directory
const FileNameVectorType files =
h.getTestFileNames(h.args.base, currentDir, true);
1.27 +23 -27 xml-xalan/c/Tests/InputSource/inputsource.cpp
Index: inputsource.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/InputSource/inputsource.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- inputsource.cpp 26 Feb 2004 22:26:07 -0000 1.26
+++ inputsource.cpp 5 Aug 2004 23:36:19 -0000 1.27
@@ -62,11 +62,9 @@
#include <xalanc/XalanTransformer/XalanTransformer.hpp>
#include <xalanc/XalanTransformer/XercesDOMWrapperParsedSource.hpp>
+#include <xalanc/Harness/XalanXMLFileReporter.hpp>
+#include <xalanc/Harness/XalanFileUtility.hpp>
-// HARNESS HEADERS...
-#include <Harness/XMLFileReporter.hpp>
-#include <Harness/FileUtility.hpp>
-#include <Harness/HarnessInit.hpp>
XALAN_USING_STD(cerr)
@@ -81,7 +79,7 @@
void
-setHelp(FileUtility& h)
+setHelp(XalanFileUtility& h)
{
h.args.getHelpStream() << endl
<< "inputsource dirname [-out]"
@@ -100,12 +98,12 @@
void
testCase1(
XalanTransformer& xalan,
- XMLFileReporter& logFile,
+ XalanXMLFileReporter& logFile,
const XalanDOMString& xml,
const XalanDOMString& xsl,
const XalanDOMString& outBase,
const XalanDOMString& theGoldFile,
- FileUtility& h)
+ XalanFileUtility& h)
{
const XalanDOMString publicID("public-smublic");
@@ -132,10 +130,10 @@
void
testCase2(
XalanTransformer& xalan,
- XMLFileReporter& logFile,
+ XalanXMLFileReporter& logFile,
const XalanDOMString& outBase,
const XalanDOMString& theGoldFile,
- FileUtility& h)
+ XalanFileUtility& h)
{
const XalanDOMString theOutputFile = outBase +
XalanDOMString("\\InputSource-TestCase2.out");
@@ -162,15 +160,15 @@
// - NOTE: We can't use the XalanTransformer Class with this
test. So we create the processor directly.
void testCase3(
- XMLFileReporter& logFile,
+ XalanXMLFileReporter& logFile,
const XalanDOMString& outBase,
const XalanDOMString& theGoldFile,
- FileUtility& h)
+ XalanFileUtility& h)
{
XalanDOMString name, value;
const XalanDOMString theOutputFile = outBase +
XalanDOMString("\\InputSource-TestCase3.out");
- XSLTResultTarget theResultTarget3(theOutputFile);
+ XSLTResultTarget theResultTarget3(theOutputFile);
h.data.testOrFile = "InputSource-TestCase3a";
@@ -215,7 +213,7 @@
XalanDocument* const domXSL =
parserLiaison.parseXMLStream(xslStringSource);
// Here is one of the tests. It will be verified when we do the
transform.
- XSLTInputSource xslXalanNode(domXSL);
+ XSLTInputSource xslXalanNode(domXSL);
// Set the system ID, so relative URIs are resolved properly...
xslXalanNode.setSystemId(xslStringSource.getSystemId());
@@ -259,15 +257,15 @@
// - XSLTInputSource(const char*)
void testCase4(
XalanTransformer& xalan,
- XMLFileReporter& logFile,
+ XalanXMLFileReporter& logFile,
const XalanDOMString& outBase,
const XalanDOMString& theGoldFile,
- FileUtility& h)
+ XalanFileUtility& h)
{
const XalanDOMString theOutputFile = outBase +
XalanDOMString("\\InputSource-TestCase4.out");
- XSLTResultTarget theResultTarget(theOutputFile);
+ const XSLTResultTarget theResultTarget(theOutputFile);
h.data.testOrFile = "InputSource-TestCase4";
@@ -285,12 +283,12 @@
void
testCase5(
XalanTransformer& xalan,
- XMLFileReporter& logFile,
+ XalanXMLFileReporter& logFile,
const XalanDOMString& xml,
const XalanDOMString& xsl,
const XalanDOMString& outBase,
const XalanDOMString& theGoldFile,
- FileUtility& h)
+ XalanFileUtility& h)
{
XALAN_USING_XERCES(XercesDOMParser)
XALAN_USING_XERCES(DOMDocument)
@@ -330,11 +328,9 @@
int argc,
char* argv[])
{
- int theResult = 0;
+ int theResult = 0;
- HarnessInit xmlPlatformUtils;
-
- FileUtility h;
+ XalanFileUtility h;
// Set the program help string, then get the command line parameters.
//
@@ -347,9 +343,9 @@
const XalanDOMString UniqRunid = h.generateUniqRunid();
const XalanDOMString drive(h.getDrive());
const XalanDOMString resultFilePrefix("isource");
- const XalanDOMString resultsFile(drive + h.args.output +
resultFilePrefix + UniqRunid + FileUtility::s_xmlSuffix);
+ const XalanDOMString resultsFile(drive + h.args.output +
resultFilePrefix + UniqRunid + XalanFileUtility::s_xmlSuffix);
- XMLFileReporter logFile(resultsFile);
+ XalanXMLFileReporter logFile(resultsFile);
logFile.logTestFileInit("XSLTInputSource Testing: Give various
types of allowable Inputs. ");
try
@@ -365,7 +361,7 @@
h.checkAndCreateDir(theOutputDir);
- typedef FileUtility::FileNameVectorType
FileNameVectorType;
+ typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
// Get the single file found in the "smoke" directory,
and run tests.
//
@@ -378,13 +374,13 @@
h.data.testOrFile = fileName;
// Set up the input/output files.
- const XalanDOMString theXSLFile= h.args.base +
currentDir + FileUtility::s_pathSep + fileName;
+ const XalanDOMString theXSLFile= h.args.base +
currentDir + XalanFileUtility::s_pathSep + fileName;
const XalanDOMString theXMLFile =
h.generateFileName(theXSLFile,"xml");
h.data.xmlFileURL = theXMLFile;
h.data.xslFileURL = theXSLFile;
// Set the gold file.
- XalanDOMString theGoldFile = h.args.gold +
currentDir + FileUtility::s_pathSep + fileName;
+ XalanDOMString theGoldFile = h.args.gold +
currentDir + XalanFileUtility::s_pathSep + fileName;
theGoldFile = h.generateFileName(theGoldFile,
"out");
// Execute the test cases.
1.29 +13 -18 xml-xalan/c/Tests/Memory/Stressmem.cpp
Index: Stressmem.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Memory/Stressmem.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Stressmem.cpp 26 Feb 2004 22:26:07 -0000 1.28
+++ Stressmem.cpp 5 Aug 2004 23:36:19 -0000 1.29
@@ -40,9 +40,8 @@
#include <xalanc/XalanTransformer/XalanTransformer.hpp>
-#include <Harness/XMLFileReporter.hpp>
-#include <Harness/FileUtility.hpp>
-#include <Harness/HarnessInit.hpp>
+#include <xalanc/Harness/XalanXMLFileReporter.hpp>
+#include <xalanc/Harness/XalanFileUtility.hpp>
@@ -59,7 +58,7 @@
-XALAN_USING_XALAN(FileUtility)
+XALAN_USING_XALAN(XalanFileUtility)
XALAN_USING_XALAN(XalanDOMString)
@@ -81,7 +80,7 @@
void
-setHelp(FileUtility& h)
+setHelp(XalanFileUtility& h)
{
h.args.getHelpStream() << endl
<< "stressmem dirname [-out -sub]"
@@ -106,11 +105,7 @@
try
{
- XALAN_USING_XALAN(HarnessInit)
-
- HarnessInit xmlPlatformUtils;
-
- FileUtility h;
+ XalanFileUtility h;
setHelp(h);
@@ -122,9 +117,9 @@
{
//XALAN_USING_XALAN(XalanSourceTreeDOMSupport)
//XALAN_USING_XALAN(XalanSourceTreeParserLiaison)
- XALAN_USING_XALAN(XMLFileReporter)
+ XALAN_USING_XALAN(XalanXMLFileReporter)
- typedef FileUtility::FileNameVectorType
FileNameVectorType;
+ typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
// Get the list of Directories that are below perf
const FileNameVectorType dirs =
h.getDirectoryNames(h.args.base);
@@ -134,10 +129,10 @@
// Defined basic constants for file manipulation
- const XalanDOMString
resultFilePrefix(XalanDOMString("cpp-mem"));
- const XalanDOMString resultsFile(h.args.output +
resultFilePrefix + UniqRunid + FileUtility::s_xmlSuffix);
+ const XalanDOMString
resultFilePrefix(XalanDOMString("cpp-mem"));
+ const XalanDOMString resultsFile(h.args.output +
resultFilePrefix + UniqRunid + XalanFileUtility::s_xmlSuffix);
- XMLFileReporter logFile(resultsFile);
+ XalanXMLFileReporter logFile(resultsFile);
logFile.logTestFileInit("Memory Testing - Memory leaks
detected during ConformanceTests. ");
@@ -147,7 +142,7 @@
bool foundDir = false;
- XalanTransformer transformEngine;
+ XalanTransformer transformEngine;
for(FileNameVectorType::size_type j = 0;
j < dirs.size(); ++j)
{
@@ -176,9 +171,9 @@
logFile.logTestCaseInit(files[i]);
cout << files[i] <<
endl;
- const XalanDOMString
theXSLFile = h.args.base + dirs[j] + FileUtility::s_pathSep + files[i];
+ const XalanDOMString
theXSLFile = h.args.base + dirs[j] + XalanFileUtility::s_pathSep + files[i];
const XalanDOMString
theXMLFile = h.generateFileName(theXSLFile,"xml");
- const XalanDOMString
theOutput = h.args.output + dirs[j] + FileUtility::s_pathSep + files[i];
+ const XalanDOMString
theOutput = h.args.output + dirs[j] + XalanFileUtility::s_pathSep + files[i];
const XalanDOMString
theOutputFile = h.generateFileName(theOutput, "out");
// Do a total end to
end transform with no pre parsing of either xsl or xml files.
1.29 +12 -17 xml-xalan/c/Tests/Params/Params.cpp
Index: Params.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Params/Params.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Params.cpp 26 Feb 2004 22:26:07 -0000 1.28
+++ Params.cpp 5 Aug 2004 23:36:19 -0000 1.29
@@ -50,9 +50,8 @@
-#include <Harness/XMLFileReporter.hpp>
-#include <Harness/FileUtility.hpp>
-#include <Harness/HarnessInit.hpp>
+#include <xalanc/Harness/XalanXMLFileReporter.hpp>
+#include <xalanc/Harness/XalanFileUtility.hpp>
@@ -62,13 +61,13 @@
-XALAN_USING_XALAN(FileUtility)
+XALAN_USING_XALAN(XalanFileUtility)
XALAN_USING_XALAN(XalanDOMString)
void
-setHelp(FileUtility& h)
+setHelp(XalanFileUtility& h)
{
h.args.getHelpStream() << endl
<< "params dirname [-out]"
@@ -104,11 +103,7 @@
{
int theResult = 0;
- XALAN_USING_XALAN(HarnessInit)
-
- HarnessInit xmlPlatformUtils;
-
- FileUtility h;
+ XalanFileUtility h;
char testCase[15];
XalanDOMString fileName, theGoldFile;
@@ -135,7 +130,7 @@
else
{
XALAN_USING_XALAN(XalanTransformer)
- XALAN_USING_XALAN(XMLFileReporter)
+ XALAN_USING_XALAN(XalanXMLFileReporter)
XalanTransformer xalan;
@@ -145,9 +140,9 @@
// Defined basic constants for file manipulation
const XalanDOMString drive(h.getDrive());
const XalanDOMString resultFilePrefix("params");
- const XalanDOMString resultsFile(drive +
h.args.output + resultFilePrefix + UniqRunid + FileUtility::s_xmlSuffix);
+ const XalanDOMString resultsFile(drive +
h.args.output + resultFilePrefix + UniqRunid + XalanFileUtility::s_xmlSuffix);
- XMLFileReporter logFile(resultsFile);
+ XalanXMLFileReporter logFile(resultsFile);
logFile.logTestFileInit("Param Testing: Testing ability
to pass parameters to stylesheets. ");
@@ -161,7 +156,7 @@
// Check that output directory is there.
h.checkAndCreateDir(theOutputDir);
- typedef FileUtility::FileNameVectorType
FileNameVectorType;
+ typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
const FileNameVectorType files =
h.getTestFileNames(h.args.base, currentDir, true);
logFile.logTestCaseInit(currentDir);
@@ -173,7 +168,7 @@
h.data.testOrFile = testCase;
// Set up the input/output files.
- const XalanDOMString theXSLFile=
h.args.base + currentDir + FileUtility::s_pathSep + fileName;
+ const XalanDOMString theXSLFile=
h.args.base + currentDir + XalanFileUtility::s_pathSep + fileName;
XalanDOMString theXMLFile;
// Neither testcase 7 nor 8 utilize xml
source files. Both use fragment identifiers,
@@ -188,9 +183,9 @@
h.data.xmlFileURL = theXMLFile;
h.data.xslFileURL = theXSLFile;
- const XalanDOMString theOutput =
h.args.output + currentDir + FileUtility::s_pathSep + fileName;
+ const XalanDOMString theOutput =
h.args.output + currentDir + XalanFileUtility::s_pathSep + fileName;
const XalanDOMString theOutputFile =
h.generateFileName(theOutput, "out");
- theGoldFile = h.args.gold + currentDir
+ FileUtility::s_pathSep + fileName;
+ theGoldFile = h.args.gold + currentDir
+ XalanFileUtility::s_pathSep + fileName;
theGoldFile =
h.generateFileName(theGoldFile, "out");
XALAN_USING_XALAN(XSLTResultTarget);
1.25 +10 -15 xml-xalan/c/Tests/PerfT/perft.cpp
Index: perft.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/PerfT/perft.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perft.cpp 26 Feb 2004 22:26:07 -0000 1.24
+++ perft.cpp 5 Aug 2004 23:36:20 -0000 1.25
@@ -34,10 +34,8 @@
#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
#include <xalanc/XalanTransformer/XalanTransformer.hpp>
-// HARNESS HEADERS...
-#include <Harness/XMLFileReporter.hpp>
-#include <Harness/FileUtility.hpp>
-#include <Harness/HarnessInit.hpp>
+#include <xalanc/Harness/XalanXMLFileReporter.hpp>
+#include <xalanc/Harness/XalanFileUtility.hpp>
// This is here for memory leak testing.
@@ -97,7 +95,7 @@
void
-setHelp(XALAN_CPP_NAMESPACE_QUALIFIER FileUtility& h)
+setHelp(XALAN_CPP_NAMESPACE_QUALIFIER XalanFileUtility& h)
{
h.args.getHelpStream() << endl
<< "Perft dir [-out -sub -i -iter]"
@@ -125,10 +123,7 @@
// Just hoist everything...
XALAN_CPP_NAMESPACE_USE
-
- HarnessInit xmlPlatformUtils;
-
- FileUtility h;
+ XalanFileUtility h;
// Set the program help string, then get the command line parameters.
//
@@ -148,16 +143,16 @@
// Defined basic constants for file manipulation and open
results file
const XalanDOMString resultFilePrefix("cpp");
- const XalanDOMString resultsFile(h.args.output +
resultFilePrefix + UniqRunid + FileUtility::s_xmlSuffix);
+ const XalanDOMString resultsFile(h.args.output +
resultFilePrefix + UniqRunid + XalanFileUtility::s_xmlSuffix);
- XMLFileReporter logFile(resultsFile);
+ XalanXMLFileReporter logFile(resultsFile);
logFile.logTestFileInit("Performance Testing - Reports various
performance metrics using the Transformer");
// Get the list of sub-directories below "base" and iterate
through them
bool foundDir = false; // Flag indicates directory
found. Used in conjunction with -sub cmd-line arg.
- typedef FileUtility::FileNameVectorType
FileNameVectorType;
+ typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
const FileNameVectorType dirs =
h.getDirectoryNames(h.args.base);
@@ -190,7 +185,7 @@
double timeinMilliseconds = 0, theAverage =0;
int transformResult = 0;
- typedef XMLFileReporter::Hashtable
Hashtable;
+ typedef XalanXMLFileReporter::Hashtable
Hashtable;
Hashtable attrs;
@@ -205,10 +200,10 @@
continue;
}
- const XalanDOMString theXSLFile= h.args.base +
dirs[j] + FileUtility::s_pathSep + files[i];
+ const XalanDOMString theXSLFile= h.args.base +
dirs[j] + XalanFileUtility::s_pathSep + files[i];
const XalanDOMString theXMLFile =
h.generateFileName(theXSLFile,"xml");
- const XalanDOMString outbase = h.args.output
+ dirs[j] + FileUtility::s_pathSep + files[i];
+ const XalanDOMString outbase = h.args.output
+ dirs[j] + XalanFileUtility::s_pathSep + files[i];
const XalanDOMString theOutputFile =
h.generateFileName(outbase, "out");
const XSLTInputSource
xslInputSource(theXSLFile);
1.40 +13 -16 xml-xalan/c/Tests/Performance/perf.cpp
Index: perf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Performance/perf.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- perf.cpp 26 Feb 2004 22:26:07 -0000 1.39
+++ perf.cpp 5 Aug 2004 23:36:20 -0000 1.40
@@ -54,9 +54,8 @@
#include <xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp>
#include <xalanc/XSLT/XSLTResultTarget.hpp>
-#include <Harness/XMLFileReporter.hpp>
-#include <Harness/FileUtility.hpp>
-#include <Harness/HarnessInit.hpp>
+#include <xalanc/Harness/XalanXMLFileReporter.hpp>
+#include <xalanc/Harness/XalanFileUtility.hpp>
@@ -144,9 +143,9 @@
inline double
calculateAverageElapsedTime(
- clock_t theStartTime,
- clock_t theEndTime,
- long theIterationCount)
+ clock_t theStartTime,
+ clock_t theEndTime,
+ long theIterationCount)
{
assert(theIterationCount > 0);
@@ -226,7 +225,7 @@
void
-setHelp(FileUtility& h)
+setHelp(XalanFileUtility& h)
{
h.args.getHelpStream() << endl
<< "Perf dir [-out -sub -i -iter]"
@@ -260,9 +259,7 @@
bool skip = true; // Default will skip long tests
bool setGold = false;
- HarnessInit xmlPlatformUtils;
-
- FileUtility h;
+ XalanFileUtility h;
// Set the program help string, then get the command line parameters.
//
@@ -274,9 +271,9 @@
// Generate Unique Run id and processor info
const XalanDOMString UniqRunid = h.generateUniqRunid();
const XalanDOMString resultFilePrefix(XalanDOMString("cpp"));
- const XalanDOMString resultsFile(h.args.output +
resultFilePrefix + UniqRunid + FileUtility::s_xmlSuffix);
+ const XalanDOMString resultsFile(h.args.output +
resultFilePrefix + UniqRunid + XalanFileUtility::s_xmlSuffix);
- XMLFileReporter logFile(resultsFile);
+ XalanXMLFileReporter logFile(resultsFile);
logFile.logTestFileInit("Performance Testing - Reports
performance times for single transform, and average for multiple transforms
using compiled stylesheet");
@@ -290,7 +287,7 @@
{
XSLTInit theInit;
- typedef FileUtility::FileNameVectorType
FileNameVectorType;
+ typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
// Get the list of Directories that are below
perf and iterate through them
const FileNameVectorType dirs =
h.getDirectoryNames(h.args.base);
@@ -321,7 +318,7 @@
clock_t startTime, endTime,
accmTime, avgEtoe;
double timeinMilliseconds,
theAverage;
- typedef
XMLFileReporter::Hashtable Hashtable;
+ typedef
XalanXMLFileReporter::Hashtable Hashtable;
Hashtable attrs;
@@ -330,10 +327,10 @@
continue;
}
- const XalanDOMString
theXSLFile= h.args.base + dirs[j] + FileUtility::s_pathSep + files[i];
+ const XalanDOMString
theXSLFile= h.args.base + dirs[j] + XalanFileUtility::s_pathSep + files[i];
const XalanDOMString
theXMLFile = h.generateFileName(theXSLFile,"xml");
- const XalanDOMString theOutput
= h.args.output + dirs[j] + FileUtility::s_pathSep + files[i];
+ const XalanDOMString theOutput
= h.args.output + dirs[j] + XalanFileUtility::s_pathSep + files[i];
const XalanDOMString
theOutputFile = h.generateFileName(theOutput, "out");
1.16 +1 -2 xml-xalan/c/Tests/Performance/perf.dsp
Index: perf.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Performance/perf.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perf.dsp 21 Apr 2004 19:30:03 -0000 1.15
+++ perf.dsp 5 Aug 2004 23:36:20 -0000 1.16
@@ -70,8 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /Gf /Gy /I
"..\..\..\..\xml-xerces\c\src\\" /I "..\..\src\\" /I ".." /I
"$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# SUBTRACT CPP /X
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /Gf /Gy /I
"..\..\..\..\xml-xerces\c\src\\" /I "..\..\src\\" /I ".." /I
"$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /Zm125 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
