generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 02:53:10 +01:00
Code Issues Projects Releases Wiki Activity

Poco 1.9.1 assert true (#2255)

Browse Source 
* Rename assert by assertTrue

* Update submodules

* Missing assertTrue

* Rename poco_assertTrue to poco_assert

* Rename poco_assertTrue to poco_assert
This commit is contained in:
zosrothko
2018-03-29 19:12:54 +02:00
committed by Aleksandar Fabijanic
parent 5a1bf5eb4a
commit 960ecb38f0
232 changed files with 16274 additions and 16265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
XML/testsuite/src/AttributesImplTest.cpp
View File

@@ -31,51 +31,51 @@ void AttributesImplTest::testNoNamespaces()
{
AttributesImpl attrs;
assert (attrs.getLength() == 0);
assert (attrs.getIndex("foo") == -1);
assert (attrs.getValue("foo").empty());
assertTrue (attrs.getLength() == 0);
assertTrue (attrs.getIndex("foo") == -1);
assertTrue (attrs.getValue("foo").empty());
attrs.addAttribute("", "", "a1", "CDATA", "v1");
assert (attrs.getLength() == 1);
assert (attrs.getIndex("a1") == 0);
assert (attrs.getQName(0) == "a1");
assert (attrs.getType(0) == "CDATA");
assert (attrs.getValue(0) == "v1");
assert (attrs.isSpecified(0));
assertTrue (attrs.getLength() == 1);
assertTrue (attrs.getIndex("a1") == 0);
assertTrue (attrs.getQName(0) == "a1");
assertTrue (attrs.getType(0) == "CDATA");
assertTrue (attrs.getValue(0) == "v1");
assertTrue (attrs.isSpecified(0));
assert (attrs.getType("a1") == "CDATA");
assert (attrs.getValue("a1") == "v1");
assertTrue (attrs.getType("a1") == "CDATA");
assertTrue (attrs.getValue("a1") == "v1");
attrs.addAttribute("", "", "a2", "CDATA", "v2");
assert (attrs.getLength() == 2);
assert (attrs.getIndex("a2") == 1);
assert (attrs.getQName(1) == "a2");
assert (attrs.getType(1) == "CDATA");
assert (attrs.getValue(1) == "v2");
assert (attrs.isSpecified(1));
assertTrue (attrs.getLength() == 2);
assertTrue (attrs.getIndex("a2") == 1);
assertTrue (attrs.getQName(1) == "a2");
assertTrue (attrs.getType(1) == "CDATA");
assertTrue (attrs.getValue(1) == "v2");
assertTrue (attrs.isSpecified(1));
assert (attrs.getType("a2") == "CDATA");
assert (attrs.getValue("a2") == "v2");
assertTrue (attrs.getType("a2") == "CDATA");
assertTrue (attrs.getValue("a2") == "v2");
attrs.addAttribute("", "", "a3", "CDATA", "v3");
assert (attrs.getLength() == 3);
assert (attrs.getIndex("a3") == 2);
assert (attrs.getValue("a3") == "v3");
assertTrue (attrs.getLength() == 3);
assertTrue (attrs.getIndex("a3") == 2);
assertTrue (attrs.getValue("a3") == "v3");
attrs.removeAttribute(0);
assert (attrs.getLength() == 2);
assert (attrs.getIndex("a1") == -1);
assert (attrs.getIndex("a2") == 0);
assert (attrs.getIndex("a3") == 1);
assert (attrs.getQName(0) == "a2");
assert (attrs.getQName(1) == "a3");
assertTrue (attrs.getLength() == 2);
assertTrue (attrs.getIndex("a1") == -1);
assertTrue (attrs.getIndex("a2") == 0);
assertTrue (attrs.getIndex("a3") == 1);
assertTrue (attrs.getQName(0) == "a2");
assertTrue (attrs.getQName(1) == "a3");
attrs.removeAttribute("a3");
assert (attrs.getLength() == 1);
assert (attrs.getIndex("a1") == -1);
assert (attrs.getIndex("a2") == 0);
assert (attrs.getIndex("a3") == -1);
assert (attrs.getQName(0) == "a2");
assertTrue (attrs.getLength() == 1);
assertTrue (attrs.getIndex("a1") == -1);
assertTrue (attrs.getIndex("a2") == 0);
assertTrue (attrs.getIndex("a3") == -1);
assertTrue (attrs.getQName(0) == "a2");
}
@@ -83,64 +83,64 @@ void AttributesImplTest::testNamespaces()
{
AttributesImpl attrs;
assert (attrs.getLength() == 0);
assert (attrs.getIndex("urn:ns", "foo") == -1);
assert (attrs.getValue("urn:ns", "foo").empty());
assertTrue (attrs.getLength() == 0);
assertTrue (attrs.getIndex("urn:ns", "foo") == -1);
assertTrue (attrs.getValue("urn:ns", "foo").empty());
attrs.addAttribute("urn:ns", "a1", "p:a1", "CDATA", "v1");
assert (attrs.getLength() == 1);
assert (attrs.getIndex("urn:ns", "a1") == 0);
assert (attrs.getQName(0) == "p:a1");
assert (attrs.getLocalName(0) == "a1");
assert (attrs.getURI(0) == "urn:ns");
assert (attrs.getType(0) == "CDATA");
assert (attrs.getValue(0) == "v1");
assert (attrs.isSpecified(0));
assertTrue (attrs.getLength() == 1);
assertTrue (attrs.getIndex("urn:ns", "a1") == 0);
assertTrue (attrs.getQName(0) == "p:a1");
assertTrue (attrs.getLocalName(0) == "a1");
assertTrue (attrs.getURI(0) == "urn:ns");
assertTrue (attrs.getType(0) == "CDATA");
assertTrue (attrs.getValue(0) == "v1");
assertTrue (attrs.isSpecified(0));
assert (attrs.getType("urn:ns", "a1") == "CDATA");
assert (attrs.getValue("urn:ns", "a1") == "v1");
assertTrue (attrs.getType("urn:ns", "a1") == "CDATA");
assertTrue (attrs.getValue("urn:ns", "a1") == "v1");
attrs.addAttribute("urn:ns", "a2", "p:a2", "CDATA", "v2");
assert (attrs.getLength() == 2);
assert (attrs.getIndex("urn:ns", "a2") == 1);
assert (attrs.getQName(1) == "p:a2");
assert (attrs.getLocalName(1) == "a2");
assert (attrs.getURI(1) == "urn:ns");
assert (attrs.getType(1) == "CDATA");
assert (attrs.getValue(1) == "v2");
assert (attrs.isSpecified(1));
assertTrue (attrs.getLength() == 2);
assertTrue (attrs.getIndex("urn:ns", "a2") == 1);
assertTrue (attrs.getQName(1) == "p:a2");
assertTrue (attrs.getLocalName(1) == "a2");
assertTrue (attrs.getURI(1) == "urn:ns");
assertTrue (attrs.getType(1) == "CDATA");
assertTrue (attrs.getValue(1) == "v2");
assertTrue (attrs.isSpecified(1));
assert (attrs.getType("urn:ns", "a2") == "CDATA");
assert (attrs.getValue("urn:ns", "a2") == "v2");
assertTrue (attrs.getType("urn:ns", "a2") == "CDATA");
assertTrue (attrs.getValue("urn:ns", "a2") == "v2");
assert (attrs.getIndex("urn:ns2", "a2") == -1);
assertTrue (attrs.getIndex("urn:ns2", "a2") == -1);
attrs.addAttribute("urn:ns2", "a3", "q:a3", "CDATA", "v3");
assert (attrs.getLength() == 3);
assert (attrs.getIndex("urn:ns2", "a3") == 2);
assert (attrs.getValue("urn:ns2", "a3") == "v3");
assertTrue (attrs.getLength() == 3);
assertTrue (attrs.getIndex("urn:ns2", "a3") == 2);
assertTrue (attrs.getValue("urn:ns2", "a3") == "v3");
attrs.removeAttribute(0);
assert (attrs.getLength() == 2);
assert (attrs.getIndex("urn:ns", "a1") == -1);
assert (attrs.getIndex("urn:ns", "a2") == 0);
assert (attrs.getIndex("urn:ns2", "a3") == 1);
assert (attrs.getQName(0) == "p:a2");
assert (attrs.getLocalName(0) == "a2");
assert (attrs.getURI(0) == "urn:ns");
assert (attrs.getQName(1) == "q:a3");
assert (attrs.getLocalName(1) == "a3");
assert (attrs.getURI(1) == "urn:ns2");
assertTrue (attrs.getLength() == 2);
assertTrue (attrs.getIndex("urn:ns", "a1") == -1);
assertTrue (attrs.getIndex("urn:ns", "a2") == 0);
assertTrue (attrs.getIndex("urn:ns2", "a3") == 1);
assertTrue (attrs.getQName(0) == "p:a2");
assertTrue (attrs.getLocalName(0) == "a2");
assertTrue (attrs.getURI(0) == "urn:ns");
assertTrue (attrs.getQName(1) == "q:a3");
assertTrue (attrs.getLocalName(1) == "a3");
assertTrue (attrs.getURI(1) == "urn:ns2");
attrs.removeAttribute("urn:ns", "a3");
assert (attrs.getLength() == 2);
assertTrue (attrs.getLength() == 2);
attrs.removeAttribute("urn:ns2", "a3");
assert (attrs.getLength() == 1);
assert (attrs.getIndex("urn:ns", "a1") == -1);
assert (attrs.getIndex("urn:ns", "a2") == 0);
assert (attrs.getIndex("urn:ns2", "a3") == -1);
assert (attrs.getQName(0) == "p:a2");
assertTrue (attrs.getLength() == 1);
assertTrue (attrs.getIndex("urn:ns", "a1") == -1);
assertTrue (attrs.getIndex("urn:ns", "a2") == 0);
assertTrue (attrs.getIndex("urn:ns2", "a3") == -1);
assertTrue (attrs.getQName(0) == "p:a2");
}
@@ -151,43 +151,43 @@ void AttributesImplTest::testAccessors()
attrs.addAttribute("urn:ns1", "a2", "p:a2", "CDATA", "v2", false);
attrs.addAttribute("urn:ns2", "a3", "q:a3", "CDATA", "v3", true);
assert (attrs.getQName(0) == "p:a1");
assert (attrs.getQName(1) == "p:a2");
assert (attrs.getQName(2) == "q:a3");
assertTrue (attrs.getQName(0) == "p:a1");
assertTrue (attrs.getQName(1) == "p:a2");
assertTrue (attrs.getQName(2) == "q:a3");
assert (attrs.getLocalName(0) == "a1");
assert (attrs.getLocalName(1) == "a2");
assert (attrs.getLocalName(2) == "a3");
assertTrue (attrs.getLocalName(0) == "a1");
assertTrue (attrs.getLocalName(1) == "a2");
assertTrue (attrs.getLocalName(2) == "a3");
assert (attrs.getURI(0) == "urn:ns1");
assert (attrs.getURI(1) == "urn:ns1");
assert (attrs.getURI(2) == "urn:ns2");
assertTrue (attrs.getURI(0) == "urn:ns1");
assertTrue (attrs.getURI(1) == "urn:ns1");
assertTrue (attrs.getURI(2) == "urn:ns2");
assert (attrs.getValue(0) == "v1");
assert (attrs.getValue(1) == "v2");
assert (attrs.getValue(2) == "v3");
assertTrue (attrs.getValue(0) == "v1");
assertTrue (attrs.getValue(1) == "v2");
assertTrue (attrs.getValue(2) == "v3");
assert (attrs.isSpecified(0));
assert (!attrs.isSpecified(1));
assert (attrs.isSpecified(2));
assertTrue (attrs.isSpecified(0));
assertTrue (!attrs.isSpecified(1));
assertTrue (attrs.isSpecified(2));
attrs.setType(0, "NMTOKEN");
assert (attrs.getType(0) == "NMTOKEN");
assert (attrs.getType("urn:ns1", "a1") == "NMTOKEN");
assertTrue (attrs.getType(0) == "NMTOKEN");
assertTrue (attrs.getType("urn:ns1", "a1") == "NMTOKEN");
attrs.setValue(1, "v2 v2");
assert (attrs.getValue(1) == "v2 v2");
assert (attrs.getValue("urn:ns1", "a2") == "v2 v2");
assert (attrs.isSpecified(1));
assertTrue (attrs.getValue(1) == "v2 v2");
assertTrue (attrs.getValue("urn:ns1", "a2") == "v2 v2");
assertTrue (attrs.isSpecified(1));
attrs.setLocalName(2, "A3");
assert (attrs.getLocalName(2) == "A3");
assertTrue (attrs.getLocalName(2) == "A3");
attrs.setQName(2, "p:A3");
assert (attrs.getQName(2) == "p:A3");
assertTrue (attrs.getQName(2) == "p:A3");
attrs.setURI(2, "urn:ns1");
assert (attrs.getURI(2) == "urn:ns1");
assertTrue (attrs.getURI(2) == "urn:ns1");
assert (attrs.getValue("urn:ns1", "A3") == "v3");
assertTrue (attrs.getValue("urn:ns1", "A3") == "v3");
}
@@ -201,23 +201,23 @@ void AttributesImplTest::testCopy()
AttributesImpl attrs2;
attrs2.setAttributes(attrs);
assert (attrs2.getLength() == 3);
assertTrue (attrs2.getLength() == 3);
assert (attrs2.getQName(0) == "p:a1");
assert (attrs2.getQName(1) == "p:a2");
assert (attrs2.getQName(2) == "q:a3");
assertTrue (attrs2.getQName(0) == "p:a1");
assertTrue (attrs2.getQName(1) == "p:a2");
assertTrue (attrs2.getQName(2) == "q:a3");
assert (attrs2.getLocalName(0) == "a1");
assert (attrs2.getLocalName(1) == "a2");
assert (attrs2.getLocalName(2) == "a3");
assertTrue (attrs2.getLocalName(0) == "a1");
assertTrue (attrs2.getLocalName(1) == "a2");
assertTrue (attrs2.getLocalName(2) == "a3");
assert (attrs2.getURI(0) == "urn:ns1");
assert (attrs2.getURI(1) == "urn:ns1");
assert (attrs2.getURI(2) == "urn:ns2");
assertTrue (attrs2.getURI(0) == "urn:ns1");
assertTrue (attrs2.getURI(1) == "urn:ns1");
assertTrue (attrs2.getURI(2) == "urn:ns2");
assert (attrs2.getValue(0) == "v1");
assert (attrs2.getValue(1) == "v2");
assert (attrs2.getValue(2) == "v3");
assertTrue (attrs2.getValue(0) == "v1");
assertTrue (attrs2.getValue(1) == "v2");
assertTrue (attrs2.getValue(2) == "v3");
}

