pauldick 01/10/18 11:43:18
Modified: c/Tests/Compare compare.cpp
c/Tests/Conf conf.cpp
c/Tests/Errortests Errortests.cpp
c/Tests/Extensions extensions.cpp
c/Tests/Harness FileUtility.cpp FileUtility.hpp
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
Log:
Changed Generate... methods to generate...
Revision Changes Path
1.10 +4 -4 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- compare.cpp 2001/10/11 18:12:56 1.9
+++ compare.cpp 2001/10/18 18:43:17 1.10
@@ -250,7 +250,7 @@
// Generate Unique Run id and processor info
- const XalanDOMString UniqRunid = futil.GenerateUniqRunid();
+ const XalanDOMString UniqRunid = futil.generateUniqRunid();
// Defined basic constants for file manipulation and open
results file
@@ -288,12 +288,12 @@
attrs.insert(Hashtable::value_type(XalanDOMString("processor"),processorType));
const XalanDOMString theXSLFile= baseDir +
xDir + pathSep + fileName;
- const XalanDOMString theXMLFile =
futil.GenerateFileName(theXSLFile,"xml");
+ const XalanDOMString theXMLFile =
futil.generateFileName(theXSLFile,"xml");
XalanDOMString theGoldFile = goldRoot +xDir +
pathSep + fileName;
- theGoldFile =
futil.GenerateFileName(theGoldFile, "out");
+ theGoldFile =
futil.generateFileName(theGoldFile, "out");
const XalanDOMString outbase = outputRoot +
xDir + pathSep + fileName;
- const XalanDOMString theOutputFile =
futil.GenerateFileName(outbase, "out");
+ const XalanDOMString theOutputFile =
futil.generateFileName(outbase, "out");
//cout << endl << endl << "Processing: " <<
fileName << endl;
const XSLTInputSource
xslInputSource(c_wstr(theXSLFile));
1.8 +1 -0 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- conf.cpp 2001/10/18 15:37:58 1.7
+++ conf.cpp 2001/10/18 18:43:17 1.8
@@ -326,6 +326,7 @@
const XalanDOMString theXMLFile =
futil.generateFileName(theXSLFile,"xml");
futil.data.xmlFileURL = theXMLFile;
futil.data.xslFileURL = theXSLFile;
+ futil.data.testBase = baseDir;
XalanDOMString theGoldFile = goldRoot + currentDir +
pathSep + currentFile;
theGoldFile = futil.generateFileName(theGoldFile,
"out");
1.2 +4 -4 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Errortests.cpp 2001/09/14 21:03:46 1.1
+++ Errortests.cpp 2001/10/18 18:43:17 1.2
@@ -265,7 +265,7 @@
// Generate Unique Run id and processor info
- const XalanDOMString UniqRunid = futil.GenerateUniqRunid();
+ const XalanDOMString UniqRunid = futil.generateUniqRunid();
// Defined basic constants for file manipulation and open
results file
@@ -315,12 +315,12 @@
continue;
const XalanDOMString theXSLFile= baseDir +
currentDir + pathSep + currentFile;
- const XalanDOMString theXMLFile =
futil.GenerateFileName(theXSLFile,"xml");
+ const XalanDOMString theXMLFile =
futil.generateFileName(theXSLFile,"xml");
XalanDOMString theGoldFile = goldRoot +
currentDir + pathSep + currentFile;
- theGoldFile =
futil.GenerateFileName(theGoldFile, "out");
+ theGoldFile =
futil.generateFileName(theGoldFile, "out");
const XalanDOMString outbase = outputRoot +
currentDir + pathSep + currentFile;
- const XalanDOMString theOutputFile =
futil.GenerateFileName(outbase, "out");
+ const XalanDOMString theOutputFile =
futil.generateFileName(outbase, "out");
const XSLTInputSource
xslInputSource(c_wstr(theXSLFile));
const XSLTInputSource
xmlInputSource(c_wstr(theXMLFile));
1.10 +4 -4 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- extensions.cpp 2001/10/17 20:42:37 1.9
+++ extensions.cpp 2001/10/18 18:43:17 1.10
@@ -222,14 +222,14 @@
const XalanDOMString testName(test + XalanDOMString(".out"));
xsl = baseDir + currentDir + pathSep + fileName;
- xml = futil.GenerateFileName(xsl,"xml");
+ xml = futil.generateFileName(xsl,"xml");
futil.data.xmlFileURL = xml;
futil.data.xslFileURL = xsl;
out = outputRoot + currentDir + pathSep + testName;
gold = goldRoot +currentDir + pathSep + fileName;
- gold = futil.GenerateFileName(gold, "out");
+ gold = futil.generateFileName(gold, "out");
}
@@ -458,7 +458,7 @@
if (getParams(argc, argv, baseDir, outputRoot, goldRoot) == true)
{
// Generate Unique Run id. (Only used to name the result logfile.)
- const XalanDOMString UniqRunid = futil.GenerateUniqRunid();
+ const XalanDOMString UniqRunid = futil.generateUniqRunid();
// Defined basic constants for file manipulation
const XalanDOMString drive(futil.getDrive());
@@ -499,7 +499,7 @@
logFile.logTestFileClose("C++ Extension Testing: ", "Done");
logFile.close();
- futil.analyzeResults(xalan, resultsFile);
+ futil.analyzeResults(xalan, baseDir, resultsFile);
XalanTransformer::terminate();
}
catch(...)
1.21 +1 -0 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- FileUtility.cpp 2001/10/18 15:35:57 1.20
+++ FileUtility.cpp 2001/10/18 18:43:17 1.21
@@ -987,6 +987,7 @@
runResults.insert(Hashtable::value_type(XalanDOMString("Xerces-Version "),
getXercesVersion()));
runResults.insert(Hashtable::value_type(XalanDOMString("ICU-Enabled "),
XalanDOMString("No")));
runResults.insert(Hashtable::value_type(XalanDOMString("BaseDrive "),
XalanDOMString(getDrive())));
+ runResults.insert(Hashtable::value_type(XalanDOMString("TestBase "),
XalanDOMString(data.testBase)));
#if defined(XALAN_USE_ICU)
// At some point in time I want to be able to programatically check it the ICU
is enabled.
1.16 +2 -1 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FileUtility.hpp 2001/10/18 15:35:50 1.15
+++ FileUtility.hpp 2001/10/18 18:43:17 1.16
@@ -99,7 +99,7 @@
/**
* Utility call that extracts test file names from testsuite.
* @author Paul [EMAIL PROTECTED]
- * @version $Id: FileUtility.hpp,v 1.15 2001/10/18 15:35:50 pauldick Exp $
+ * @version $Id: FileUtility.hpp,v 1.16 2001/10/18 18:43:17 pauldick Exp $
*/
#if defined HARNESS_EXPORTS
@@ -135,6 +135,7 @@
XalanDOMString testOrFile;
XalanDOMString xmlFileURL;
XalanDOMString xslFileURL;
+ XalanDOMString testBase;
char* msg;
XalanDOMString currentNode;
XalanDOMString actual;
1.7 +4 -4 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- inputsource.cpp 2001/10/17 20:20:45 1.6
+++ inputsource.cpp 2001/10/18 18:43:17 1.7
@@ -387,7 +387,7 @@
{
// Generate Unique Run id. (Only used to name the result logfile.)
- const XalanDOMString UniqRunid = futil.GenerateUniqRunid();
+ const XalanDOMString UniqRunid = futil.generateUniqRunid();
// Defined basic constants for file manipulation
const XalanDOMString drive(futil.getDrive());
@@ -427,13 +427,13 @@
// Set up the input/output files.
const XalanDOMString theXSLFile= baseDir +
currentDir + pathSep + fileName;
- const XalanDOMString theXMLFile =
futil.GenerateFileName(theXSLFile,"xml");
+ const XalanDOMString theXMLFile =
futil.generateFileName(theXSLFile,"xml");
futil.data.xmlFileURL = theXMLFile;
futil.data.xslFileURL = theXSLFile;
// Set the gold file.
XalanDOMString theGoldFile = goldRoot
+currentDir + pathSep + fileName;
- theGoldFile =
futil.GenerateFileName(theGoldFile, "out");
+ theGoldFile =
futil.generateFileName(theGoldFile, "out");
// Execute the test cases.
testCase1(xalan, logFile, theXMLFile,
theXSLFile, theOutputDir, theGoldFile);
@@ -449,7 +449,7 @@
logFile.logTestFileClose("ISource Testing: ", "Done");
logFile.close();
- futil.analyzeResults(xalan, resultsFile);
+ futil.analyzeResults(xalan, baseDir, resultsFile);
XalanTransformer::terminate();
}
catch(...)
1.15 +3 -3 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Stressmem.cpp 2001/06/20 16:16:37 1.14
+++ Stressmem.cpp 2001/10/18 18:43:17 1.15
@@ -236,7 +236,7 @@
const FileNameVectorType dirs = f.getDirectoryNames(baseDir);
// Generate Unique Run id. (Only used to name the result logfile.)
- const XalanDOMString UniqRunid = f.GenerateUniqRunid();
+ const XalanDOMString UniqRunid = f.generateUniqRunid();
// Defined basic constants for file manipulation
@@ -279,9 +279,9 @@
const XalanDOMString
theXSLFile= baseDir + dirs[j] + pathSep + files[i];
- const XalanDOMString
theXMLFile = f.GenerateFileName(theXSLFile,"xml");
+ const XalanDOMString
theXMLFile = f.generateFileName(theXSLFile,"xml");
const XalanDOMString
theOutput = outputRoot + dirs[j] + pathSep + files[i];
- const XalanDOMString
theOutputFile = f.GenerateFileName(theOutput, "out");
+ const XalanDOMString
theOutputFile = f.generateFileName(theOutput, "out");
// Do a total end to end
transform with no pre parsing of either xsl or xml files.
XSLTResultTarget
theResultTarget(theOutputFile);
1.12 +4 -4 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Params.cpp 2001/10/17 20:20:58 1.11
+++ Params.cpp 2001/10/18 18:43:17 1.12
@@ -224,7 +224,7 @@
XalanTransformer xalan;
// Generate Unique Run id. (Only used to name the result logfile.)
- const XalanDOMString UniqRunid = futil.GenerateUniqRunid();
+ const XalanDOMString UniqRunid = futil.generateUniqRunid();
// Defined basic constants for file manipulation
const XalanDOMString drive(futil.getDrive());
@@ -256,14 +256,14 @@
// Set up the input/output files.
const XalanDOMString theXSLFile= baseDir + currentDir
+ pathSep + fileName;
- const XalanDOMString theXMLFile =
futil.GenerateFileName(theXSLFile,"xml");
+ const XalanDOMString theXMLFile =
futil.generateFileName(theXSLFile,"xml");
futil.data.xmlFileURL = theXMLFile;
futil.data.xslFileURL = theXSLFile;
const XalanDOMString theOutput = outputRoot +
currentDir + pathSep + fileName;
- const XalanDOMString theOutputFile =
futil.GenerateFileName(theOutput, "out");
+ const XalanDOMString theOutputFile =
futil.generateFileName(theOutput, "out");
theGoldFile = goldRoot +currentDir + pathSep +
fileName;
- theGoldFile = futil.GenerateFileName(theGoldFile,
"out");
+ theGoldFile = futil.generateFileName(theGoldFile,
"out");
XSLTResultTarget
theResultTarget(theOutputFile);
const XSLTInputSource
xslInputSource(c_wstr(theXSLFile));
1.8 +3 -3 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perft.cpp 2001/09/14 21:05:30 1.7
+++ perft.cpp 2001/10/18 18:43:18 1.8
@@ -297,7 +297,7 @@
XalanTransformer xalan;
// Generate Unique Run id and processor info
- const XalanDOMString UniqRunid = futil.GenerateUniqRunid();
+ const XalanDOMString UniqRunid = futil.generateUniqRunid();
// Defined basic constants for file manipulation and open
results file
@@ -356,10 +356,10 @@
}
const XalanDOMString theXSLFile= baseDir +
dirs[j] + pathSep + files[i];
- const XalanDOMString theXMLFile =
futil.GenerateFileName(theXSLFile,"xml");
+ const XalanDOMString theXMLFile =
futil.generateFileName(theXSLFile,"xml");
const XalanDOMString outbase = outputRoot +
dirs[j] + pathSep + files[i];
- const XalanDOMString theOutputFile =
futil.GenerateFileName(outbase, "out");
+ const XalanDOMString theOutputFile =
futil.generateFileName(outbase, "out");
const XSLTInputSource
xslInputSource(c_wstr(theXSLFile));
const XSLTInputSource
xmlInputSource(c_wstr(theXMLFile));
1.25 +3 -3 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perf.cpp 2001/09/14 21:05:19 1.24
+++ perf.cpp 2001/10/18 18:43:18 1.25
@@ -399,7 +399,7 @@
{
// Generate Unique Run id and processor info
- const XalanDOMString UniqRunid = f.GenerateUniqRunid();
+ const XalanDOMString UniqRunid = f.generateUniqRunid();
const XalanDOMString
processorType(XALAN_STATIC_UCODE_STRING("XalanC"));
// Defined basic constants for file manipulation and open results file
@@ -463,10 +463,10 @@
}
const XalanDOMString theXSLFile=
baseDir + dirs[j] + pathSep + files[i];
- const XalanDOMString theXMLFile =
f.GenerateFileName(theXSLFile,"xml");
+ const XalanDOMString theXMLFile =
f.generateFileName(theXSLFile,"xml");
const XalanDOMString theOutput =
outputRoot + dirs[j] + pathSep + files[i];
- const XalanDOMString theOutputFile =
f.GenerateFileName(theOutput, "out");
+ const XalanDOMString theOutputFile =
f.generateFileName(theOutput, "out");
attrs.insert(Hashtable::value_type(XalanDOMString("href"), theXSLFile));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
