dbertoni 02/05/08 18:28:23
Modified: c/Tests/Harness FileUtility.cpp FileUtility.hpp
XMLFileReporter.cpp XMLFileReporter.hpp
Log:
Fixed some problems with static strings.
Revision Changes Path
1.38 +0 -8 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- FileUtility.cpp 6 May 2002 05:32:39 -0000 1.37
+++ FileUtility.cpp 9 May 2002 01:28:23 -0000 1.38
@@ -611,9 +611,6 @@
FormatterListener*
FileUtility::getXMLFormatter(
- bool
shouldWriteXMLHeader,
- bool stripCData,
- bool escapeCData,
PrintWriter& resultWriter,
int
indentAmount,
const XalanDOMString& mimeEncoding,
@@ -773,9 +770,6 @@
FormatterListener* const theFormatter =
getXMLFormatter(
- true,
- true,
- true,
myResultWriter,
0,
mimeEncoding,
@@ -982,7 +976,6 @@
const XalanNode::NodeType goldNodeType = gold.getNodeType();
const XalanDOMString& docNodeName = doc.getNodeName();
- const XalanDOMString& goldNodeName = gold.getNodeName();
if (goldNodeType != docNodeType)
{
@@ -1297,7 +1290,6 @@
{
const XalanDOMString& docAttrName = dAttr->getNodeName();
- const XalanDOMString& goldAttrName = gAttr->getNodeName();
//debugAttributeData(goldAttrName);
1.27 +0 -3 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- FileUtility.hpp 22 Jan 2002 18:47:59 -0000 1.26
+++ FileUtility.hpp 9 May 2002 01:28:23 -0000 1.27
@@ -328,9 +328,6 @@
*/
FormatterListener*
getXMLFormatter(
- bool
shouldWriteXMLHeader,
- bool stripCData,
- bool escapeCData,
PrintWriter& resultWriter,
int
indentAmount,
const XalanDOMString& mimeEncoding,
1.16 +38 -32 xml-xalan/c/Tests/Harness/XMLFileReporter.cpp
Index: XMLFileReporter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/XMLFileReporter.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XMLFileReporter.cpp 8 May 2002 20:50:53 -0000 1.15
+++ XMLFileReporter.cpp 9 May 2002 01:28:23 -0000 1.16
@@ -71,39 +71,45 @@
-const XalanDOMString XMLFileReporter::OPT_FILENAME("filename");
-const XalanDOMString XMLFileReporter::ELEM_RESULTSFILE("resultsfile");
-const XalanDOMString XMLFileReporter::ELEM_TESTFILE("testfile");
-const XalanDOMString XMLFileReporter::ELEM_FILERESULT("fileresult");
-const XalanDOMString XMLFileReporter::ELEM_TESTCASE("Test_Dir");
-const XalanDOMString XMLFileReporter::ELEM_CASERESULT("Dir-result");
-const XalanDOMString XMLFileReporter::ELEM_CHECKRESULT("Testcase");
-const XalanDOMString XMLFileReporter::ELEM_STATISTIC("statistic");
-const XalanDOMString XMLFileReporter::ELEM_LONGVAL("longval");
-const XalanDOMString XMLFileReporter::ELEM_DOUBLEVAL("doubleval");
-const XalanDOMString XMLFileReporter::ELEM_MESSAGE("message");
-const XalanDOMString XMLFileReporter::ELEM_ARBITRARY("arbitrary");
-const XalanDOMString XMLFileReporter::ELEM_HASHTABLE("hashtable");
-const XalanDOMString XMLFileReporter::ELEM_HASHITEM("hashitem");
-const XalanDOMString XMLFileReporter::ATTR_LEVEL("level");
-const XalanDOMString XMLFileReporter::ATTR_DESC("desc");
-const XalanDOMString XMLFileReporter::ATTR_TIME("time");
-const XalanDOMString XMLFileReporter::ATTR_RESULT("result");
-const XalanDOMString XMLFileReporter::ATTR_KEY("key");
-const XalanDOMString XMLFileReporter::ATTR_FILENAME =
XMLFileReporter::OPT_FILENAME;
+// $$$ToDo: These strings must be initialized in a static call, and not at
initialization.
+const XalanDOMString XMLFileReporter::OPT_FILENAME(L"filename");
+const XalanDOMString XMLFileReporter::ELEM_RESULTSFILE(L"resultsfile");
+const XalanDOMString XMLFileReporter::ELEM_TESTFILE(L"testfile");
+const XalanDOMString XMLFileReporter::ELEM_FILERESULT(L"fileresult");
+const XalanDOMString XMLFileReporter::ELEM_TESTCASE(L"Test_Dir");
+const XalanDOMString XMLFileReporter::ELEM_CASERESULT(L"Dir-result");
+const XalanDOMString XMLFileReporter::ELEM_CHECKRESULT(L"Testcase");
+const XalanDOMString XMLFileReporter::ELEM_STATISTIC(L"statistic");
+const XalanDOMString XMLFileReporter::ELEM_LONGVAL(L"longval");
+const XalanDOMString XMLFileReporter::ELEM_DOUBLEVAL(L"doubleval");
+const XalanDOMString XMLFileReporter::ELEM_MESSAGE(L"message");
+const XalanDOMString XMLFileReporter::ELEM_ARBITRARY(L"arbitrary");
+const XalanDOMString XMLFileReporter::ELEM_HASHTABLE(L"hashtable");
+const XalanDOMString XMLFileReporter::ELEM_HASHITEM(L"hashitem");
+const XalanDOMString XMLFileReporter::ATTR_LEVEL(L"level");
+const XalanDOMString XMLFileReporter::ATTR_DESC(L"desc");
+const XalanDOMString XMLFileReporter::ATTR_TIME(L"time");
+const XalanDOMString XMLFileReporter::ATTR_RESULT(L"result");
+const XalanDOMString XMLFileReporter::ATTR_KEY(L"key");
+const XalanDOMString XMLFileReporter::ATTR_FILENAME =
XMLFileReporter::OPT_FILENAME;
+const XalanDOMString XMLFileReporter::LESS_THAN(L"<");
+const XalanDOMString XMLFileReporter::GREATER_THAN(L">");
+const XalanDOMString XMLFileReporter::EQUALS_QUOTE(L"=\"");
+const XalanDOMString XMLFileReporter::SPACE(L" ");
+const XalanDOMString XMLFileReporter::QUOTE_SPACE(L"\" ");
-const XalanDOMString XMLFileReporter::TESTCASEINIT_HDR("<" + ELEM_TESTCASE +
" " + ATTR_DESC + "=\"");
-const XalanDOMString XMLFileReporter::TESTCASECLOSE_HDR("<" +
ELEM_CASERESULT + " " + ATTR_DESC + "=\"");
-const XalanDOMString XMLFileReporter::MESSAGE_HDR("<" + ELEM_MESSAGE + " " +
ATTR_LEVEL + "=\"");
-const XalanDOMString XMLFileReporter::STATISTIC_HDR("<" + ELEM_STATISTIC + "
" + ATTR_LEVEL + "=\"");
-const XalanDOMString XMLFileReporter::ARBITRARY_HDR("<" + ELEM_ARBITRARY + "
" + ATTR_LEVEL + "=\"");
-const XalanDOMString XMLFileReporter::HASHTABLE_HDR("<" + ELEM_HASHTABLE + "
" + ATTR_LEVEL + "=\"");
-const XalanDOMString XMLFileReporter::HASHITEM_HDR("<" + ELEM_HASHITEM + " "
+ ATTR_KEY + "=\"");
-const XalanDOMString XMLFileReporter::CHECKPASS_HDR("<" + ELEM_CHECKRESULT +
" " + ATTR_RESULT + "=\"" + "PASS" + "\" " + ATTR_DESC + "=\"");
-const XalanDOMString XMLFileReporter::CHECKAMBG_HDR("<" + ELEM_CHECKRESULT +
" " + ATTR_RESULT + "=\"" + "AMBG" + "\" " + ATTR_DESC + "=\"");
-const XalanDOMString XMLFileReporter::CHECKERRR_HDR("<" + ELEM_CHECKRESULT +
" " + ATTR_RESULT + "=\"" + "ERRR" + "\" " + ATTR_DESC + "=\"");
-const XalanDOMString XMLFileReporter::CHECKFAIL_HDR("<" + ELEM_CHECKRESULT +
" " + ATTR_RESULT + "=\"" + "FAIL" + "\" " + ATTR_DESC + "=\"");
-const XalanDOMString XMLFileReporter::CHECKFAIL_FTR("</" + ELEM_CHECKRESULT
+ ">");
+const XalanDOMString XMLFileReporter::TESTCASEINIT_HDR(LESS_THAN +
ELEM_TESTCASE + SPACE + ATTR_DESC + EQUALS_QUOTE);
+const XalanDOMString XMLFileReporter::TESTCASECLOSE_HDR(LESS_THAN +
ELEM_CASERESULT + SPACE + ATTR_DESC + EQUALS_QUOTE);
+const XalanDOMString XMLFileReporter::MESSAGE_HDR(LESS_THAN + ELEM_MESSAGE +
SPACE + ATTR_LEVEL + EQUALS_QUOTE);
+const XalanDOMString XMLFileReporter::STATISTIC_HDR(LESS_THAN +
ELEM_STATISTIC + SPACE + ATTR_LEVEL + EQUALS_QUOTE);
+const XalanDOMString XMLFileReporter::ARBITRARY_HDR(LESS_THAN +
ELEM_ARBITRARY + SPACE + ATTR_LEVEL + EQUALS_QUOTE);
+const XalanDOMString XMLFileReporter::HASHTABLE_HDR(LESS_THAN +
ELEM_HASHTABLE + SPACE + ATTR_LEVEL + EQUALS_QUOTE);
+const XalanDOMString XMLFileReporter::HASHITEM_HDR(LESS_THAN + ELEM_HASHITEM
+ SPACE + ATTR_KEY + EQUALS_QUOTE);
+const XalanDOMString XMLFileReporter::CHECKPASS_HDR(LESS_THAN +
ELEM_CHECKRESULT + SPACE + ATTR_RESULT + EQUALS_QUOTE + L"PASS" + QUOTE_SPACE +
ATTR_DESC + EQUALS_QUOTE);
+const XalanDOMString XMLFileReporter::CHECKAMBG_HDR(LESS_THAN +
ELEM_CHECKRESULT + SPACE + ATTR_RESULT + EQUALS_QUOTE + L"AMBG" + QUOTE_SPACE +
ATTR_DESC + EQUALS_QUOTE);
+const XalanDOMString XMLFileReporter::CHECKERRR_HDR(LESS_THAN +
ELEM_CHECKRESULT + SPACE + ATTR_RESULT + EQUALS_QUOTE + L"ERRR" + QUOTE_SPACE +
ATTR_DESC + EQUALS_QUOTE);
+const XalanDOMString XMLFileReporter::CHECKFAIL_HDR(LESS_THAN +
ELEM_CHECKRESULT + SPACE + ATTR_RESULT + EQUALS_QUOTE + L"FAIL" + QUOTE_SPACE +
ATTR_DESC + EQUALS_QUOTE);
+const XalanDOMString XMLFileReporter::CHECKFAIL_FTR(L"</" + ELEM_CHECKRESULT
+ GREATER_THAN);
XMLFileReporter::XMLFileReporter():
1.11 +6 -1 xml-xalan/c/Tests/Harness/XMLFileReporter.hpp
Index: XMLFileReporter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/XMLFileReporter.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLFileReporter.hpp 10 Apr 2002 05:32:32 -0000 1.10
+++ XMLFileReporter.hpp 9 May 2002 01:28:23 -0000 1.11
@@ -76,7 +76,7 @@
/**
* Reporter that saves output to a simple XML-format file.
* @author [EMAIL PROTECTED]
- * @version $Id: XMLFileReporter.hpp,v 1.10 2002/04/10 05:32:32 dbertoni Exp
$
+ * @version $Id: XMLFileReporter.hpp,v 1.11 2002/05/09 01:28:23 dbertoni Exp
$
*/
#if defined(XALAN_NO_NAMESPACES)
@@ -357,6 +357,11 @@
static const XalanDOMString ATTR_RESULT;
static const XalanDOMString ATTR_KEY;
static const XalanDOMString ATTR_FILENAME;
+ static const XalanDOMString LESS_THAN;
+ static const XalanDOMString GREATER_THAN;
+ static const XalanDOMString EQUALS_QUOTE;
+ static const XalanDOMString SPACE;
+ static const XalanDOMString QUOTE_SPACE;
/**
* Optimization: for heavy use methods, form pre-defined constants to
save on XalanDOMString concatenation.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
