dbertoni 2005/04/22 16:40:21
Modified: c/Tests/Conf conf.cpp
Log:
Moved catch of LockException to where it can be caught.
Revision Changes Path
1.43 +264 -264 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- conf.cpp 22 Apr 2005 20:52:40 -0000 1.42
+++ conf.cpp 22 Apr 2005 23:40:21 -0000 1.43
@@ -88,30 +88,30 @@
void
-setHelp(XalanFileUtility& h)
+setHelp(XalanFileUtility& h)
{
- h.args.getHelpStream() << endl
- << "conf dir [-sub -out -gold -source (XST | XPL | DOM)]"
- << endl
- << endl
- << "dir (base directory for testcases)"
- << endl
- << "-sub dir (specific directory)"
- << endl
- << "-out dir (base directory for output)"
- << endl
- << "-gold dir (base directory for gold files)"
- << endl
- << "-src type (parsed source; XalanSourceTree(d),
XercesParserLiasion, XercesDOM)"
- << endl;
+ h.args.getHelpStream() << endl
+ << "conf dir [-sub -out -gold -source (XST | XPL | DOM)]"
+ << endl
+ << endl
+ << "dir (base directory for testcases)"
+ << endl
+ << "-sub dir (specific directory)"
+ << endl
+ << "-out dir (base directory for output)"
+ << endl
+ << "-gold dir (base directory for gold files)"
+ << endl
+ << "-src type (parsed source; XalanSourceTree(d),
XercesParserLiasion, XercesDOM)"
+ << endl;
}
-static const char* const excludeStylesheets[] =
+static const char* const excludeStylesheets[] =
{
-// "output22.xsl", // Excluded because it outputs EBCDIC
- 0
+// "output22.xsl", // Excluded because it outputs EBCDIC
+ 0
};
@@ -122,67 +122,67 @@
const XalanDOMString& currentFile,
MemoryManager& theMemoryManager)
{
- for (size_t i = 0; excludeStylesheets[i] != 0; ++i)
- {
- if (currentFile == XalanDOMString(excludeStylesheets[i],
theMemoryManager))
- {
- return true;
- }
- }
+ for (size_t i = 0; excludeStylesheets[i] != 0; ++i)
+ {
+ if (currentFile == XalanDOMString(excludeStylesheets[i],
theMemoryManager))
+ {
+ return true;
+ }
+ }
- return false;
+ return false;
}
int
parseWithTransformer(
- int
sourceType,
- XalanTransformer& xalan,
- const XSLTInputSource& xmlInput,
- const XalanCompiledStylesheet* styleSheet,
- const XSLTResultTarget& output,
- XalanXMLFileReporter& logFile,
- XalanFileUtility& h)
+ int sourceType,
+ XalanTransformer& xalan,
+ const XSLTInputSource& xmlInput,
+ const XalanCompiledStylesheet* styleSheet,
+ const XSLTResultTarget& output,
+ XalanXMLFileReporter& logFile,
+ XalanFileUtility& h)
{
- const XalanParsedSource* parsedSource = 0;
+ const XalanParsedSource* parsedSource = 0;
MemoryManagerType& mgr = h.getMemoryManager();
int theResult = 0;
- // Parse the XML source accordingly.
- //
- if (sourceType != 0 )
- {
- theResult = xalan.parseSource(xmlInput, parsedSource, true);
- h.data.xmlFormat = XalanDOMString("XercesParserLiasion", mgr);
- }
- else
- {
- theResult = xalan.parseSource(xmlInput, parsedSource, false);
- h.data.xmlFormat = XalanDOMString("XalanSourceTree", mgr);
- }
-
- // If the source was parsed correctly then perform the transform else
report the failure.
- //
- if (parsedSource == 0)
- {
- // Report the failure and be sure to increment fail count.
- //
- cout << "ParseWTransformer - Failed to parse source document
for " << h.data.testOrFile << endl;
- ++h.data.fail;
+ // Parse the XML source accordingly.
+ //
+ if (sourceType != 0 )
+ {
+ theResult = xalan.parseSource(xmlInput, parsedSource, true);
+ h.data.xmlFormat = XalanDOMString("XercesParserLiasion", mgr);
+ }
+ else
+ {
+ theResult = xalan.parseSource(xmlInput, parsedSource, false);
+ h.data.xmlFormat = XalanDOMString("XalanSourceTree", mgr);
+ }
+
+ // If the source was parsed correctly then perform the transform else
report the failure.
+ //
+ if (parsedSource == 0)
+ {
+ // Report the failure and be sure to increment fail count.
+ //
+ cout << "ParseWTransformer - Failed to parse source document for "
<< h.data.testOrFile << endl;
+ ++h.data.fail;
XalanDOMString tmp("Failed to parse source document. ", mgr);
tmp.append(xalan.getLastError());
- logFile.logErrorResult(h.data.testOrFile, tmp );
- }
- else
- {
- theResult = xalan.transform(*parsedSource, styleSheet, output);
- xalan.destroyParsedSource(parsedSource);
- }
+ logFile.logErrorResult(h.data.testOrFile, tmp );
+ }
+ else
+ {
+ theResult = xalan.transform(*parsedSource, styleSheet, output);
+ xalan.destroyParsedSource(parsedSource);
+ }
return theResult;
}
@@ -191,57 +191,57 @@
int
parseWithXerces(
- XalanTransformer& xalan,
- const XSLTInputSource& xmlInput,
- const XalanCompiledStylesheet* styleSheet,
- const XSLTResultTarget& output,
- XalanXMLFileReporter& logFile,
- XalanFileUtility& h)
+ XalanTransformer& xalan,
+ const XSLTInputSource& xmlInput,
+ const XalanCompiledStylesheet* styleSheet,
+ const XSLTResultTarget& output,
+ XalanXMLFileReporter& logFile,
+ XalanFileUtility& h)
{
- XALAN_USING_XERCES(XercesDOMParser)
- XALAN_USING_XERCES(DOMDocument)
+ XALAN_USING_XERCES(XercesDOMParser)
+ XALAN_USING_XERCES(DOMDocument)
MemoryManagerType& mgr = XalanMemMgrs::getDefaultXercesMemMgr();
- h.data.xmlFormat = XalanDOMString("Xerces_DOM", mgr);
+ h.data.xmlFormat = XalanDOMString("Xerces_DOM", mgr);
- XercesDOMParser theParser;
+ XercesDOMParser theParser;
- theParser.setDoValidation(true);
- theParser.setDoNamespaces(true);
+ theParser.setDoValidation(true);
+ theParser.setDoNamespaces(true);
- theParser.parse(xmlInput);
+ theParser.parse(xmlInput);
- DOMDocument* const theDOM = theParser.getDocument();
+ DOMDocument* const theDOM = theParser.getDocument();
- theDOM->normalize();
+ theDOM->normalize();
- XercesDOMSupport theDOMSupport(mgr);
- XercesParserLiaison theParserLiaison(mgr);
+ XercesDOMSupport theDOMSupport(mgr);
+ XercesParserLiaison theParserLiaison(mgr);
int theResult = 0;
- try
- {
- const XercesDOMWrapperParsedSource parsedSource(
- theDOM,
- theParserLiaison,
- theDOMSupport,
- XalanDOMString(xmlInput.getSystemId(),
mgr),
+ try
+ {
+ const XercesDOMWrapperParsedSource parsedSource(
+ theDOM,
+ theParserLiaison,
+ theDOMSupport,
+ XalanDOMString(xmlInput.getSystemId(), mgr),
mgr);
- theResult = xalan.transform(parsedSource, styleSheet, output);
- }
- catch(...)
- {
- // Report the failure and be sure to increment fail count.
- //
- cout << "parseWXerces - Failed to parse source document for "
<< h.data.testOrFile << endl;
- ++h.data.fail;
+ theResult = xalan.transform(parsedSource, styleSheet, output);
+ }
+ catch(...)
+ {
+ // Report the failure and be sure to increment fail count.
+ //
+ cout << "parseWXerces - Failed to parse source document for " <<
h.data.testOrFile << endl;
+ ++h.data.fail;
XalanDOMString resultString("Failed to parse source document. ",
mgr);
resultString.append( xalan.getLastError());
- logFile.logErrorResult(h.data.testOrFile, resultString);
- }
+ logFile.logErrorResult(h.data.testOrFile, resultString);
+ }
return theResult;
}
@@ -250,185 +250,185 @@
int
runTests(
- int argc,
- char* argv[],
+ int argc,
+ char* argv[],
MemoryManager& theMemoryManager)
{
- int theResult = 0;
+ int theResult = 0;
- try
- {
- XalanFileUtility h(theMemoryManager);
-
- // Set the program help string, then get the command line
parameters.
- //
- setHelp(h);
-
- if (h.getParams(argc, argv, "CONF-RESULTS") == true)
- {
- XalanTransformer xalan(theMemoryManager);
-
- // Get drive designation for final analysis and
generate Unique name for results log.
- //
- XalanDOMString drive(theMemoryManager);
// This is used to get stylesheet for final analysis
+ try
+ {
+ XalanFileUtility h(theMemoryManager);
+
+ // Set the program help string, then get the command line
parameters.
+ //
+ setHelp(h);
+
+ if (h.getParams(argc, argv, "CONF-RESULTS") == true)
+ {
+ XalanTransformer xalan(theMemoryManager);
+
+ // Get drive designation for final analysis and generate Unique
name for results log.
+ //
+ XalanDOMString drive(theMemoryManager); // This is
used to get stylesheet for final analysis
h.getDrive(drive);
- const XalanDOMString resultFilePrefix("conf",
theMemoryManager); // This & UniqRunid used for log file name.
- XalanDOMString UniqRunid(theMemoryManager);
+ const XalanDOMString resultFilePrefix("conf",
theMemoryManager); // This & UniqRunid used for log file name.
+ XalanDOMString UniqRunid(theMemoryManager);
h.generateUniqRunid(UniqRunid);
- XalanDOMString resultsFile(drive, theMemoryManager);
+ XalanDOMString resultsFile(drive, theMemoryManager);
resultsFile += h.args.output;
resultsFile += resultFilePrefix;
resultsFile += UniqRunid;
resultsFile += XalanFileUtility::s_xmlSuffix;
- // Open results log, and do some initialization of
result data.
- //
- XalanXMLFileReporter logFile(theMemoryManager,
resultsFile);
- logFile.logTestFileInit("Conformance Testing:");
- h.data.xmlFormat = XalanDOMString("NotSet",
theMemoryManager);
+ // Open results log, and do some initialization of result data.
+ //
+ XalanXMLFileReporter logFile(theMemoryManager, resultsFile);
+ logFile.logTestFileInit("Conformance Testing:");
+ h.data.xmlFormat = XalanDOMString("NotSet", theMemoryManager);
- // Get the list of Directories that are below conf and
iterate through them
- //
+ // Get the list of Directories that are below conf and iterate
through them
+ //
- // Flag indicates directory found. Used in conjunction
with -sub cmd-line arg.
- bool foundDir = false;
+ // Flag indicates directory found. Used in conjunction with -sub
cmd-line arg.
+ bool foundDir = false;
- typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
+ typedef XalanFileUtility::FileNameVectorType
FileNameVectorType;
- FileNameVectorType dirs(theMemoryManager);
+ FileNameVectorType dirs(theMemoryManager);
h.getDirectoryNames(h.args.base, dirs);
int theResult = 0;
- for(FileNameVectorType::size_type j = 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.
- //
- const XalanDOMString& currentDir = dirs[j];
-
- if (length(h.args.sub) == 0 ||
equals(currentDir, h.args.sub) == true)
- {
- // Check that output directory is there.
- //
- XalanDOMString
theOutputDir(theMemoryManager);
+ {
+ // Skip all but the specified directory if the -sub cmd-line
option was used.
+ //
+ const XalanDOMString& currentDir = dirs[j];
+
+ if (length(h.args.sub) == 0 || equals(currentDir,
h.args.sub) == true)
+ {
+ // Check that output directory is there.
+ //
+ XalanDOMString theOutputDir(theMemoryManager);
theOutputDir = h.args.output;
theOutputDir += currentDir;
- h.checkAndCreateDir(theOutputDir);
+ h.checkAndCreateDir(theOutputDir);
- // Indicate that directory was
processed and get test files from the directory
- //
- foundDir = true;
- FileNameVectorType
files(theMemoryManager);
+ // Indicate that directory was processed and get test
files from the directory
+ //
+ foundDir = true;
+ FileNameVectorType files(theMemoryManager);
h.getTestFileNames(h.args.base, currentDir, true, files);
- // Log directory in results log and
process it's files.
- //
- logFile.logTestCaseInit(currentDir);
-
- for(FileNameVectorType::size_type i =
0; i < files.size(); i++)
- {
- XalanXMLFileReporter::Hashtable
attrs(theMemoryManager);
-
- const XalanDOMString&
currentFile = files[i];
- if
(checkForExclusion(currentFile, theMemoryManager))
- continue;
+ // Log directory in results log and process it's files.
+ //
+ logFile.logTestCaseInit(currentDir);
+
+ for(FileNameVectorType::size_type i = 0; i <
files.size(); i++)
+ {
+ XalanXMLFileReporter::Hashtable
attrs(theMemoryManager);
+
+ const XalanDOMString& currentFile = files[i];
+ if (checkForExclusion(currentFile, theMemoryManager))
+ continue;
- h.data.testOrFile = currentFile;
- XalanDOMString theXSLFile(
h.args.base, theMemoryManager);
+ h.data.testOrFile = currentFile;
+ XalanDOMString theXSLFile( h.args.base,
theMemoryManager);
theXSLFile += currentDir;
theXSLFile += XalanFileUtility::s_pathSep;
theXSLFile += currentFile;
- // Check and see if the .xml
file exists. If not skip this .xsl file and continue.
- bool fileStatus = true;
- XalanDOMString
theXMLFile(theMemoryManager);
+ // Check and see if the .xml file exists. If not
skip this .xsl file and continue.
+ bool fileStatus = true;
+ XalanDOMString theXMLFile(theMemoryManager);
h.generateFileName(theXSLFile, "xml", theXMLFile,
&fileStatus);
- if (!fileStatus)
- continue;
+ if (!fileStatus)
+ continue;
- h.data.xmlFileURL = theXMLFile;
- h.data.xslFileURL = theXSLFile;
+ h.data.xmlFileURL = theXMLFile;
+ h.data.xslFileURL = theXSLFile;
- XalanDOMString
theGoldFile(h.args.gold, theMemoryManager);
+ XalanDOMString theGoldFile(h.args.gold,
theMemoryManager);
theGoldFile += currentDir;
theGoldFile += XalanFileUtility::s_pathSep;
theGoldFile += currentFile;
-
+
h.generateFileName(theGoldFile, "out", theGoldFile);
- XalanDOMString outbase
(h.args.output, theMemoryManager);
+ XalanDOMString outbase (h.args.output,
theMemoryManager);
outbase += currentDir;
outbase += XalanFileUtility::s_pathSep;
outbase += currentFile;
- XalanDOMString
theOutputFile(theMemoryManager);
+ XalanDOMString theOutputFile(theMemoryManager);
h.generateFileName(outbase, "out", theOutputFile);
- const XSLTInputSource
xslInputSource(theXSLFile, theMemoryManager);
- const XSLTInputSource
xmlInputSource(theXMLFile, theMemoryManager);
- const XSLTResultTarget
resultFile(theOutputFile, theMemoryManager);
-
- // Parsing(compile) the XSL
stylesheet and report the results..
- //
- const XalanCompiledStylesheet*
compiledSS = 0;
-
xalan.compileStylesheet(xslInputSource, compiledSS);
- if (compiledSS == 0 )
- {
- // Report the failure
and be sure to increment fail count.
- //
+ const XSLTInputSource xslInputSource(theXSLFile,
theMemoryManager);
+ const XSLTInputSource xmlInputSource(theXMLFile,
theMemoryManager);
+ const XSLTResultTarget resultFile(theOutputFile,
theMemoryManager);
+
+ // Parsing(compile) the XSL stylesheet and report
the results..
+ //
+ const XalanCompiledStylesheet* compiledSS = 0;
+ xalan.compileStylesheet(xslInputSource, compiledSS);
+ if (compiledSS == 0 )
+ {
+ // Report the failure and be sure to increment
fail count.
+ //
CharVectorType theVector(theMemoryManager);
TranscodeToLocalCodePage(currentFile, theVector);
- cout << "Failed to
parse stylesheet for "
+ cout << "Failed to parse stylesheet for "
<< theVector
<< endl;
- h.data.fail += 1;
+ h.data.fail += 1;
XalanDOMString tmp("Failed to parse stylesheet.
", theMemoryManager);
tmp += XalanDOMString(xalan.getLastError(),
theMemoryManager);
-
logFile.logErrorResult(currentFile, theMemoryManager);
- continue;
- }
-
- // Parse the Source XML based
on input parameters, and then perform transform.
- //
- switch (h.args.source)
- {
- case 0:
- case 1:
- theResult =
parseWithTransformer(h.args.source, xalan, xmlInputSource, compiledSS,
resultFile, logFile, h);
- break;
-
- case 2:
- theResult =
parseWithXerces(xalan, xmlInputSource, compiledSS, resultFile, logFile, h);
- break;
- }
-
- // Check and report results...
Then delete compiled stylesheet.
- //
- h.checkResults(theOutputFile,
theGoldFile, logFile);
-
xalan.destroyStylesheet(compiledSS);
- }
-
- logFile.logTestCaseClose("Done",
"Pass");
- }
- }
-
- // Check to see if -sub cmd-line directory was
processed correctly.
- //
- if (!foundDir)
- {
+ logFile.logErrorResult(currentFile,
theMemoryManager);
+ continue;
+ }
+
+ // Parse the Source XML based on input parameters,
and then perform transform.
+ //
+ switch (h.args.source)
+ {
+ case 0:
+ case 1:
+ theResult =
parseWithTransformer(h.args.source, xalan, xmlInputSource, compiledSS,
resultFile, logFile, h);
+ break;
+
+ case 2:
+ theResult = parseWithXerces(xalan,
xmlInputSource, compiledSS, resultFile, logFile, h);
+ break;
+ }
+
+ // Check and report results... Then delete compiled
stylesheet.
+ //
+ h.checkResults(theOutputFile, theGoldFile, logFile);
+ xalan.destroyStylesheet(compiledSS);
+ }
+
+ logFile.logTestCaseClose("Done", "Pass");
+ }
+ }
+
+ // Check to see if -sub cmd-line directory was processed
correctly.
+ //
+ if (!foundDir)
+ {
CharVectorType vect(theMemoryManager);
TranscodeToLocalCodePage(h.args.sub, vect);
- cout << "Specified test directory: \"" <<
c_str(vect) << "\" not found" << endl;
- }
+ cout << "Specified test directory: \"" << c_str(vect) << "\"
not found" << endl;
+ }
else if (theResult != 0)
{
- cout << "An unexpected tranformer error
occurred. The error code is "
+ cout << "An unexpected tranformer error occurred. The error
code is "
<< theResult
<< "\n"
<< "The error message is \""
@@ -436,91 +436,91 @@
<< endl;
}
- h.reportPassFail(logFile, UniqRunid);
- logFile.logTestFileClose("Conformance ", "Done");
- logFile.close();
-
- h.analyzeResults(xalan, resultsFile);
- }
- }
- catch(...)
- {
- cerr << "Initialization of testing harness failed!" << endl <<
endl;
- }
+ h.reportPassFail(logFile, UniqRunid);
+ logFile.logTestFileClose("Conformance ", "Done");
+ logFile.close();
- return theResult;
+ h.analyzeResults(xalan, resultsFile);
+ }
+ }
+ catch(const XalanDiagnosticMemoryManager::LockException&)
+ {
+ cerr << "An attempt was made to allocate memory "
+ "from a locked XalanDiagnosticMemoryManager "
+ "instance!"
+ << endl
+ << endl;
+
+ theResult = -1;
+ }
+ catch(...)
+ {
+ cerr << "Initialization of testing harness failed!" << endl << endl;
+ }
+
+ return theResult;
}
int
main(
- int argc,
- char* argv[])
+ int argc,
+ char* argv[])
{
#if !defined(NDEBUG) && defined(_MSC_VER)
- _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) |
_CRTDBG_LEAK_CHECK_DF);
- _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
- _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+ _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) |
_CRTDBG_LEAK_CHECK_DF);
+ _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
+ _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
#endif
#if defined(XALAN_VQ_SPECIAL_TRACE)
- QuantifyStopRecordingData();
- QuantifyClearData();
+ QuantifyStopRecordingData();
+ QuantifyClearData();
#endif
- int theResult = 0;
+ int theResult = 0;
- try
- {
- XALAN_USING_XERCES(XMLPlatformUtils)
- XALAN_USING_XERCES(XMLUni)
+ try
+ {
+ XALAN_USING_XERCES(XMLPlatformUtils)
+ XALAN_USING_XERCES(XMLUni)
XalanMemoryManagerDefault theGlobalMemoryManager;
XalanDiagnosticMemoryManager
theDiagnosticMemoryManager(theGlobalMemoryManager);
XalanMemoryManagerDefault theTestingMemoryManager;
- // Call the static initializers for xerces and xalan, and
create a transformer
- //
- XMLPlatformUtils::Initialize(
+ // Call the static initializers for xerces and xalan, and create a
transformer
+ //
+ XMLPlatformUtils::Initialize(
XMLUni::fgXercescDefaultLocale,
0,
0,
&theDiagnosticMemoryManager,
true);
- XalanTransformer::initialize(theDiagnosticMemoryManager);
+ XalanTransformer::initialize(theDiagnosticMemoryManager);
theDiagnosticMemoryManager.lock();
{
- theResult = runTests(argc, argv, theTestingMemoryManager);
+ theResult = runTests(argc, argv, theTestingMemoryManager);
}
theDiagnosticMemoryManager.unlock();
- XalanTransformer::terminate();
+ XalanTransformer::terminate();
- XMLPlatformUtils::Terminate();
+ XMLPlatformUtils::Terminate();
- XalanTransformer::ICUCleanUp();
- }
- catch(const XalanDiagnosticMemoryManager::LockException&)
+ XalanTransformer::ICUCleanUp();
+ }
+ catch(...)
{
- cerr << "An attempt was made to allocate memory "
- "from a locked XalanDiagnosticMemoryManager "
- "instance!"
- << endl
- << endl;
+ cerr << "Initialization failed!" << endl << endl;
- theResult = -1;
+ theResult = -1;
}
- catch(...)
- {
- cerr << "Initialization failed!" << endl << endl;
-
- theResult = -1;
- }
- return theResult;
+ return theResult;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