40
XML/testsuite/src/ChildNodesTest.cpp
View File

@@ -39,46 +39,46 @@ void ChildNodesTest::testChildNodes()
AutoPtr<Document> pDoc = new Document;
AutoPtr<Element> pRoot = pDoc->createElement("root");
assert (!pRoot->hasChildNodes());
assertTrue (!pRoot->hasChildNodes());
AutoPtr<NodeList> pNL = pRoot->childNodes();
assert (pNL->length() == 0);
assertTrue (pNL->length() == 0);
AutoPtr<Element> pChild1 = pDoc->createElement("child1");
pRoot->appendChild(pChild1);
assert (pRoot->hasChildNodes());
assertTrue (pRoot->hasChildNodes());
assert (pNL->length() == 1);
assert (pNL->item(0) == pChild1);
assertTrue (pNL->length() == 1);
assertTrue (pNL->item(0) == pChild1);
AutoPtr<Element> pChild2 = pDoc->createElement("child2");
pRoot->appendChild(pChild2);
assert (pNL->length() == 2);
assert (pNL->item(0) == pChild1);
assert (pNL->item(1) == pChild2);
assertTrue (pNL->length() == 2);
assertTrue (pNL->item(0) == pChild1);
assertTrue (pNL->item(1) == pChild2);
AutoPtr<Element> pChild0 = pDoc->createElement("child0");
pRoot->insertBefore(pChild0, pChild1);
assert (pNL->length() == 3);
assert (pNL->item(0) == pChild0);
assert (pNL->item(1) == pChild1);
assert (pNL->item(2) == pChild2);
assertTrue (pNL->length() == 3);
assertTrue (pNL->item(0) == pChild0);
assertTrue (pNL->item(1) == pChild1);
assertTrue (pNL->item(2) == pChild2);
pRoot->removeChild(pChild1);
assert (pNL->length() == 2);
assert (pNL->item(0) == pChild0);
assert (pNL->item(1) == pChild2);
assertTrue (pNL->length() == 2);
assertTrue (pNL->item(0) == pChild0);
assertTrue (pNL->item(1) == pChild2);
pRoot->removeChild(pChild0);
assert (pNL->length() == 1);
assert (pNL->item(0) == pChild2);
assertTrue (pNL->length() == 1);
assertTrue (pNL->item(0) == pChild2);
pRoot->removeChild(pChild2);
assert (pNL->length() == 0);
assert (pNL->item(0) == 0);
assertTrue (pNL->length() == 0);
assertTrue (pNL->item(0) == 0);
assert (!pRoot->hasChildNodes());
assertTrue (!pRoot->hasChildNodes());
}

104
XML/testsuite/src/DocumentTest.cpp
View File

@@ -44,13 +44,13 @@ void DocumentTest::testDocumentElement()
AutoPtr<Document> pDoc = new Document;
AutoPtr<Element> pRoot = pDoc->createElement("root");
assert (pDoc->documentElement() == 0);
assertTrue (pDoc->documentElement() == 0);
pDoc->appendChild(pRoot);
assert (pDoc->documentElement() == pRoot);
assertTrue (pDoc->documentElement() == pRoot);
AutoPtr<Text> pText = pDoc->createTextNode(" ");
pDoc->insertBefore(pText, pRoot);
assert (pDoc->documentElement() == pRoot);
assertTrue (pDoc->documentElement() == pRoot);
}
@@ -72,8 +72,8 @@ void DocumentTest::testImport()
}
AutoPtr<Element> pRoot2 = static_cast<Element*>(pDoc2->importNode(pRoot1, false));
assert (pRoot2->ownerDocument() == pDoc2);
assert (pRoot1->ownerDocument() == pDoc1);
assertTrue (pRoot2->ownerDocument() == pDoc2);
assertTrue (pRoot1->ownerDocument() == pDoc1);
pDoc2->appendChild(pRoot2);
}
@@ -104,12 +104,12 @@ void DocumentTest::testImportDeep()
}
AutoPtr<Element> pRoot2 = static_cast<Element*>(pDoc2->importNode(pRoot1, true));
assert (pRoot2->ownerDocument() == pDoc2);
assert (pRoot2->firstChild()->ownerDocument() == pDoc2);
assert (pRoot2->firstChild()->firstChild()->ownerDocument() == pDoc2);
assert (pRoot1->ownerDocument() == pDoc1);
assert (pRoot1->firstChild()->ownerDocument() == pDoc1);
assert (pRoot1->firstChild()->firstChild()->ownerDocument() == pDoc1);
assertTrue (pRoot2->ownerDocument() == pDoc2);
assertTrue (pRoot2->firstChild()->ownerDocument() == pDoc2);
assertTrue (pRoot2->firstChild()->firstChild()->ownerDocument() == pDoc2);
assertTrue (pRoot1->ownerDocument() == pDoc1);
assertTrue (pRoot1->firstChild()->ownerDocument() == pDoc1);
assertTrue (pRoot1->firstChild()->firstChild()->ownerDocument() == pDoc1);
pDoc2->appendChild(pRoot2);
}
@@ -123,28 +123,28 @@ void DocumentTest::testElementsByTagName()
AutoPtr<NodeList> pNL1 = pDoc->getElementsByTagName("*");
AutoPtr<NodeList> pNL2 = pDoc->getElementsByTagName("elem");
assert (pNL1->length() == 1);
assert (pNL1->item(0) == pRoot);
assert (pNL2->length() == 0);
assertTrue (pNL1->length() == 1);
assertTrue (pNL1->item(0) == pRoot);
assertTrue (pNL2->length() == 0);
AutoPtr<Element> pElem1 = pDoc->createElement("elem");
pRoot->appendChild(pElem1);
assert (pNL1->length() == 2);
assert (pNL2->length() == 1);
assert (pNL1->item(0) == pRoot);
assert (pNL1->item(1) == pElem1);
assert (pNL2->item(0) == pElem1);
assertTrue (pNL1->length() == 2);
assertTrue (pNL2->length() == 1);
assertTrue (pNL1->item(0) == pRoot);
assertTrue (pNL1->item(1) == pElem1);
assertTrue (pNL2->item(0) == pElem1);
AutoPtr<Element> pElem2 = pDoc->createElement("Elem");
pRoot->appendChild(pElem2);
assert (pNL1->length() == 3);
assert (pNL2->length() == 1);
assert (pNL1->item(0) == pRoot);
assert (pNL1->item(1) == pElem1);
assert (pNL1->item(2) == pElem2);
assert (pNL2->item(0) == pElem1);
assertTrue (pNL1->length() == 3);
assertTrue (pNL2->length() == 1);
assertTrue (pNL1->item(0) == pRoot);
assertTrue (pNL1->item(1) == pElem1);
assertTrue (pNL1->item(2) == pElem2);
assertTrue (pNL2->item(0) == pElem1);
}
@@ -156,28 +156,28 @@ void DocumentTest::testElementsByTagNameNS()
AutoPtr<NodeList> pNL1 = pDoc->getElementsByTagNameNS("*", "*");
AutoPtr<NodeList> pNL2 = pDoc->getElementsByTagNameNS("*", "elem");
assert (pNL1->length() == 1);
assert (pNL1->item(0) == pRoot);
assert (pNL2->length() == 0);
assertTrue (pNL1->length() == 1);
assertTrue (pNL1->item(0) == pRoot);
assertTrue (pNL2->length() == 0);
AutoPtr<Element> pElem1 = pDoc->createElementNS("urn:ns1", "elem");
pRoot->appendChild(pElem1);
assert (pNL1->length() == 2);
assert (pNL2->length() == 1);
assert (pNL1->item(0) == pRoot);
assert (pNL1->item(1) == pElem1);
assert (pNL2->item(0) == pElem1);
assertTrue (pNL1->length() == 2);
assertTrue (pNL2->length() == 1);
assertTrue (pNL1->item(0) == pRoot);
assertTrue (pNL1->item(1) == pElem1);
assertTrue (pNL2->item(0) == pElem1);
AutoPtr<Element> pElem2 = pDoc->createElementNS("urn:ns1", "Elem");
pRoot->appendChild(pElem2);
assert (pNL1->length() == 3);
assert (pNL2->length() == 1);
assert (pNL1->item(0) == pRoot);
assert (pNL1->item(1) == pElem1);
assert (pNL1->item(2) == pElem2);
assert (pNL2->item(0) == pElem1);
assertTrue (pNL1->length() == 3);
assertTrue (pNL2->length() == 1);
assertTrue (pNL1->item(0) == pRoot);
assertTrue (pNL1->item(1) == pElem1);
assertTrue (pNL1->item(2) == pElem2);
assertTrue (pNL2->item(0) == pElem1);
}
@@ -201,22 +201,22 @@ void DocumentTest::testElementById()
pDoc->appendChild(pRoot);
Element* pFound = pDoc->getElementById("0", "id");
assert (pFound == pRoot);
assertTrue (pFound == pRoot);
pFound = pDoc->getElementById("1", "id");
assert (pFound == pElem1);
assertTrue (pFound == pElem1);
pFound = pDoc->getElementById("2", "id");
assert (pFound == pElem2);
assertTrue (pFound == pElem2);
pFound = pDoc->getElementById("3", "id");
assert (pFound == pElem3);
assertTrue (pFound == pElem3);
pFound = pDoc->getElementById("4", "id");
assert (pFound == 0);
assertTrue (pFound == 0);
pFound = pDoc->getElementById("0", "ID");
assert (pFound == 0);
assertTrue (pFound == 0);
}
@@ -240,25 +240,25 @@ void DocumentTest::testElementByIdNS()
pDoc->appendChild(pRoot);
Element* pFound = pDoc->getElementByIdNS("0", "urn:ns1", "id");
assert (pFound == pRoot);
assertTrue (pFound == pRoot);
pFound = pDoc->getElementByIdNS("1", "urn:ns1", "id");
assert (pFound == pElem1);
assertTrue (pFound == pElem1);
pFound = pDoc->getElementByIdNS("2", "urn:ns1", "id");
assert (pFound == pElem2);
assertTrue (pFound == pElem2);
pFound = pDoc->getElementByIdNS("3", "urn:ns1", "id");
assert (pFound == pElem3);
assertTrue (pFound == pElem3);
pFound = pDoc->getElementByIdNS("4", "urn:ns1", "id");
assert (pFound == 0);
assertTrue (pFound == 0);
pFound = pDoc->getElementByIdNS("0", "urn:ns1", "ID");
assert (pFound == 0);
assertTrue (pFound == 0);
pFound = pDoc->getElementByIdNS("0", "urn:ns2", "id");
assert (pFound == 0);
assertTrue (pFound == 0);
}

52
XML/testsuite/src/DocumentTypeTest.cpp
View File

@@ -43,48 +43,48 @@ void DocumentTypeTest::testDocumentType()
{
AutoPtr<DocumentType> pDoctype = DOMImplementation::instance().createDocumentType("test", "public", "system");
assert (pDoctype->ownerDocument() == 0);
assert (pDoctype->name() == "test");
assert (pDoctype->publicId() == "public");
assert (pDoctype->systemId() == "system");
assertTrue (pDoctype->ownerDocument() == 0);
assertTrue (pDoctype->name() == "test");
assertTrue (pDoctype->publicId() == "public");
assertTrue (pDoctype->systemId() == "system");
AutoPtr<Document> pDoc = new Document(pDoctype);
assert (pDoc->doctype() == pDoctype);
assert (pDoctype->ownerDocument() == pDoc);
assertTrue (pDoc->doctype() == pDoctype);
assertTrue (pDoctype->ownerDocument() == pDoc);
AutoPtr<NamedNodeMap> pEntities = pDoctype->entities();
AutoPtr<NamedNodeMap> pNotations = pDoctype->notations();
assert (pEntities->length() == 0);
assert (pNotations->length() == 0);
assertTrue (pEntities->length() == 0);
assertTrue (pNotations->length() == 0);
AutoPtr<Entity> pEntity1 = pDoc->createEntity("entity1", "public1", "system1", "");
pDoctype->appendChild(pEntity1);
assert (pEntities->length() == 1);
assert (pNotations->length() == 0);
assert (pEntities->item(0) == pEntity1);
assert (pEntities->getNamedItem("entity1") == pEntity1);
assertTrue (pEntities->length() == 1);
assertTrue (pNotations->length() == 0);
assertTrue (pEntities->item(0) == pEntity1);
assertTrue (pEntities->getNamedItem("entity1") == pEntity1);
AutoPtr<Entity> pEntity2 = pDoc->createEntity("entity2", "public2", "system2", "");
pDoctype->appendChild(pEntity2);
assert (pEntities->length() == 2);
assert (pNotations->length() == 0);
assert (pEntities->item(0) == pEntity1);
assert (pEntities->item(1) == pEntity2);
assert (pEntities->getNamedItem("entity1") == pEntity1);
assert (pEntities->getNamedItem("entity2") == pEntity2);
assertTrue (pEntities->length() == 2);
assertTrue (pNotations->length() == 0);
assertTrue (pEntities->item(0) == pEntity1);
assertTrue (pEntities->item(1) == pEntity2);
assertTrue (pEntities->getNamedItem("entity1") == pEntity1);
assertTrue (pEntities->getNamedItem("entity2") == pEntity2);
AutoPtr<Notation> pNotation = pDoc->createNotation("notation", "public", "system");
pDoctype->appendChild(pNotation);
assert (pEntities->length() == 2);
assert (pNotations->length() == 1);
assert (pEntities->item(0) == pEntity1);
assert (pEntities->item(1) == pEntity2);
assert (pNotations->item(0) == pNotation);
assert (pEntities->getNamedItem("entity1") == pEntity1);
assert (pEntities->getNamedItem("entity2") == pEntity2);
assert (pNotations->getNamedItem("notation") == pNotation);
assertTrue (pEntities->length() == 2);
assertTrue (pNotations->length() == 1);
assertTrue (pEntities->item(0) == pEntity1);
assertTrue (pEntities->item(1) == pEntity2);
assertTrue (pNotations->item(0) == pNotation);
assertTrue (pEntities->getNamedItem("entity1") == pEntity1);
assertTrue (pEntities->getNamedItem("entity2") == pEntity2);
assertTrue (pNotations->getNamedItem("notation") == pNotation);
}

