pauldick 01/09/14 14:03:46 Added: c/Tests/Errortests Errortests.dsp Errortests.cpp Log: New test to run error test cases. Revision Changes Path 1.1 xml-xalan/c/Tests/Errortests/Errortests.dsp Index: Errortests.dsp =================================================================== # Microsoft Developer Studio Project File - Name="Errortests" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=Errortests - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "Errortests.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "Errortests.mak" CFG="Errortests - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "Errortests - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "Errortests - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "Errortests - Win32 Release with symbols" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "Errortests - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\Build\Win32\VC6\Release" # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release\Errortests" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib ..\..\Build\Win32\VC6\Release\*.lib /nologo /stack:0x1f4000 /subsystem:console /pdb:none /machine:I386 !ELSEIF "$(CFG)" == "Errortests - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\Build\Win32\VC6\debug" # PROP Intermediate_Dir "..\..\Build\Win32\VC6\debug\Errortests" # 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 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug\xerces-c_1D.lib ..\..\Build\Win32\VC6\Debug\*.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /pdbtype:sept !ELSEIF "$(CFG)" == "Errortests - Win32 Release with symbols" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Errortests___Win32_Release_with_symbols" # PROP BASE Intermediate_Dir "Errortests___Win32_Release_with_symbols" # PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\Build\Win32\VC6\Release.symbols" # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release.symbols\Errortests" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 ..\..\Build\Win32\VC6\Release\Harness.lib ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib ..\..\Build\Win32\VC6\Release\*.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\..\Build\Win32\VC6\Release/perft.exe" # ADD LINK32 ..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib ..\..\Build\Win32\VC6\Release.symbols\*.lib /nologo /stack:0x1f4000 /subsystem:console /debug /machine:I386 /fixed:no # SUBTRACT LINK32 /pdb:none !ENDIF # Begin Target # Name "Errortests - Win32 Release" # Name "Errortests - Win32 Debug" # Name "Errortests - Win32 Release with symbols" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=.\Errortests.cpp !IF "$(CFG)" == "Errortests - Win32 Release" # ADD CPP /MD /Zi !ELSEIF "$(CFG)" == "Errortests - Win32 Debug" # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Debug\Errortests" # ADD CPP /MDd /Zi !ELSEIF "$(CFG)" == "Errortests - Win32 Release with symbols" # ADD BASE CPP /MD /Zi # ADD CPP /MD /Zi !ENDIF # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # End Target # End Project 1.1 xml-xalan/c/Tests/Errortests/Errortests.cpp Index: Errortests.cpp =================================================================== /* * The Apache Software License, Version 1.1 * * * Copyright (c) 1999 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Xalan" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation and was * originally based on software copyright (c) 1999, International * Business Machines, Inc., http://www.ibm.com. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ #include <iostream> #include <strstream> #include <stdio.h> #include <direct.h> #if !defined(XALAN_NO_NAMESPACES) using std::cerr; using std::cout; using std::cin; using std::endl; using std::ifstream; using std::ios_base; using std::ostrstream; using std::string; #endif // XERCES HEADERS... // Are included by HarnessInit.hpp // XALAN HEADERS... // Are included by FileUtility.hpp // HARNESS HEADERS... #include <XMLFileReporter.hpp> #include <FileUtility.hpp> #include <HarnessInit.hpp> #if defined(XALAN_NO_NAMESPACES) typedef map<XalanDOMString, XalanDOMString, less<XalanDOMString> > Hashtable; #else typedef std::map<XalanDOMString, XalanDOMString> Hashtable; #endif // This is here for memory leak testing. #if !defined(NDEBUG) && defined(_MSC_VER) #include <crtdbg.h> #endif const char* const excludeStylesheets[] = { /* "attribseterr05.xsl", "attribseterr06.xsl", "namedtemplateerr03.xsl", "namedtemplateerr11.xsl", */ "sorterr06.xsl", 0 }; FileUtility futil; void printArgOptions() { cerr << endl << "errortests dirname [-category -out -gold]" << endl << endl << "dirname (base directory for testcases)" << endl << "-category dirname (specific directory)" << endl << "-out dirname (base directory for output)" << endl; } bool getParams(int argc, const char* argv[], FileUtility& f, XalanDOMString& baseDir, XalanDOMString& outDir, XalanDOMString& category) { bool fSuccess = true; // Used to continue argument loop bool fsetOut = true; // Set default output directory, set to false if data is provided // Insure that required "-base" argument is there. if (argc == 1 || argv[1][0] == '-') { printArgOptions(); return false; } else { if (f.checkDir(pathSep + XalanDOMString(argv[1]))) { assign(baseDir, XalanDOMString(argv[1])); insert(baseDir, 0, pathSep); } else { cout << endl << "Given base directory \"" << argv[1] << "\" does not exist" << endl; printArgOptions(); return false; } } // Get the rest of the arguments in any order. for (int i = 2; i < argc && fSuccess == true; ++i) { if(!stricmp("-out", argv[i])) { ++i; if(i < argc && argv[i][0] != '-') { assign(outDir, XalanDOMString(argv[i])); insert(outDir, 0, XalanDOMString("\\")); append(outDir, XalanDOMString("\\")); f.checkAndCreateDir(outDir); fsetOut = false; } else { printArgOptions(); fSuccess = false; } } else if(!stricmp("-category", argv[i])) { ++i; if(i < argc && argv[i][0] != '-') { assign(category, XalanDOMString(argv[i])); append(category, XalanDOMString("\\err")); } else { printArgOptions(); fSuccess = false; } } else { printArgOptions(); fSuccess = false; } } // End of for-loop // Do we need to set the default output directory?? if (fsetOut) { unsigned int ii = lastIndexOf(baseDir,charAt(pathSep,0)); outDir = substring(baseDir, 0, ii+1); append(outDir,XalanDOMString("CONF-ERR-results")); f.checkAndCreateDir(outDir); append(outDir,pathSep); } // Add the path seperator to the end of the base directory // here after we've finished using it for all directory creation. append(baseDir,pathSep); return fSuccess; } inline bool checkForExclusion(XalanDOMString currentFile) { for (int i=0; excludeStylesheets[i] != 0; i++) { if (equals(currentFile, XalanDOMString(excludeStylesheets[i]))) { return true; } } return false; } int main( int argc, const 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); #endif HarnessInit xmlPlatformUtils; XalanTransformer::initialize(); { Hashtable runAttrs; // Attribute list for perfdata element int theResult = 0; XalanDOMString category; // Test all of base dir by default XalanDOMString baseDir, outputRoot, goldRoot; if (getParams(argc, argv, futil, baseDir, outputRoot, category) == true) { // // Call the static initializers for xerces and xalan, and create a transformer // XalanTransformer xalan; XalanSourceTreeDOMSupport domSupport; XalanSourceTreeParserLiaison parserLiaison(domSupport); domSupport.setParserLiaison(&parserLiaison); // Generate Unique Run id and processor info const XalanDOMString UniqRunid = futil.GenerateUniqRunid(); // Defined basic constants for file manipulation and open results file const XalanDOMString resultFilePrefix("cpp"); const XalanDOMString resultsFile(outputRoot + resultFilePrefix + UniqRunid + XMLSuffix); XMLFileReporter logFile(resultsFile); logFile.logTestFileInit("Error Testing:"); // Create run entry that contains runid and number of iterations used for averages. runAttrs.insert(Hashtable::value_type(XalanDOMString("UniqRunid"), UniqRunid)); runAttrs.insert(Hashtable::value_type(XalanDOMString("Xerces-Version "), futil.getXercesVersion())); logFile.logElementWAttrs(10, "Rundata", runAttrs, "xxx"); // Get the list of Directories that are below conf const FileNameVectorType dirs = futil.getDirectoryNames(baseDir); for(FileNameVectorType::size_type j = 0; j < dirs.size(); ++j) { const XalanDOMString currentDir(dirs[j] + XalanDOMString("\\err")); // Run specific category of files from given directory if (length(category) > 0 && !equals(currentDir, category)) { continue; } // Check that output directory is there. const XalanDOMString theOutputDir = outputRoot + currentDir; futil.checkAndCreateDir(theOutputDir); // Get the files found in the test directory const FileNameVectorType files = futil.getTestFileNames(baseDir, currentDir, false); logFile.logTestCaseInit(currentDir); for(FileNameVectorType::size_type i = 0; i < files.size(); i++) { Hashtable attrs; const XalanDOMString currentFile(files[i]); futil.data.testOrFile = currentFile; if (checkForExclusion(currentFile)) continue; const XalanDOMString theXSLFile= baseDir + currentDir + pathSep + currentFile; const XalanDOMString theXMLFile = futil.GenerateFileName(theXSLFile,"xml"); XalanDOMString theGoldFile = goldRoot + currentDir + pathSep + currentFile; theGoldFile = futil.GenerateFileName(theGoldFile, "out"); const XalanDOMString outbase = outputRoot + currentDir + pathSep + currentFile; const XalanDOMString theOutputFile = futil.GenerateFileName(outbase, "out"); const XSLTInputSource xslInputSource(c_wstr(theXSLFile)); const XSLTInputSource xmlInputSource(c_wstr(theXMLFile)); const XSLTInputSource goldInputSource(c_wstr(theGoldFile)); const XSLTResultTarget resultFile(theOutputFile); // // Parsing(compile) the XSL stylesheet and report the results.. // cout << endl << "PARSING STYLESHEET FOR: " << currentFile << endl; const XalanCompiledStylesheet* compiledSS = 0; xalan.compileStylesheet(xslInputSource, compiledSS); if (compiledSS == 0 ) { cout << "FAILED to parse stylesheet for " << currentFile << endl; cout << "Reason: " << xalan.getLastError() << endl; logFile.logErrorResult(currentFile, XalanDOMString(xalan.getLastError())); //logFile.logCheckFail(currentFile); //logFile.logCheckErr(XalanDOMString(xalan.getLastError())); continue; } // // Parsing the input XML and report the results.. // cout << "PARSING SOURCE XML FOR: " << currentFile << endl; const XalanParsedSource* parsedSource = 0; xalan.parseSource(xmlInputSource, parsedSource); if (parsedSource == 0) { cout << "Failed to PARSE source document for " << currentFile << endl; continue; } // // Perform One transform using parsed stylesheet and parsed xml source, report results... // cout << "TRANSFORMING: " << currentFile << endl; theResult = xalan.transform(*parsedSource, compiledSS, resultFile); if (!theResult) { logFile.logCheckPass(currentFile); // futil.checkResults(theOutputFile, // theGoldFile, // logFile); } parserLiaison.reset(); xalan.destroyParsedSource(parsedSource); xalan.destroyStylesheet(compiledSS); } //for files logFile.logTestCaseClose("Done", "Pass"); } //for directories logFile.logTestFileClose("Conformance ", "Done"); logFile.close(); } //if getParams } XalanTransformer::terminate(); return 0; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