686
XML/testsuite/src/ElementTest.cpp
View File

File diff suppressed because it is too large Load Diff

34
XML/testsuite/src/EventTest.cpp
View File

@@ -171,7 +171,7 @@ void EventTest::testInsert()
const XMLString& log = TestEventListener::log();
assert (log ==
assertTrue (log ==
"docCap:DOMNodeInserted:CAPTURING_PHASE:root:#document:B:-:MODIFICATION:#document:::\n"
"rootCap:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
"root:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
@@ -188,7 +188,7 @@ void EventTest::testInsert()
AutoPtr<Text> pText = pDoc->createTextNode("text");
pRoot->appendChild(pText);
assert (log ==
assertTrue (log ==
"docCap:DOMNodeInserted:CAPTURING_PHASE:#text:#document:B:-:MODIFICATION:root:::\n"
"rootCap:DOMNodeInserted:CAPTURING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
"root:DOMNodeInserted:BUBBLING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
@@ -237,7 +237,7 @@ void EventTest::testInsertSubtree()
pDoc->appendChild(pRoot);
const XMLString& log = TestEventListener::log();
assert (log ==
assertTrue (log ==
"docCap:DOMNodeInserted:CAPTURING_PHASE:root:#document:B:-:MODIFICATION:#document:::\n"
"rootCap:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
"root:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
@@ -289,7 +289,7 @@ void EventTest::testRemove()
pRoot->removeChild(pText);
const XMLString& log = TestEventListener::log();
assert (log ==
assertTrue (log ==
"docCap:DOMNodeRemoved:CAPTURING_PHASE:#text:#document:B:-:MODIFICATION:root:::\n"
"rootCap:DOMNodeRemoved:CAPTURING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
"root:DOMNodeRemoved:BUBBLING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
@@ -340,7 +340,7 @@ void EventTest::testRemoveSubtree()
pDoc->removeChild(pRoot);
const XMLString& log = TestEventListener::log();
assert (log ==
assertTrue (log ==
"docCap:DOMNodeRemoved:CAPTURING_PHASE:root:#document:B:-:MODIFICATION:#document:::\n"
"rootCap:DOMNodeRemoved:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
"root:DOMNodeRemoved:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
@@ -383,7 +383,7 @@ void EventTest::testCharacterData()
pText->setData("modified");
const XMLString& log = TestEventListener::log();
assert (log ==
assertTrue (log ==
"docCap:DOMCharacterDataModified:CAPTURING_PHASE:#text:#document:B:-:MODIFICATION:::text:modified\n"
"rootCap:DOMCharacterDataModified:CAPTURING_PHASE:#text:root:B:-:MODIFICATION:::text:modified\n"
"textCap:DOMCharacterDataModified:AT_TARGET:#text:#text:B:-:MODIFICATION:::text:modified\n"
@@ -421,7 +421,7 @@ void EventTest::testCancel()
pText->setData("modified");
const XMLString& log = TestEventListener::log();
assert (log == "docCap:DOMCharacterDataModified:CAPTURING_PHASE:#text:#document:B:-:MODIFICATION:::text:modified\n");
assertTrue (log == "docCap:DOMCharacterDataModified:CAPTURING_PHASE:#text:#document:B:-:MODIFICATION:::text:modified\n");
}
@@ -436,19 +436,19 @@ void EventTest::testAttributes()
pRoot->setAttribute("a1", "v1");
const XMLString& log = TestEventListener::log();
assert (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:ADDITION:a1:a1::v1\n");
assertTrue (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:ADDITION:a1:a1::v1\n");
TestEventListener::reset();
pRoot->setAttribute("a1", "V1");
assert (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:MODIFICATION:a1:a1:v1:V1\n");
assertTrue (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:MODIFICATION:a1:a1:v1:V1\n");
TestEventListener::reset();
pRoot->setAttribute("a2", "v2");
assert (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:ADDITION:a2:a2::v2\n");
assertTrue (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:ADDITION:a2:a2::v2\n");
TestEventListener::reset();
pRoot->removeAttribute("a1");
assert (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:REMOVAL:a1:a1:V1:\n");
assertTrue (log == "root:DOMAttrModified:AT_TARGET:root:root:B:-:REMOVAL:a1:a1:V1:\n");
}
@@ -481,7 +481,7 @@ void EventTest::testAddRemoveInEvent()
pDoc->appendChild(pRoot);
const XMLString& log = TestEventListener::log();
assert (log ==
assertTrue (log ==
"docCap:DOMNodeInserted:CAPTURING_PHASE:root:#document:B:-:MODIFICATION:#document:::\n"
"rootCap:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
"root:DOMNodeInserted:AT_TARGET:root:root:B:-:MODIFICATION:#document:::\n"
@@ -498,7 +498,7 @@ void EventTest::testAddRemoveInEvent()
AutoPtr<Text> pText = pDoc->createTextNode("text");
pRoot->appendChild(pText);
assert (log ==
assertTrue (log ==
"docCap:DOMNodeInserted:CAPTURING_PHASE:#text:#document:B:-:MODIFICATION:root:::\n"
"rootCap:DOMNodeInserted:CAPTURING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
"root:DOMNodeInserted:BUBBLING_PHASE:#text:root:B:-:MODIFICATION:root:::\n"
@@ -526,19 +526,19 @@ void EventTest::testSuspended()
pRoot->setAttribute("a1", "v1");
const XMLString& log = TestEventListener::log();
assert (log.empty());
assertTrue (log.empty());
TestEventListener::reset();
pRoot->setAttribute("a1", "V1");
assert (log.empty());
assertTrue (log.empty());
TestEventListener::reset();
pRoot->setAttribute("a2", "v2");
assert (log.empty());
assertTrue (log.empty());
TestEventListener::reset();
pRoot->removeAttribute("a1");
assert (log.empty());
assertTrue (log.empty());
}

8
XML/testsuite/src/NamePoolTest.cpp
View File

@@ -39,16 +39,16 @@ void NamePoolTest::testNamePool()
pName = &pool->insert(name);
const Name* pName2 = &pool->insert("pre:local", "http://www.appinf.com", "local");
assert (pName == pName2);
assertTrue (pName == pName2);
pName2 = &pool->insert("pre:local2", "http://www.appinf.com", "local2");
assert (pName2 != pName);
assertTrue (pName2 != pName);
pName2 = &pool->insert(name);
assert (pName2 == pName);
assertTrue (pName2 == pName);
pName2 = &pool->insert(*pName);
assert (pName2 == pName);
assertTrue (pName2 == pName);
}

90
XML/testsuite/src/NameTest.cpp
View File

@@ -33,18 +33,18 @@ void NameTest::testSplit()
std::string prefix;
std::string local;
Name::split(qname, prefix, local);
assert (prefix.empty());
assert (local == "name");
assertTrue (prefix.empty());
assertTrue (local == "name");
qname = "p:l";
Name::split(qname, prefix, local);
assert (prefix == "p");
assert (local == "l");
assertTrue (prefix == "p");
assertTrue (local == "l");
qname = "pre:local";
Name::split(qname, prefix, local);
assert (prefix == "pre");
assert (local == "local");
assertTrue (prefix == "pre");
assertTrue (local == "local");
}
@@ -52,13 +52,13 @@ void NameTest::testLocalName()
{
std::string qname = "name";
std::string local = Name::localName(qname);
assert (local == "name");
assertTrue (local == "name");
qname = "p:l";
local = Name::localName(qname);
assert (local == "l");
assertTrue (local == "l");
qname = "pre:local";
local = Name::localName(qname);
assert (local == "local");
assertTrue (local == "local");
}
@@ -66,13 +66,13 @@ void NameTest::testPrefix()
{
std::string qname = "name";
std::string prefix = Name::prefix(qname);
assert (prefix.empty());
assertTrue (prefix.empty());
qname = "p:l";
prefix = Name::prefix(qname);
assert (prefix == "p");
assertTrue (prefix == "p");
qname = "pre:local";
prefix = Name::prefix(qname);
assert (prefix == "pre");
assertTrue (prefix == "pre");
}
@@ -80,29 +80,29 @@ void NameTest::testName()
{
std::string qname = "name";
Name name(qname);
assert (name.qname() == "name");
assert (name.prefix().empty());
assert (name.namespaceURI().empty());
assert (name.localName().empty());
assertTrue (name.qname() == "name");
assertTrue (name.prefix().empty());
assertTrue (name.namespaceURI().empty());
assertTrue (name.localName().empty());
qname.clear();
name.assign(qname, "http://www.appinf.com/", "local");
assert (name.qname().empty());
assert (name.prefix().empty());
assert (name.namespaceURI() == "http://www.appinf.com/");
assert (name.localName() == "local");
assertTrue (name.qname().empty());
assertTrue (name.prefix().empty());
assertTrue (name.namespaceURI() == "http://www.appinf.com/");
assertTrue (name.localName() == "local");
Name name2("pre:local", "http://www.appinf.com/");
assert (name2.qname() == "pre:local");
assert (name2.prefix() == "pre");
assert (name2.namespaceURI() == "http://www.appinf.com/");
assert (name2.localName() == "local");
assertTrue (name2.qname() == "pre:local");
assertTrue (name2.prefix() == "pre");
assertTrue (name2.namespaceURI() == "http://www.appinf.com/");
assertTrue (name2.localName() == "local");
name2.assign("PRE:Local", "http://www.appinf.com/");
assert (name2.qname() == "PRE:Local");
assert (name2.prefix() == "PRE");
assert (name2.namespaceURI() == "http://www.appinf.com/");
assert (name2.localName() == "Local");
assertTrue (name2.qname() == "PRE:Local");
assertTrue (name2.prefix() == "PRE");
assertTrue (name2.namespaceURI() == "http://www.appinf.com/");
assertTrue (name2.localName() == "Local");
}
@@ -112,23 +112,23 @@ void NameTest::testCompare()
Name n2(n1);
Name n3("pre:local2");
assert (n1.equals(n2));
assert (!n1.equals(n3));
assertTrue (n1.equals(n2));
assertTrue (!n1.equals(n3));
n1.assign("pre:local", "http://www.appinf.com", "local");
n2.assign("pre:local", "http://www.appinf.com", "local");
n3.assign("pre:local2", "http://www.appinf.com", "local2");
assert (n1.equals(n2));
assert (!n1.equals(n3));
assertTrue (n1.equals(n2));
assertTrue (!n1.equals(n3));
assert (n1.equals("pre:local", "http://www.appinf.com", "local"));
assert (!n1.equals("pre:local", "", ""));
assert (n1.equalsWeakly("pre:local", "", ""));
assert (!n1.equalsWeakly("pre:local2", "", ""));
assert (!n1.equals("", "http://www.appinf.com", "local"));
assert (n1.equalsWeakly("", "http://www.appinf.com", "local"));
assert (!n1.equalsWeakly("", "http://www.appinf.com", "local2"));
assertTrue (n1.equals("pre:local", "http://www.appinf.com", "local"));
assertTrue (!n1.equals("pre:local", "", ""));
assertTrue (n1.equalsWeakly("pre:local", "", ""));
assertTrue (!n1.equalsWeakly("pre:local2", "", ""));
assertTrue (!n1.equals("", "http://www.appinf.com", "local"));
assertTrue (n1.equalsWeakly("", "http://www.appinf.com", "local"));
assertTrue (!n1.equalsWeakly("", "http://www.appinf.com", "local2"));
}
@@ -137,12 +137,12 @@ void NameTest::testSwap()
Name n1("ns:name1", "http://www.appinf.com");
Name n2("ns:name2", "http://www.foobar.com");
n1.swap(n2);
assert (n1.qname() == "ns:name2");
assert (n1.namespaceURI() == "http://www.foobar.com");
assert (n1.localName() == "name2");
assert (n2.qname() == "ns:name1");
assert (n2.namespaceURI() == "http://www.appinf.com");
assert (n2.localName() == "name1");
assertTrue (n1.qname() == "ns:name2");
assertTrue (n1.namespaceURI() == "http://www.foobar.com");
assertTrue (n1.localName() == "name2");
assertTrue (n2.qname() == "ns:name1");
assertTrue (n2.namespaceURI() == "http://www.appinf.com");
assertTrue (n2.localName() == "name1");
}

158
XML/testsuite/src/NamespaceSupportTest.cpp
View File

@@ -32,141 +32,141 @@ void NamespaceSupportTest::testNamespaceSupport()
NamespaceSupport ns;
NamespaceSupport::PrefixSet prefixes;
ns.getDeclaredPrefixes(prefixes);
assert (prefixes.size() == 2);
assert (prefixes.find("xml") != prefixes.end());
assert (prefixes.find("xmlns") != prefixes.end());
assertTrue (prefixes.size() == 2);
assertTrue (prefixes.find("xml") != prefixes.end());
assertTrue (prefixes.find("xmlns") != prefixes.end());
ns.getPrefixes(prefixes);
assert (prefixes.size() == 2);
assert (prefixes.find("xml") != prefixes.end());
assert (prefixes.find("xmlns") != prefixes.end());
assertTrue (prefixes.size() == 2);
assertTrue (prefixes.find("xml") != prefixes.end());
assertTrue (prefixes.find("xmlns") != prefixes.end());
ns.pushContext();
ns.declarePrefix("ns1", "urn:ns1");
ns.declarePrefix("ns2", "urn:ns2");
ns.getDeclaredPrefixes(prefixes);
assert (prefixes.size() == 2);
assert (prefixes.find("ns1") != prefixes.end());
assert (prefixes.find("ns2") != prefixes.end());
assertTrue (prefixes.size() == 2);
assertTrue (prefixes.find("ns1") != prefixes.end());
assertTrue (prefixes.find("ns2") != prefixes.end());
ns.pushContext();
ns.declarePrefix("ns3", "urn:ns3");
ns.getDeclaredPrefixes(prefixes);
assert (prefixes.size() == 1);
assert (prefixes.find("ns3") != prefixes.end());
assertTrue (prefixes.size() == 1);
assertTrue (prefixes.find("ns3") != prefixes.end());
ns.getPrefixes(prefixes);
assert (prefixes.size() == 5);
assert (prefixes.find("xml") != prefixes.end());
assert (prefixes.find("xmlns") != prefixes.end());
assert (prefixes.find("ns1") != prefixes.end());
assert (prefixes.find("ns2") != prefixes.end());
assert (prefixes.find("ns3") != prefixes.end());
assertTrue (prefixes.size() == 5);
assertTrue (prefixes.find("xml") != prefixes.end());
assertTrue (prefixes.find("xmlns") != prefixes.end());
assertTrue (prefixes.find("ns1") != prefixes.end());
assertTrue (prefixes.find("ns2") != prefixes.end());
assertTrue (prefixes.find("ns3") != prefixes.end());
ns.popContext();
ns.getDeclaredPrefixes(prefixes);
assert (prefixes.size() == 2);
assert (prefixes.find("ns1") != prefixes.end());
assert (prefixes.find("ns2") != prefixes.end());
assertTrue (prefixes.size() == 2);
assertTrue (prefixes.find("ns1") != prefixes.end());
assertTrue (prefixes.find("ns2") != prefixes.end());
assert (ns.isMapped("urn:ns1"));
assert (ns.isMapped("urn:ns2"));
assert (ns.isMapped("http://www.w3.org/XML/1998/namespace"));
assert (!ns.isMapped("urn:ns3"));
assertTrue (ns.isMapped("urn:ns1"));
assertTrue (ns.isMapped("urn:ns2"));
assertTrue (ns.isMapped("http://www.w3.org/XML/1998/namespace"));
assertTrue (!ns.isMapped("urn:ns3"));
ns.getPrefixes("urn:ns2", prefixes);
assert (prefixes.size() == 1);
assert (prefixes.find("ns2") != prefixes.end());
assertTrue (prefixes.size() == 1);
assertTrue (prefixes.find("ns2") != prefixes.end());
ns.pushContext();
ns.declarePrefix("", "urn:ns3");
ns.declarePrefix("NS2", "urn:ns2");
ns.getPrefixes("urn:ns2", prefixes);
assert (prefixes.size() == 2);
assert (prefixes.find("ns2") != prefixes.end());
assert (prefixes.find("NS2") != prefixes.end());
assertTrue (prefixes.size() == 2);
assertTrue (prefixes.find("ns2") != prefixes.end());
assertTrue (prefixes.find("NS2") != prefixes.end());
ns.getPrefixes(prefixes);
assert (prefixes.size() == 5);
assert (prefixes.find("xml") != prefixes.end());
assert (prefixes.find("xmlns") != prefixes.end());
assert (prefixes.find("ns1") != prefixes.end());
assert (prefixes.find("ns2") != prefixes.end());
assert (prefixes.find("NS2") != prefixes.end());
assertTrue (prefixes.size() == 5);
assertTrue (prefixes.find("xml") != prefixes.end());
assertTrue (prefixes.find("xmlns") != prefixes.end());
assertTrue (prefixes.find("ns1") != prefixes.end());
assertTrue (prefixes.find("ns2") != prefixes.end());
assertTrue (prefixes.find("NS2") != prefixes.end());
ns.getDeclaredPrefixes(prefixes);
assert (prefixes.size() == 2);
assert (prefixes.find("") != prefixes.end());
assert (prefixes.find("NS2") != prefixes.end());
assertTrue (prefixes.size() == 2);
assertTrue (prefixes.find("") != prefixes.end());
assertTrue (prefixes.find("NS2") != prefixes.end());
assert (ns.getPrefix("urn:ns3") == "");
assert (ns.getPrefix("urn:ns2") == "NS2");
assert (ns.getPrefix("urn:ns4") == "");
assertTrue (ns.getPrefix("urn:ns3") == "");
assertTrue (ns.getPrefix("urn:ns2") == "NS2");
assertTrue (ns.getPrefix("urn:ns4") == "");
assert (ns.isMapped("urn:ns3"));
assert (ns.isMapped("urn:ns2"));
assert (!ns.isMapped("urn:ns4"));
assertTrue (ns.isMapped("urn:ns3"));
assertTrue (ns.isMapped("urn:ns2"));
assertTrue (!ns.isMapped("urn:ns4"));
assert (ns.getURI("xml") == "http://www.w3.org/XML/1998/namespace");
assert (ns.getURI("ns1") == "urn:ns1");
assert (ns.getURI("") == "urn:ns3");
assert (ns.getURI("NS2") == "urn:ns2");
assertTrue (ns.getURI("xml") == "http://www.w3.org/XML/1998/namespace");
assertTrue (ns.getURI("ns1") == "urn:ns1");
assertTrue (ns.getURI("") == "urn:ns3");
assertTrue (ns.getURI("NS2") == "urn:ns2");
std::string localName;
std::string namespaceURI;
bool declared = ns.processName("elem", namespaceURI, localName, false);
assert (declared);
assert (localName == "elem");
assert (namespaceURI == "urn:ns3");
assertTrue (declared);
assertTrue (localName == "elem");
assertTrue (namespaceURI == "urn:ns3");
declared = ns.processName("NS2:elem", namespaceURI, localName, false);
assert (declared);
assert (localName == "elem");
assert (namespaceURI == "urn:ns2");
assertTrue (declared);
assertTrue (localName == "elem");
assertTrue (namespaceURI == "urn:ns2");
declared = ns.processName("ns3:elem", namespaceURI, localName, false);
assert (!declared);
assert (localName == "elem");
assert (namespaceURI == "");
assertTrue (!declared);
assertTrue (localName == "elem");
assertTrue (namespaceURI == "");
declared = ns.processName("ns2:attr", namespaceURI, localName, true);
assert (declared);
assert (localName == "attr");
assert (namespaceURI == "urn:ns2");
assertTrue (declared);
assertTrue (localName == "attr");
assertTrue (namespaceURI == "urn:ns2");
declared = ns.processName("attr", namespaceURI, localName, true);
assert (declared);
assert (localName == "attr");
assert (namespaceURI == "");
assertTrue (declared);
assertTrue (localName == "attr");
assertTrue (namespaceURI == "");
declared = ns.processName("ns3:attr", namespaceURI, localName, true);
assert (!declared);
assert (localName == "attr");
assert (namespaceURI == "");
assertTrue (!declared);
assertTrue (localName == "attr");
assertTrue (namespaceURI == "");
ns.popContext();
assert (ns.getURI("xml") == "http://www.w3.org/XML/1998/namespace");
assert (ns.getURI("ns1") == "urn:ns1");
assert (ns.getURI("") == "");
assert (ns.getURI("NS2") == "");
assertTrue (ns.getURI("xml") == "http://www.w3.org/XML/1998/namespace");
assertTrue (ns.getURI("ns1") == "urn:ns1");
assertTrue (ns.getURI("") == "");
assertTrue (ns.getURI("NS2") == "");
declared = ns.processName("elem", namespaceURI, localName, false);
assert (declared);
assert (localName == "elem");
assert (namespaceURI == "");
assertTrue (declared);
assertTrue (localName == "elem");
assertTrue (namespaceURI == "");
declared = ns.processName("ns2:elem", namespaceURI, localName, false);
assert (declared);
assert (localName == "elem");
assert (namespaceURI == "urn:ns2");
assertTrue (declared);
assertTrue (localName == "elem");
assertTrue (namespaceURI == "urn:ns2");
declared = ns.processName("ns3:elem", namespaceURI, localName, false);
assert (!declared);
assert (localName == "elem");
assert (namespaceURI == "");
assertTrue (!declared);
assertTrue (localName == "elem");
assertTrue (namespaceURI == "");
}

54
XML/testsuite/src/NodeAppenderTest.cpp
View File

@@ -52,20 +52,20 @@ void NodeAppenderTest::testAppendNode()
appender.appendChild(pElem2);
appender.appendChild(pElem3);
assert (pRoot->firstChild() == pElem1);
assert (pRoot->lastChild() == pElem3);
assertTrue (pRoot->firstChild() == pElem1);
assertTrue (pRoot->lastChild() == pElem3);
assert (pElem1->nextSibling() == pElem2);
assert (pElem2->nextSibling() == pElem3);
assert (pElem3->nextSibling() == 0);
assertTrue (pElem1->nextSibling() == pElem2);
assertTrue (pElem2->nextSibling() == pElem3);
assertTrue (pElem3->nextSibling() == 0);
assert (pElem1->previousSibling() == 0);
assert (pElem2->previousSibling() == pElem1);
assert (pElem3->previousSibling() == pElem2);
assertTrue (pElem1->previousSibling() == 0);
assertTrue (pElem2->previousSibling() == pElem1);
assertTrue (pElem3->previousSibling() == pElem2);
assert (pElem1->parentNode() == pRoot);
assert (pElem2->parentNode() == pRoot);
assert (pElem3->parentNode() == pRoot);
assertTrue (pElem1->parentNode() == pRoot);
assertTrue (pElem2->parentNode() == pRoot);
assertTrue (pElem3->parentNode() == pRoot);
}
@@ -93,29 +93,29 @@ void NodeAppenderTest::testAppendNodeList()
pFrag3->appendChild(pElem4);
appender.appendChild(pFrag1);
assert (pRoot->firstChild() == 0);
assertTrue (pRoot->firstChild() == 0);
appender.appendChild(pFrag2);
assert (pRoot->firstChild() == pElem1);
assert (pRoot->lastChild() == pElem3);
assertTrue (pRoot->firstChild() == pElem1);
assertTrue (pRoot->lastChild() == pElem3);
assert (pElem1->nextSibling() == pElem2);
assert (pElem2->nextSibling() == pElem3);
assert (pElem3->nextSibling() == 0);
assertTrue (pElem1->nextSibling() == pElem2);
assertTrue (pElem2->nextSibling() == pElem3);
assertTrue (pElem3->nextSibling() == 0);
assert (pElem1->previousSibling() == 0);
assert (pElem2->previousSibling() == pElem1);
assert (pElem3->previousSibling() == pElem2);
assertTrue (pElem1->previousSibling() == 0);
assertTrue (pElem2->previousSibling() == pElem1);
assertTrue (pElem3->previousSibling() == pElem2);
assert (pElem1->parentNode() == pRoot);
assert (pElem2->parentNode() == pRoot);
assert (pElem3->parentNode() == pRoot);
assertTrue (pElem1->parentNode() == pRoot);
assertTrue (pElem2->parentNode() == pRoot);
assertTrue (pElem3->parentNode() == pRoot);
appender.appendChild(pFrag3);
assert (pRoot->lastChild() == pElem4);
assert (pElem4->parentNode() == pRoot);
assert (pElem3->nextSibling() == pElem4);
assert (pElem4->previousSibling() == pElem3);
assertTrue (pRoot->lastChild() == pElem4);
assertTrue (pElem4->parentNode() == pRoot);
assertTrue (pElem3->nextSibling() == pElem4);
assertTrue (pElem4->previousSibling() == pElem3);
}

52
XML/testsuite/src/NodeIteratorTest.cpp
View File

@@ -71,19 +71,19 @@ void NodeIteratorTest::testShowAll()
NodeIterator it(pRoot, NodeFilter::SHOW_ALL);
assert (it.nextNode() == pRoot);
assert (it.nextNode() == pElem1);
assert (it.nextNode() == pText1);
assert (it.nextNode() == pElem2);
assert (it.nextNode() == pText2);
assert (it.nextNode() == 0);
assertTrue (it.nextNode() == pRoot);
assertTrue (it.nextNode() == pElem1);
assertTrue (it.nextNode() == pText1);
assertTrue (it.nextNode() == pElem2);
assertTrue (it.nextNode() == pText2);
assertTrue (it.nextNode() == 0);
assert (it.previousNode() == pText2);
assert (it.previousNode() == pElem2);
assert (it.previousNode() == pText1);
assert (it.previousNode() == pElem1);
assert (it.previousNode() == pRoot);
assert (it.previousNode() == 0);
assertTrue (it.previousNode() == pText2);
assertTrue (it.previousNode() == pElem2);
assertTrue (it.previousNode() == pText1);
assertTrue (it.previousNode() == pElem1);
assertTrue (it.previousNode() == pRoot);
assertTrue (it.previousNode() == 0);
}
@@ -104,15 +104,15 @@ void NodeIteratorTest::testShowElements()
NodeIterator it(pRoot, NodeFilter::SHOW_ELEMENT);
assert (it.nextNode() == pRoot);
assert (it.nextNode() == pElem1);
assert (it.nextNode() == pElem2);
assert (it.nextNode() == 0);
assertTrue (it.nextNode() == pRoot);
assertTrue (it.nextNode() == pElem1);
assertTrue (it.nextNode() == pElem2);
assertTrue (it.nextNode() == 0);
assert (it.previousNode() == pElem2);
assert (it.previousNode() == pElem1);
assert (it.previousNode() == pRoot);
assert (it.previousNode() == 0);
assertTrue (it.previousNode() == pElem2);
assertTrue (it.previousNode() == pElem1);
assertTrue (it.previousNode() == pRoot);
assertTrue (it.previousNode() == 0);
}
@@ -134,11 +134,11 @@ void NodeIteratorTest::testFilter()
TestNodeFilter filter;
NodeIterator it(pRoot, NodeFilter::SHOW_ELEMENT, &filter);
assert (it.nextNode() == pElem1);
assert (it.nextNode() == 0);
assertTrue (it.nextNode() == pElem1);
assertTrue (it.nextNode() == 0);
assert (it.previousNode() == pElem1);
assert (it.previousNode() == 0);
assertTrue (it.previousNode() == pElem1);
assertTrue (it.previousNode() == 0);
}
@@ -159,9 +159,9 @@ void NodeIteratorTest::testShowNothing()
NodeIterator it(pRoot, 0);
assert (it.nextNode() == 0);
assertTrue (it.nextNode() == 0);
assert (it.previousNode() == 0);
assertTrue (it.previousNode() == 0);
}

1174
XML/testsuite/src/NodeTest.cpp
View File

File diff suppressed because it is too large Load Diff

8
XML/testsuite/src/ParserWriterTest.cpp
View File

@@ -51,7 +51,7 @@ void ParserWriterTest::testParseWriteXHTML()
writer.writeNode(ostr, pDoc);
std::string xml = ostr.str();
assert (xml == XHTML);
assertTrue (xml == XHTML);
}
@@ -66,7 +66,7 @@ void ParserWriterTest::testParseWriteXHTML2()
writer.writeNode(ostr, pDoc);
std::string xml = ostr.str();
assert (xml == XHTML2);
assertTrue (xml == XHTML2);
}
@@ -97,10 +97,10 @@ void ParserWriterTest::testParseWriteSimple()
numChildren++;
child = child->nextSibling();
}
assert (numChildren == 2);
assertTrue (numChildren == 2);
std::string xml = ostr.str();
assert (xml == simple);
assertTrue (xml == simple);
}

40
XML/testsuite/src/SAXParserTest.cpp
View File

@@ -76,7 +76,7 @@ void SAXParserTest::testSimple1()
{
SAXParser parser;
std::string xml = parse(parser, XMLWriter::CANONICAL, SIMPLE1);
assert (xml == "<foo/>");
assertTrue (xml == "<foo/>");
}
@@ -84,7 +84,7 @@ void SAXParserTest::testSimple2()
{
SAXParser parser;
std::string xml = parse(parser, XMLWriter::CANONICAL, SIMPLE2);
assert (xml == "<foo/>");
assertTrue (xml == "<foo/>");
}
@@ -92,7 +92,7 @@ void SAXParserTest::testAttributes()
{
SAXParser parser;
std::string xml = parse(parser, XMLWriter::CANONICAL, ATTRIBUTES);
assert (xml == ATTRIBUTES);
assertTrue (xml == ATTRIBUTES);
}
@@ -100,7 +100,7 @@ void SAXParserTest::testCDATA()
{
SAXParser parser;
std::string xml = parse(parser, XMLWriter::CANONICAL, CDATA);
assert (xml == CDATA);
assertTrue (xml == CDATA);
}
@@ -108,7 +108,7 @@ void SAXParserTest::testComment()
{
SAXParser parser;
std::string xml = parse(parser, XMLWriter::CANONICAL, COMMENT);
assert (xml == COMMENT);
assertTrue (xml == COMMENT);
}
@@ -116,7 +116,7 @@ void SAXParserTest::testPI()
{
SAXParser parser;
std::string xml = parse(parser, XMLWriter::CANONICAL, PROCESSING_INSTRUCTION);
assert (xml == PROCESSING_INSTRUCTION);
assertTrue (xml == PROCESSING_INSTRUCTION);
}
@@ -124,7 +124,7 @@ void SAXParserTest::testDTD()
{
SAXParser parser;
std::string xml = parse(parser, XMLWriter::CANONICAL, DTD);
assert (xml == "<!DOCTYPE test SYSTEM \"test.dtd\"><foo/>");
assertTrue (xml == "<!DOCTYPE test SYSTEM \"test.dtd\"><foo/>");
}
@@ -132,7 +132,7 @@ void SAXParserTest::testInternalEntity()
{
SAXParser parser;
std::string xml = parse(parser, XMLWriter::CANONICAL, INTERNAL_ENTITY);
assert (xml == "<!DOCTYPE sample><root>\n\t<company>Applied Informatics</company>\n</root>");
assertTrue (xml == "<!DOCTYPE sample><root>\n\t<company>Applied Informatics</company>\n</root>");
}
@@ -140,7 +140,7 @@ void SAXParserTest::testNotation()
{
SAXParser parser;
std::string xml = parse(parser, XMLWriter::CANONICAL, NOTATION);
assert (xml == "<!DOCTYPE test [<!NOTATION mov SYSTEM \"quicktime\">"
assertTrue (xml == "<!DOCTYPE test [<!NOTATION mov SYSTEM \"quicktime\">"
"<!NOTATION xml PUBLIC \"-//W3C//NOTATION XML 1.0//EN\">]>"
"<foo/>");
}
@@ -150,7 +150,7 @@ void SAXParserTest::testExternalUnparsed()
{
SAXParser parser;
std::string xml = parse(parser, XMLWriter::CANONICAL, EXTERNAL_UNPARSED);
assert (xml == "<!DOCTYPE test [<!NOTATION mov SYSTEM \"quicktime\">"
assertTrue (xml == "<!DOCTYPE test [<!NOTATION mov SYSTEM \"quicktime\">"
"<!ENTITY movie SYSTEM \"movie.mov\" NDATA mov>]>"
"<sample/>");
}
@@ -163,7 +163,7 @@ void SAXParserTest::testExternalParsed()
parser.setEntityResolver(&resolver);
parser.setFeature(XMLReader::FEATURE_EXTERNAL_GENERAL_ENTITIES, true);
std::string xml = parse(parser, XMLWriter::CANONICAL, EXTERNAL_PARSED);
assert (xml == "<!DOCTYPE test><sample>\n\t<elem>\n\tAn external entity.\n</elem>\n\n</sample>");
assertTrue (xml == "<!DOCTYPE test><sample>\n\t<elem>\n\tAn external entity.\n</elem>\n\n</sample>");
}
@@ -171,7 +171,7 @@ void SAXParserTest::testDefaultNamespace()
{
SAXParser parser;
std::string xml = parse(parser, XMLWriter::CANONICAL, DEFAULT_NAMESPACE);
assert (xml == DEFAULT_NAMESPACE);
assertTrue (xml == DEFAULT_NAMESPACE);
}
@@ -181,7 +181,7 @@ void SAXParserTest::testNamespaces()
parser.setFeature(XMLReader::FEATURE_NAMESPACES, true);
parser.setFeature(XMLReader::FEATURE_NAMESPACE_PREFIXES, true);
std::string xml = parse(parser, XMLWriter::CANONICAL, NAMESPACES);
assert (xml == NAMESPACES);
assertTrue (xml == NAMESPACES);
}
@@ -191,7 +191,7 @@ void SAXParserTest::testNamespacesNoPrefixes()
parser.setFeature(XMLReader::FEATURE_NAMESPACES, true);
parser.setFeature(XMLReader::FEATURE_NAMESPACE_PREFIXES, false);
std::string xml = parse(parser, XMLWriter::CANONICAL, NAMESPACES);
assert (xml == NAMESPACES);
assertTrue (xml == NAMESPACES);
}
@@ -200,7 +200,7 @@ void SAXParserTest::testNoNamespaces()
SAXParser parser;
parser.setFeature(XMLReader::FEATURE_NAMESPACES, false);
std::string xml = parse(parser, XMLWriter::CANONICAL, NAMESPACES);
assert (xml == NAMESPACES);
assertTrue (xml == NAMESPACES);
}
@@ -241,7 +241,7 @@ void SAXParserTest::testUndeclaredNoNamespace()
SAXParser parser;
parser.setFeature(XMLReader::FEATURE_NAMESPACES, false);
std::string xml = parse(parser, XMLWriter::CANONICAL, UNDECLARED_NAMESPACE);
assert (xml == UNDECLARED_NAMESPACE);
assertTrue (xml == UNDECLARED_NAMESPACE);
}
@@ -281,7 +281,7 @@ void SAXParserTest::testEncoding()
parser.parse(&source);
std::string xml = ostr.str();
assert (xml == ENCODING);
assertTrue (xml == ENCODING);
}
@@ -291,7 +291,7 @@ void SAXParserTest::testCharacters()
SAXParser parser;
parser.setFeature(XMLReader::FEATURE_NAMESPACES, false);
std::string result = parse(parser, XMLWriter::CANONICAL, xml);
assert (result == xml);
assertTrue (result == xml);
}
@@ -299,7 +299,7 @@ void SAXParserTest::testParseMemory()
{
SAXParser parser;
std::string xml = parseMemory(parser, XMLWriter::CANONICAL | XMLWriter::PRETTY_PRINT, WSDL);
assert (xml == WSDL);
assertTrue (xml == WSDL);
}
@@ -309,7 +309,7 @@ void SAXParserTest::testParsePartialReads()
parser.setFeature("http://www.appinf.com/features/enable-partial-reads", true);
std::string xml = parse(parser, XMLWriter::CANONICAL | XMLWriter::PRETTY_PRINT, WSDL);
assert (xml == WSDL);
assertTrue (xml == WSDL);
}

46
XML/testsuite/src/TextTest.cpp
View File

@@ -40,9 +40,9 @@ void TextTest::testLength()
{
AutoPtr<Document> pDoc = new Document;
AutoPtr<Text> pText1 = pDoc->createTextNode("");
assert (pText1->length() == 0);
assertTrue (pText1->length() == 0);
AutoPtr<Text> pText2 = pDoc->createTextNode("foo bar");
assert (pText2->length() == 7);
assertTrue (pText2->length() == 7);
}
@@ -51,11 +51,11 @@ void TextTest::testSubstring()
AutoPtr<Document> pDoc = new Document;
AutoPtr<Text> pText1 = pDoc->createTextNode("foo bar");
XMLString str = pText1->substringData(0, 3);
assert (str == "foo");
assertTrue (str == "foo");
str = pText1->substringData(4, 3);
assert (str == "bar");
assertTrue (str == "bar");
str = pText1->substringData(3, 0);
assert (str == "");
assertTrue (str == "");
}
@@ -64,7 +64,7 @@ void TextTest::testAppend()
AutoPtr<Document> pDoc = new Document;
AutoPtr<Text> pText1 = pDoc->createTextNode("foo");
pText1->appendData("bar");
assert (pText1->data() == "foobar");
assertTrue (pText1->data() == "foobar");
}
@@ -73,11 +73,11 @@ void TextTest::testInsert()
AutoPtr<Document> pDoc = new Document;
AutoPtr<Text> pText1 = pDoc->createTextNode("bar");
pText1->insertData(0, "foo");
assert (pText1->data() == "foobar");
assertTrue (pText1->data() == "foobar");
pText1->insertData(pText1->length(), "!");
assert (pText1->data() == "foobar!");
assertTrue (pText1->data() == "foobar!");
pText1->insertData(3, " ");
assert (pText1->data() == "foo bar!");
assertTrue (pText1->data() == "foo bar!");
}
@@ -86,13 +86,13 @@ void TextTest::testDelete()
AutoPtr<Document> pDoc = new Document;
AutoPtr<Text> pText1 = pDoc->createTextNode("foo bar");
pText1->deleteData(3, 1);
assert (pText1->data() == "foobar");
assertTrue (pText1->data() == "foobar");
pText1->deleteData(0, 3);
assert (pText1->data() == "bar");
assertTrue (pText1->data() == "bar");
pText1->deleteData(1, 0);
assert (pText1->data() == "bar");
assertTrue (pText1->data() == "bar");
pText1->deleteData(0, pText1->length());
assert (pText1->data() == "");
assertTrue (pText1->data() == "");
}
@@ -101,17 +101,17 @@ void TextTest::testReplace()
AutoPtr<Document> pDoc = new Document;
AutoPtr<Text> pText1 = pDoc->createTextNode("foo bar");
pText1->replaceData(0, 3, "FOO");
assert (pText1->data() == "FOO bar");
assertTrue (pText1->data() == "FOO bar");
pText1->replaceData(4, 3, "BAR!!!");
assert (pText1->data() == "FOO BAR!!!");
assertTrue (pText1->data() == "FOO BAR!!!");
pText1->replaceData(3, 1, "-");
assert (pText1->data() == "FOO-BAR!!!");
assertTrue (pText1->data() == "FOO-BAR!!!");
pText1->replaceData(3, 1, "---");
assert (pText1->data() == "FOO---BAR!!!");
assertTrue (pText1->data() == "FOO---BAR!!!");
pText1->replaceData(3, 3, " ");
assert (pText1->data() == "FOO BAR!!!");
assertTrue (pText1->data() == "FOO BAR!!!");
pText1->replaceData(0, pText1->length(), "foo bar");
assert (pText1->data() == "foo bar");
assertTrue (pText1->data() == "foo bar");
}
@@ -122,8 +122,8 @@ void TextTest::testSplit()
AutoPtr<Text> pText1 = pDoc->createCDATASection("foobar");
pElem->appendChild(pText1);
pText1->splitText(3);
assert (pElem->firstChild()->nodeValue() == "foo");
assert (pElem->lastChild()->nodeValue() == "bar");
assertTrue (pElem->firstChild()->nodeValue() == "foo");
assertTrue (pElem->lastChild()->nodeValue() == "bar");
}
@@ -134,8 +134,8 @@ void TextTest::testSplitCDATA()
AutoPtr<Text> pText1 = pDoc->createTextNode("foobar");
pElem->appendChild(pText1);
pText1->splitText(3);
assert (pElem->firstChild()->nodeValue() == "foo");
assert (pElem->lastChild()->nodeValue() == "bar");
assertTrue (pElem->firstChild()->nodeValue() == "foo");
assertTrue (pElem->lastChild()->nodeValue() == "bar");
}

228
XML/testsuite/src/TreeWalkerTest.cpp
View File

@@ -82,37 +82,37 @@ void TreeWalkerTest::testShowAll()
TreeWalker it(pRoot, NodeFilter::SHOW_ALL);
assert (it.currentNode() == pRoot);
assert (it.nextNode() == pElem1);
assert (it.nextNode() == pText1);
assert (it.nextNode() == pElem2);
assert (it.nextNode() == pText2);
assert (it.nextNode() == 0);
assertTrue (it.currentNode() == pRoot);
assertTrue (it.nextNode() == pElem1);
assertTrue (it.nextNode() == pText1);
assertTrue (it.nextNode() == pElem2);
assertTrue (it.nextNode() == pText2);
assertTrue (it.nextNode() == 0);
assert (it.currentNode() == pText2);
assert (it.previousNode() == pElem2);
assert (it.previousNode() == pText1);
assert (it.previousNode() == pElem1);
assert (it.previousNode() == pRoot);
assert (it.previousNode() == 0);
assertTrue (it.currentNode() == pText2);
assertTrue (it.previousNode() == pElem2);
assertTrue (it.previousNode() == pText1);
assertTrue (it.previousNode() == pElem1);
assertTrue (it.previousNode() == pRoot);
assertTrue (it.previousNode() == 0);
assert (it.currentNode() == pRoot);
assert (it.parentNode() == 0);
assert (it.currentNode() == pRoot);
assert (it.firstChild() == pElem1);
assert (it.parentNode() == pRoot);
assert (it.lastChild() == pElem2);
assert (it.previousSibling() == pElem1);
assert (it.previousSibling() == 0);
assert (it.currentNode() == pElem1);
assert (it.nextSibling() == pElem2);
assert (it.nextSibling() == 0);
assert (it.currentNode() == pElem2);
assert (it.firstChild() == pText2);
assert (it.nextSibling() == 0);
assert (it.previousSibling() == 0);
assert (it.parentNode() == pElem2);
assert (it.lastChild() == pText2);
assertTrue (it.currentNode() == pRoot);
assertTrue (it.parentNode() == 0);
assertTrue (it.currentNode() == pRoot);
assertTrue (it.firstChild() == pElem1);
assertTrue (it.parentNode() == pRoot);
assertTrue (it.lastChild() == pElem2);
assertTrue (it.previousSibling() == pElem1);
assertTrue (it.previousSibling() == 0);
assertTrue (it.currentNode() == pElem1);
assertTrue (it.nextSibling() == pElem2);
assertTrue (it.nextSibling() == 0);
assertTrue (it.currentNode() == pElem2);
assertTrue (it.firstChild() == pText2);
assertTrue (it.nextSibling() == 0);
assertTrue (it.previousSibling() == 0);
assertTrue (it.parentNode() == pElem2);
assertTrue (it.lastChild() == pText2);
}
@@ -133,30 +133,30 @@ void TreeWalkerTest::testShowElements()
TreeWalker it(pRoot, NodeFilter::SHOW_ELEMENT);
assert (it.currentNode() == pRoot);
assert (it.nextNode() == pElem1);
assert (it.nextNode() == pElem2);
assert (it.nextNode() == 0);
assertTrue (it.currentNode() == pRoot);
assertTrue (it.nextNode() == pElem1);
assertTrue (it.nextNode() == pElem2);
assertTrue (it.nextNode() == 0);
assert (it.currentNode() == pElem2);
assert (it.previousNode() == pElem1);
assert (it.previousNode() == pRoot);
assert (it.previousNode() == 0);
assertTrue (it.currentNode() == pElem2);
assertTrue (it.previousNode() == pElem1);
assertTrue (it.previousNode() == pRoot);
assertTrue (it.previousNode() == 0);
assert (it.currentNode() == pRoot);
assert (it.parentNode() == 0);
assert (it.currentNode() == pRoot);
assert (it.firstChild() == pElem1);
assert (it.parentNode() == pRoot);
assert (it.lastChild() == pElem2);
assert (it.firstChild() == 0);
assert (it.currentNode() == pElem2);
assert (it.lastChild() == 0);
assert (it.currentNode() == pElem2);
assert (it.previousSibling() == pElem1);
assert (it.firstChild() == 0);
assert (it.lastChild() == 0);
assert (it.parentNode() == pRoot);
assertTrue (it.currentNode() == pRoot);
assertTrue (it.parentNode() == 0);
assertTrue (it.currentNode() == pRoot);
assertTrue (it.firstChild() == pElem1);
assertTrue (it.parentNode() == pRoot);
assertTrue (it.lastChild() == pElem2);
assertTrue (it.firstChild() == 0);
assertTrue (it.currentNode() == pElem2);
assertTrue (it.lastChild() == 0);
assertTrue (it.currentNode() == pElem2);
assertTrue (it.previousSibling() == pElem1);
assertTrue (it.firstChild() == 0);
assertTrue (it.lastChild() == 0);
assertTrue (it.parentNode() == pRoot);
}
@@ -178,80 +178,80 @@ void TreeWalkerTest::testFilter()
SkipNodeFilter skipFilter;
TreeWalker it1(pRoot, NodeFilter::SHOW_ELEMENT, &skipFilter);
assert (it1.nextNode() == pElem1);
assert (it1.nextNode() == 0);
assertTrue (it1.nextNode() == pElem1);
assertTrue (it1.nextNode() == 0);
assert (it1.currentNode() == pElem1);
assert (it1.previousNode() == 0);
assertTrue (it1.currentNode() == pElem1);
assertTrue (it1.previousNode() == 0);
assert (it1.parentNode() == 0);
assert (it1.firstChild() == 0);
assert (it1.lastChild() == 0);
assert (it1.nextSibling() == 0);
assert (it1.previousSibling() == 0);
assertTrue (it1.parentNode() == 0);
assertTrue (it1.firstChild() == 0);
assertTrue (it1.lastChild() == 0);
assertTrue (it1.nextSibling() == 0);
assertTrue (it1.previousSibling() == 0);
TreeWalker it2(pRoot, NodeFilter::SHOW_ALL, &skipFilter);
assert (it2.nextNode() == pElem1);
assert (it2.nextNode() == pText1);
assert (it2.nextNode() == pText2);
assert (it2.nextNode() == 0);
assertTrue (it2.nextNode() == pElem1);
assertTrue (it2.nextNode() == pText1);
assertTrue (it2.nextNode() == pText2);
assertTrue (it2.nextNode() == 0);
assert (it2.currentNode() == pText2);
assert (it2.previousNode() == pText1);
assert (it2.previousNode() == pElem1);
assert (it2.previousNode() == 0);
assertTrue (it2.currentNode() == pText2);
assertTrue (it2.previousNode() == pText1);
assertTrue (it2.previousNode() == pElem1);
assertTrue (it2.previousNode() == 0);
assert (it2.currentNode() == pElem1);
assert (it2.parentNode() == 0);
assert (it2.nextSibling() == 0);
assert (it2.previousSibling() == 0);
assert (it2.firstChild() == pText1);
assert (it2.nextSibling() == 0);
assert (it2.previousSibling() == 0);
assert (it2.parentNode() == pElem1);
assertTrue (it2.currentNode() == pElem1);
assertTrue (it2.parentNode() == 0);
assertTrue (it2.nextSibling() == 0);
assertTrue (it2.previousSibling() == 0);
assertTrue (it2.firstChild() == pText1);
assertTrue (it2.nextSibling() == 0);
assertTrue (it2.previousSibling() == 0);
assertTrue (it2.parentNode() == pElem1);
RejectNodeFilter rejectFilter;
TreeWalker it3(pRoot, NodeFilter::SHOW_ELEMENT, &rejectFilter);
assert (it3.nextNode() == pElem1);
assert (it3.nextNode() == 0);
assertTrue (it3.nextNode() == pElem1);
assertTrue (it3.nextNode() == 0);
assert (it3.currentNode() == pElem1);
assert (it3.previousNode() == pRoot);
assert (it3.previousNode() == 0);
assertTrue (it3.currentNode() == pElem1);
assertTrue (it3.previousNode() == pRoot);
assertTrue (it3.previousNode() == 0);
assert (it3.currentNode() == pRoot);
assert (it3.parentNode() == 0);
assert (it3.firstChild() == pElem1);
assert (it3.nextSibling() == 0);
assert (it3.previousSibling() == 0);
assert (it3.parentNode() == pRoot);
assert (it3.lastChild() == pElem1);
assertTrue (it3.currentNode() == pRoot);
assertTrue (it3.parentNode() == 0);
assertTrue (it3.firstChild() == pElem1);
assertTrue (it3.nextSibling() == 0);
assertTrue (it3.previousSibling() == 0);
assertTrue (it3.parentNode() == pRoot);
assertTrue (it3.lastChild() == pElem1);
TreeWalker it4(pRoot, NodeFilter::SHOW_ALL, &rejectFilter);
assert (it4.nextNode() == pElem1);
assert (it4.nextNode() == pText1);
assert (it4.nextNode() == 0);
assertTrue (it4.nextNode() == pElem1);
assertTrue (it4.nextNode() == pText1);
assertTrue (it4.nextNode() == 0);
assert (it4.currentNode() == pText1);
assert (it4.previousNode() == pElem1);
assert (it4.previousNode() == pRoot);
assert (it4.previousNode() == 0);
assertTrue (it4.currentNode() == pText1);
assertTrue (it4.previousNode() == pElem1);
assertTrue (it4.previousNode() == pRoot);
assertTrue (it4.previousNode() == 0);
assert (it4.currentNode() == pRoot);
assert (it4.parentNode() == 0);
assert (it4.firstChild() == pElem1);
assert (it4.firstChild() == pText1);
assert (it4.nextSibling() == 0);
assert (it4.previousSibling() == 0);
assert (it4.parentNode() == pElem1);
assert (it4.lastChild() == pText1);
assert (it4.parentNode() == pElem1);
assert (it4.nextSibling() == 0);
assert (it4.previousSibling() == 0);
assert (it4.parentNode() == pRoot);
assertTrue (it4.currentNode() == pRoot);
assertTrue (it4.parentNode() == 0);
assertTrue (it4.firstChild() == pElem1);
assertTrue (it4.firstChild() == pText1);
assertTrue (it4.nextSibling() == 0);
assertTrue (it4.previousSibling() == 0);
assertTrue (it4.parentNode() == pElem1);
assertTrue (it4.lastChild() == pText1);
assertTrue (it4.parentNode() == pElem1);
assertTrue (it4.nextSibling() == 0);
assertTrue (it4.previousSibling() == 0);
assertTrue (it4.parentNode() == pRoot);
}
@@ -272,15 +272,15 @@ void TreeWalkerTest::testShowNothing()
TreeWalker it(pRoot, 0);
assert (it.nextNode() == 0);
assertTrue (it.nextNode() == 0);
assert (it.previousNode() == 0);
assertTrue (it.previousNode() == 0);
assert (it.currentNode() == pRoot);
assert (it.firstChild() == 0);
assert (it.lastChild() == 0);
assert (it.nextSibling() == 0);
assert (it.previousSibling() == 0);
assertTrue (it.currentNode() == pRoot);
assertTrue (it.firstChild() == 0);
assertTrue (it.lastChild() == 0);
assertTrue (it.nextSibling() == 0);
assertTrue (it.previousSibling() == 0);
}

232
XML/testsuite/src/XMLStreamParserTest.cpp
View File

@@ -41,11 +41,11 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root><nested>X</nasted></root>");
XMLStreamParser p(is, "test");
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assert(p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == "X");
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == "X");
p.next();
assert(false);
assertTrue (false);
}
catch (const Poco::Exception&)
{
@@ -60,7 +60,7 @@ void XMLStreamParserTest::testParser()
is.setstate(std::ios_base::badbit);
p.next();
assert(false);
assertTrue (false);
}
catch (const std::ios_base::failure&)
{
@@ -80,7 +80,7 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root/>");
XMLStreamParser p(is, "test");
p.nextExpect(XMLStreamParser::EV_END_ELEMENT);
assert(false);
assertTrue (false);
}
catch (const Poco::Exception&)
{
@@ -92,7 +92,7 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root/>");
XMLStreamParser p(is, "test");
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "root1");
assert(false);
assertTrue (false);
}
catch (const Poco::Exception&)
{
@@ -132,7 +132,7 @@ void XMLStreamParserTest::testParser()
XMLStreamParser p(is, "test");
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "root");
p.nextExpect(XMLStreamParser::EV_CHARACTERS);
assert(p.value<int>() == 123);
assertTrue (p.value<int>() == 123);
p.nextExpect(XMLStreamParser::EV_END_ELEMENT);
}
@@ -143,12 +143,12 @@ void XMLStreamParserTest::testParser()
XMLStreamParser p(is, "test");
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "root");
assert(p.attribute("a") == "a");
assert(p.attribute("b", "B") == "b");
assert(p.attribute("c", "C") == "C");
assert(p.attribute<int>("d") == 123);
assert(p.attribute<bool>("t") == true);
assert(p.attribute("f", false) == false);
assertTrue (p.attribute("a") == "a");
assertTrue (p.attribute("b", "B") == "b");
assertTrue (p.attribute("c", "C") == "C");
assertTrue (p.attribute<int>("d") == 123);
assertTrue (p.attribute<bool>("t") == true);
assertTrue (p.attribute("f", false) == false);
p.nextExpect(XMLStreamParser::EV_END_ELEMENT);
}
@@ -157,21 +157,21 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root a='a'><nested a='A'><inner/></nested></root>");
XMLStreamParser p(is, "test");
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "root");
assert(p.attribute("a") == "a");
assert(p.peek() == XMLStreamParser::EV_START_ELEMENT && p.localName() == "nested");
assert(p.attribute("a") == "a");
assertTrue (p.attribute("a") == "a");
assertTrue (p.peek() == XMLStreamParser::EV_START_ELEMENT && p.localName() == "nested");
assertTrue (p.attribute("a") == "a");
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "nested");
assert(p.attribute("a") == "A");
assertTrue (p.attribute("a") == "A");
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "inner");
assert(p.attribute("a", "") == "");
assertTrue (p.attribute("a", "") == "");
p.nextExpect(XMLStreamParser::EV_END_ELEMENT);
assert(p.attribute("a") == "A");
assert(p.peek() == XMLStreamParser::EV_END_ELEMENT);
assert(p.attribute("a") == "A"); // Still valid.
assertTrue (p.attribute("a") == "A");
assertTrue (p.peek() == XMLStreamParser::EV_END_ELEMENT);
assertTrue (p.attribute("a") == "A"); // Still valid.
p.nextExpect(XMLStreamParser::EV_END_ELEMENT);
assert(p.attribute("a") == "a");
assertTrue (p.attribute("a") == "a");
p.nextExpect(XMLStreamParser::EV_END_ELEMENT);
assert(p.attribute("a", "") == "");
assertTrue (p.attribute("a", "") == "");
}
try
@@ -179,9 +179,9 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root a='a' b='b'/>");
XMLStreamParser p(is, "test");
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "root");
assert(p.attribute("a") == "a");
assertTrue (p.attribute("a") == "a");
p.nextExpect(XMLStreamParser::EV_END_ELEMENT);
assert(false);
assertTrue (false);
}
catch (const Poco::Exception&)
{
@@ -194,7 +194,7 @@ void XMLStreamParserTest::testParser()
XMLStreamParser p(is, "test");
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "root");
p.attribute<int>("a");
assert(false);
assertTrue (false);
}
catch (const Poco::Exception&)
{
@@ -207,43 +207,43 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root x='x'>x<nested/></root>");
XMLStreamParser p(is, "peek", XMLStreamParser::RECEIVE_DEFAULT | XMLStreamParser::RECEIVE_ATTRIBUTES_EVENT);
assert(p.event() == XMLStreamParser::EV_EOF);
assertTrue (p.event() == XMLStreamParser::EV_EOF);
assert(p.peek() == XMLStreamParser::EV_START_ELEMENT);
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assert(p.event() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.peek() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.event() == XMLStreamParser::EV_START_ELEMENT);
assert(p.peek() == XMLStreamParser::EV_START_ATTRIBUTE);
assert(p.event() == XMLStreamParser::EV_START_ATTRIBUTE);
assert(p.next() == XMLStreamParser::EV_START_ATTRIBUTE);
assertTrue (p.peek() == XMLStreamParser::EV_START_ATTRIBUTE);
assertTrue (p.event() == XMLStreamParser::EV_START_ATTRIBUTE);
assertTrue (p.next() == XMLStreamParser::EV_START_ATTRIBUTE);
assert(p.peek() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assert(p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assert(p.event() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assertTrue (p.peek() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assertTrue (p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assertTrue (p.event() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assert(p.peek() == XMLStreamParser::EV_END_ATTRIBUTE);
assert(p.event() == XMLStreamParser::EV_END_ATTRIBUTE);
assert(p.next() == XMLStreamParser::EV_END_ATTRIBUTE);
assertTrue (p.peek() == XMLStreamParser::EV_END_ATTRIBUTE);
assertTrue (p.event() == XMLStreamParser::EV_END_ATTRIBUTE);
assertTrue (p.next() == XMLStreamParser::EV_END_ATTRIBUTE);
assert(p.peek() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assert(p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assert(p.event() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assertTrue (p.peek() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assertTrue (p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assertTrue (p.event() == XMLStreamParser::EV_CHARACTERS && p.value() == "x");
assert(p.peek() == XMLStreamParser::EV_START_ELEMENT);
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assert(p.event() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.peek() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.event() == XMLStreamParser::EV_START_ELEMENT);
assert(p.peek() == XMLStreamParser::EV_END_ELEMENT);
assert(p.next() == XMLStreamParser::EV_END_ELEMENT);
assert(p.event() == XMLStreamParser::EV_END_ELEMENT);
assertTrue (p.peek() == XMLStreamParser::EV_END_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_END_ELEMENT);
assertTrue (p.event() == XMLStreamParser::EV_END_ELEMENT);
assert(p.peek() == XMLStreamParser::EV_END_ELEMENT);
assert(p.next() == XMLStreamParser::EV_END_ELEMENT);
assert(p.event() == XMLStreamParser::EV_END_ELEMENT);
assertTrue (p.peek() == XMLStreamParser::EV_END_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_END_ELEMENT);
assertTrue (p.event() == XMLStreamParser::EV_END_ELEMENT);
assert(p.peek() == XMLStreamParser::EV_EOF);
assert(p.next() == XMLStreamParser::EV_EOF);
assert(p.event() == XMLStreamParser::EV_EOF);
assertTrue (p.peek() == XMLStreamParser::EV_EOF);
assertTrue (p.next() == XMLStreamParser::EV_EOF);
assertTrue (p.event() == XMLStreamParser::EV_EOF);
}
// Test content processing.
@@ -255,13 +255,13 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root x=' x '> \n\t </root>");
XMLStreamParser p(is, "empty", XMLStreamParser::RECEIVE_DEFAULT | XMLStreamParser::RECEIVE_ATTRIBUTES_EVENT);
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
p.content(Content::Empty);
assert(p.next() == XMLStreamParser::EV_START_ATTRIBUTE);
assert(p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == " x ");
assert(p.next() == XMLStreamParser::EV_END_ATTRIBUTE);
assert(p.next() == XMLStreamParser::EV_END_ELEMENT);
assert(p.next() == XMLStreamParser::EV_EOF);
assertTrue (p.next() == XMLStreamParser::EV_START_ATTRIBUTE);
assertTrue (p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == " x ");
assertTrue (p.next() == XMLStreamParser::EV_END_ATTRIBUTE);
assertTrue (p.next() == XMLStreamParser::EV_END_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_EOF);
}
try
@@ -269,10 +269,10 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root> \n &amp; X \t </root>");
XMLStreamParser p(is, "empty");
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
p.content(Content::Empty);
p.next();
assert(false);
assertTrue (false);
}
catch (const Poco::Exception&)
{
@@ -285,11 +285,11 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root> X </root>");
XMLStreamParser p(is, "simple");
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
p.content(Content::Simple);
assert(p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == " X ");
assert(p.next() == XMLStreamParser::EV_END_ELEMENT);
assert(p.next() == XMLStreamParser::EV_EOF);
assertTrue (p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == " X ");
assertTrue (p.next() == XMLStreamParser::EV_END_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_EOF);
}
try
@@ -297,11 +297,11 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root> ? <nested/></root>");
XMLStreamParser p(is, "simple");
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
p.content(Content::Simple);
assert(p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == " ? ");
assertTrue (p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == " ? ");
p.next();
assert(false);
assertTrue (false);
}
catch (const Poco::Exception&)
{
@@ -314,13 +314,13 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root xmlns:a='a'>1&#x32;3</root>");
XMLStreamParser p(is, "simple", XMLStreamParser::RECEIVE_DEFAULT | XMLStreamParser::RECEIVE_NAMESPACE_DECLS);
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
p.nextExpect(XMLStreamParser::EV_START_NAMESPACE_DECL);
p.content(Content::Simple);
assert(p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == "123");
assertTrue (p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == "123");
p.nextExpect(XMLStreamParser::EV_END_NAMESPACE_DECL);
assert(p.next() == XMLStreamParser::EV_END_ELEMENT);
assert(p.next() == XMLStreamParser::EV_EOF);
assertTrue (p.next() == XMLStreamParser::EV_END_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_EOF);
}
try
@@ -330,11 +330,11 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root xmlns:a='a'>1&#x32;<nested/>3</root>");
XMLStreamParser p(is, "simple", XMLStreamParser::RECEIVE_DEFAULT | XMLStreamParser::RECEIVE_NAMESPACE_DECLS);
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
p.nextExpect(XMLStreamParser::EV_START_NAMESPACE_DECL);
p.content(Content::Simple);
p.next();
assert(false);
assertTrue (false);
}
catch (const Poco::Exception&)
{
@@ -352,28 +352,28 @@ void XMLStreamParserTest::testParser()
"</root>\n");
XMLStreamParser p(is, "complex", XMLStreamParser::RECEIVE_DEFAULT | XMLStreamParser::RECEIVE_ATTRIBUTES_EVENT);
assert(p.next() == XMLStreamParser::EV_START_ELEMENT); // root
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT); // root
p.content(Content::Complex);
assert(p.next() == XMLStreamParser::EV_START_ATTRIBUTE);
assert(p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == " x ");
assert(p.next() == XMLStreamParser::EV_END_ATTRIBUTE);
assertTrue (p.next() == XMLStreamParser::EV_START_ATTRIBUTE);
assertTrue (p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == " x ");
assertTrue (p.next() == XMLStreamParser::EV_END_ATTRIBUTE);
assert(p.next() == XMLStreamParser::EV_START_ELEMENT); // nested
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT); // nested
p.content(Content::Complex);
assert(p.next() == XMLStreamParser::EV_START_ELEMENT); // inner
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT); // inner
p.content(Content::Empty);
assert(p.next() == XMLStreamParser::EV_END_ELEMENT); // inner
assertTrue (p.next() == XMLStreamParser::EV_END_ELEMENT); // inner
assert(p.next() == XMLStreamParser::EV_START_ELEMENT); // inner
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT); // inner
p.content(Content::Simple);
assert(p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == " X ");
assert(p.next() == XMLStreamParser::EV_END_ELEMENT); // inner
assertTrue (p.next() == XMLStreamParser::EV_CHARACTERS && p.value() == " X ");
assertTrue (p.next() == XMLStreamParser::EV_END_ELEMENT); // inner
assert(p.next() == XMLStreamParser::EV_END_ELEMENT); // nested
assert(p.next() == XMLStreamParser::EV_END_ELEMENT); // root
assert(p.next() == XMLStreamParser::EV_EOF);
assertTrue (p.next() == XMLStreamParser::EV_END_ELEMENT); // nested
assertTrue (p.next() == XMLStreamParser::EV_END_ELEMENT); // root
assertTrue (p.next() == XMLStreamParser::EV_EOF);
}
try
@@ -381,12 +381,12 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root> \n<n/> X <n> X </n> </root>");
XMLStreamParser p(is, "complex");
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
p.content(Content::Complex);
assert(p.next() == XMLStreamParser::EV_START_ELEMENT);
assert(p.next() == XMLStreamParser::EV_END_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_START_ELEMENT);
assertTrue (p.next() == XMLStreamParser::EV_END_ELEMENT);
p.next();
assert(false);
assertTrue (false);
}
catch (const Poco::Exception&)
{
@@ -418,31 +418,31 @@ void XMLStreamParserTest::testParser()
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "root", Content::Complex);
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "nested");
assert(p.element() == "X");
assertTrue (p.element() == "X");
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "nested");
assert(p.element() == "");
assertTrue (p.element() == "");
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "nested");
assert(p.element<unsigned int>() == 123);
assertTrue (p.element<unsigned int>() == 123);
assert(p.element("nested") == "Y");
assert(p.element(QName("test", "nested")) == "Z");
assertTrue (p.element("nested") == "Y");
assertTrue (p.element(QName("test", "nested")) == "Z");
assert(p.element<unsigned int>("nested") == 234);
assert(p.element<unsigned int>(QName("test", "nested")) == 345);
assertTrue (p.element<unsigned int>("nested") == 234);
assertTrue (p.element<unsigned int>(QName("test", "nested")) == 345);
assert(p.element("nested", "a") == "A");
assert(p.element(QName("test", "nested"), "b") == "B");
assertTrue (p.element("nested", "a") == "A");
assertTrue (p.element(QName("test", "nested"), "b") == "B");
assert(p.element("nested", "a") == "a" && p.element("nested1") == "A");
assert(p.element(QName("test", "nested"), "b") == "b" && p.element(QName("test", "nested1")) == "B");
assertTrue (p.element("nested", "a") == "a" && p.element("nested1") == "A");
assertTrue (p.element(QName("test", "nested"), "b") == "b" && p.element(QName("test", "nested1")) == "B");
assert(p.element<unsigned int>("nested", 10) == 1);
assert(p.element<unsigned int>(QName("test", "nested"), 20) == 2);
assertTrue (p.element<unsigned int>("nested", 10) == 1);
assertTrue (p.element<unsigned int>(QName("test", "nested"), 20) == 2);
assert(p.element<unsigned int>("nested", 10) == 10 && p.element<unsigned int>("nested1") == 1);
assert(p.element<unsigned int>(QName("test", "nested"), 20) == 20 && p.element<unsigned int>(QName("test", "nested1")) == 2);
assertTrue (p.element<unsigned int>("nested", 10) == 10 && p.element<unsigned int>("nested1") == 1);
assertTrue (p.element<unsigned int>(QName("test", "nested"), 20) == 20 && p.element<unsigned int>(QName("test", "nested1")) == 2);
p.nextExpect(XMLStreamParser::EV_END_ELEMENT);
}
@@ -461,12 +461,12 @@ void XMLStreamParserTest::testParser()
//for (XMLStreamParser::EventType e: p)
// v.push_back (e);
assert(v.size() == 5);
assert(v[0] == XMLStreamParser::EV_START_ELEMENT);
assert(v[1] == XMLStreamParser::EV_START_ELEMENT);
assert(v[2] == XMLStreamParser::EV_CHARACTERS);
assert(v[3] == XMLStreamParser::EV_END_ELEMENT);
assert(v[4] == XMLStreamParser::EV_END_ELEMENT);
assertTrue (v.size() == 5);
assertTrue (v[0] == XMLStreamParser::EV_START_ELEMENT);
assertTrue (v[1] == XMLStreamParser::EV_START_ELEMENT);
assertTrue (v[2] == XMLStreamParser::EV_CHARACTERS);
assertTrue (v[3] == XMLStreamParser::EV_END_ELEMENT);
assertTrue (v[4] == XMLStreamParser::EV_END_ELEMENT);
}
// Test space extraction into the std::string value.
@@ -475,9 +475,9 @@ void XMLStreamParserTest::testParser()
std::istringstream is("<root a=' a '> b </root>");
XMLStreamParser p(is, "test");
p.nextExpect(XMLStreamParser::EV_START_ELEMENT, "root");
assert(p.attribute<std::string>("a") == " a ");
assertTrue (p.attribute<std::string>("a") == " a ");
p.nextExpect(XMLStreamParser::EV_CHARACTERS);
assert(p.value<std::string>() == " b ");
assertTrue (p.value<std::string>() == " b ");
p.nextExpect(XMLStreamParser::EV_END_ELEMENT);
}
}

70
XML/testsuite/src/XMLWriterTest.cpp
View File

@@ -40,7 +40,7 @@ void XMLWriterTest::testTrivial()
writer.endElement("", "", "foo");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<foo/>");
assertTrue (xml == "<foo/>");
}
@@ -53,7 +53,7 @@ void XMLWriterTest::testTrivialCanonical()
writer.endElement("", "", "foo");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<foo></foo>");
assertTrue (xml == "<foo></foo>");
}
@@ -66,7 +66,7 @@ void XMLWriterTest::testTrivialDecl()
writer.endElement("", "", "foo");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><foo/>");
assertTrue (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><foo/>");
}
@@ -80,7 +80,7 @@ void XMLWriterTest::testTrivialDeclPretty()
writer.endElement("", "", "foo");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<foo/>\n");
assertTrue (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<foo/>\n");
}
@@ -93,7 +93,7 @@ void XMLWriterTest::testTrivialFragment()
writer.endElement("", "", "foo");
writer.endFragment();
std::string xml = str.str();
assert (xml == "<foo/>");
assertTrue (xml == "<foo/>");
}
@@ -107,7 +107,7 @@ void XMLWriterTest::testTrivialFragmentPretty()
writer.endElement("", "", "foo");
writer.endFragment();
std::string xml = str.str();
assert (xml == "<foo/>\n");
assertTrue (xml == "<foo/>\n");
}
@@ -123,7 +123,7 @@ void XMLWriterTest::testDTDPretty()
writer.endElement("", "", "foo");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
assertTrue (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!DOCTYPE test SYSTEM \"http://www.appinf.com/DTDs/test\">\n"
"<foo/>\n");
}
@@ -141,7 +141,7 @@ void XMLWriterTest::testDTD()
writer.endElement("", "", "foo");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
assertTrue (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<!DOCTYPE test SYSTEM \"http://www.appinf.com/DTDs/test\">"
"<foo/>");
}
@@ -159,7 +159,7 @@ void XMLWriterTest::testDTDPublic()
writer.endElement("", "", "foo");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
assertTrue (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<!DOCTYPE test PUBLIC \"test\" \"http://www.appinf.com/DTDs/test\">"
"<foo/>");
}
@@ -181,7 +181,7 @@ void XMLWriterTest::testDTDNotation()
writer.endElement("", "", "foo");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
assertTrue (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!DOCTYPE test [\n"
"\t<!NOTATION mov SYSTEM \"quicktime\">\n"
"\t<!NOTATION xml PUBLIC \"-//W3C//NOTATION XML 1.0//EN\">\n"
@@ -206,7 +206,7 @@ void XMLWriterTest::testDTDEntity()
writer.endElement("", "", "foo");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
assertTrue (xml == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<!DOCTYPE test [\n"
"\t<!NOTATION mov SYSTEM \"quicktime\">\n"
"\t<!ENTITY movie SYSTEM \"movie.mov\" NDATA mov>\n"
@@ -227,7 +227,7 @@ void XMLWriterTest::testAttributes()
writer.endElement("", "", "el");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<el a1=\"v1\" a2=\"v2\"/>");
assertTrue (xml == "<el a1=\"v1\" a2=\"v2\"/>");
}
@@ -244,7 +244,7 @@ void XMLWriterTest::testAttributesPretty()
writer.endElement("", "", "el");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<el\n\ta1=\"v1\"\n\ta2=\"v2\"/>\n");
assertTrue (xml == "<el\n\ta1=\"v1\"\n\ta2=\"v2\"/>\n");
}
@@ -256,7 +256,7 @@ void XMLWriterTest::testData()
writer.dataElement("", "", "d", "data", "a1", "v1", "a2", "v2", "a3", "v3");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<d a1=\"v1\" a2=\"v2\" a3=\"v3\">data</d>");
assertTrue (xml == "<d a1=\"v1\" a2=\"v2\" a3=\"v3\">data</d>");
}
@@ -268,7 +268,7 @@ void XMLWriterTest::testEmptyData()
writer.dataElement("", "", "d", "", "a1", "v1", "a2", "v2", "a3", "v3");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<d a1=\"v1\" a2=\"v2\" a3=\"v3\"/>");
assertTrue (xml == "<d a1=\"v1\" a2=\"v2\" a3=\"v3\"/>");
}
@@ -283,7 +283,7 @@ void XMLWriterTest::testDataPretty()
writer.endElement("", "", "r");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<r>\n\t<d a1=\"v1\" a2=\"v2\" a3=\"v3\">data</d>\n</r>\n");
assertTrue (xml == "<r>\n\t<d a1=\"v1\" a2=\"v2\" a3=\"v3\">data</d>\n</r>\n");
}
@@ -298,7 +298,7 @@ void XMLWriterTest::testEmptyDataPretty()
writer.endElement("", "", "r");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<r>\n\t<d a1=\"v1\" a2=\"v2\" a3=\"v3\"/>\n</r>\n");
assertTrue (xml == "<r>\n\t<d a1=\"v1\" a2=\"v2\" a3=\"v3\"/>\n</r>\n");
}
@@ -315,7 +315,7 @@ void XMLWriterTest::testComment()
writer.endElement("", "", "r");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<!--a comment-->\n<r>\n\t<!--<another comment>-->\n\t<d>data</d>\n</r>\n");
assertTrue (xml == "<!--a comment-->\n<r>\n\t<!--<another comment>-->\n\t<d>data</d>\n</r>\n");
}
@@ -332,7 +332,7 @@ void XMLWriterTest::testPI()
writer.endElement("", "", "r");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<?target a processing instruction?>\n<r>\n\t<?target another processing instruction?>\n\t<d>data</d>\n</r>\n");
assertTrue (xml == "<?target a processing instruction?>\n<r>\n\t<?target another processing instruction?>\n\t<d>data</d>\n</r>\n");
}
@@ -346,7 +346,7 @@ void XMLWriterTest::testCharacters()
writer.endElement("", "", "r");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<r>some &quot;chars&quot; that &lt;must&gt; be &amp; escaped</r>");
assertTrue (xml == "<r>some &quot;chars&quot; that &lt;must&gt; be &amp; escaped</r>");
}
@@ -360,7 +360,7 @@ void XMLWriterTest::testEmptyCharacters()
writer.endElement("", "", "r");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<r/>");
assertTrue (xml == "<r/>");
}
@@ -376,7 +376,7 @@ void XMLWriterTest::testCDATA()
writer.endElement("", "", "r");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<r><![CDATA[some \"chars\" that <must> be & escaped]]></r>");
assertTrue (xml == "<r><![CDATA[some \"chars\" that <must> be & escaped]]></r>");
}
@@ -392,7 +392,7 @@ void XMLWriterTest::testRawCharacters()
writer.endElement("", "", "r");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<r><![CDATA[some \"chars\" that <must> be & escaped]]></r>");
assertTrue (xml == "<r><![CDATA[some \"chars\" that <must> be & escaped]]></r>");
}
@@ -408,7 +408,7 @@ void XMLWriterTest::testAttributeCharacters()
writer.endElement("", "", "el");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<el a1=\"a b c&#xA;&#x9;d\" a2=\"a b c&#xD;&#xA;d\"/>");
assertTrue (xml == "<el a1=\"a b c&#xA;&#x9;d\" a2=\"a b c&#xD;&#xA;d\"/>");
}
@@ -424,7 +424,7 @@ void XMLWriterTest::testDefaultNamespace()
writer.endPrefixMapping("");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<r xmlns=\"urn:ns\">data</r>");
assertTrue (xml == "<r xmlns=\"urn:ns\">data</r>");
}
@@ -438,7 +438,7 @@ void XMLWriterTest::testQNamespaces()
writer.endElement("urn:ns", "r", "p:r");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<p:r xmlns:p=\"urn:ns\">data</p:r>");
assertTrue (xml == "<p:r xmlns:p=\"urn:ns\">data</p:r>");
}
@@ -453,7 +453,7 @@ void XMLWriterTest::testQNamespacesNested()
writer.endElement("urn:ns", "r", "p:r");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<p:r xmlns:p=\"urn:ns\"><p:e/></p:r>");
assertTrue (xml == "<p:r xmlns:p=\"urn:ns\"><p:e/></p:r>");
}
@@ -467,7 +467,7 @@ void XMLWriterTest::testNamespaces()
writer.endElement("urn:ns", "r", "");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<ns1:r xmlns:ns1=\"urn:ns\">data</ns1:r>");
assertTrue (xml == "<ns1:r xmlns:ns1=\"urn:ns\">data</ns1:r>");
}
@@ -481,7 +481,7 @@ void XMLWriterTest::testNamespacesCanonical()
writer.endElement("urn:ns", "r", "");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<r xmlns=\"urn:ns\">data</r>");
assertTrue (xml == "<r xmlns=\"urn:ns\">data</r>");
}
@@ -498,7 +498,7 @@ void XMLWriterTest::testAttributeNamespaces()
writer.endElement("urn:ns", "r", "");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<ns2:r ns1:myattr=\"attrValue\" ns2:myattr2=\"attrValue2\" xmlns:ns1=\"urn:other\" xmlns:ns2=\"urn:ns\">data</ns2:r>");
assertTrue (xml == "<ns2:r ns1:myattr=\"attrValue\" ns2:myattr2=\"attrValue2\" xmlns:ns1=\"urn:other\" xmlns:ns2=\"urn:ns\">data</ns2:r>");
}
@@ -515,7 +515,7 @@ void XMLWriterTest::testAttributeNamespacesCanonical()
writer.endElement("urn:ns", "r", "");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<r xmlns=\"urn:ns\" xmlns:ns1=\"urn:other\" myattr2=\"attrValue2\" ns1:myattr=\"attrValue\">data</r>");
assertTrue (xml == "<r xmlns=\"urn:ns\" xmlns:ns1=\"urn:other\" myattr2=\"attrValue2\" ns1:myattr=\"attrValue\">data</r>");
}
@@ -532,7 +532,7 @@ void XMLWriterTest::testNamespacesNested()
writer.endElement("urn:ns1", "r", "");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<ns1:r xmlns:ns1=\"urn:ns1\"><ns1:e/><ns2:f xmlns:ns2=\"urn:ns2\"/></ns1:r>");
assertTrue (xml == "<ns1:r xmlns:ns1=\"urn:ns1\"><ns1:e/><ns2:f xmlns:ns2=\"urn:ns2\"/></ns1:r>");
}
@@ -551,7 +551,7 @@ void XMLWriterTest::testNamespacesNestedCanonical()
writer.endElement("urn:ns1", "r", "");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<r xmlns=\"urn:ns1\"><e></e><ns1:f xmlns:ns1=\"urn:ns2\" myattr=\"attrValue\"></ns1:f></r>");
assertTrue (xml == "<r xmlns=\"urn:ns1\"><e></e><ns1:f xmlns:ns1=\"urn:ns2\" myattr=\"attrValue\"></ns1:f></r>");
}
@@ -573,7 +573,7 @@ void XMLWriterTest::testExplicitNamespaces()
writer.endElement("urn:ns1", "r", "");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<p1:r xmlns:p1=\"urn:ns1\" xmlns:p2=\"urn:ns2\"><p2:e/><p2:e xmlns:p3=\"urn:ns3\"><p3:f/></p2:e></p1:r>");
assertTrue (xml == "<p1:r xmlns:p1=\"urn:ns1\" xmlns:p2=\"urn:ns2\"><p2:e/><p2:e xmlns:p3=\"urn:ns3\"><p3:f/></p2:e></p1:r>");
}
@@ -642,7 +642,7 @@ void XMLWriterTest::testEmpty()
writer.endElement("", "", "foo");
writer.endDocument();
std::string xml = str.str();
assert (xml == "<foo><bar><empty/></bar></foo>");
assertTrue (xml == "<foo><bar><empty/></bar></foo>");
}