Convert from NULL macro to nullptr.

[shibboleth/xmltooling.git] / xmltoolingtest / NonVisibleNamespaceTest.h

diff --git a/xmltoolingtest/NonVisibleNamespaceTest.h b/xmltoolingtest/NonVisibleNamespaceTest.h
index a1eeaa7..e50fdf3 100644 (file)
--- a/xmltoolingtest/NonVisibleNamespaceTest.h
+++ b/xmltoolingtest/NonVisibleNamespaceTest.h
@@ -38,13 +38,13 @@ public:
     void testNamespacesAfterBuilding() {
         xmltooling::QName qtype(SimpleXMLObject::NAMESPACE,SimpleXMLObject::TYPE_NAME,SimpleXMLObject::NAMESPACE_PREFIX);
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(qtype);
-        TS_ASSERT(b!=NULL);
+        TS_ASSERT(b!=nullptr);
         auto_ptr<SimpleXMLObject> sxObject(
-            dynamic_cast<SimpleXMLObject*>(b->buildObject(SimpleXMLObject::NAMESPACE, SimpleXMLObject::LOCAL_NAME, NULL, &qtype))
+            dynamic_cast<SimpleXMLObject*>(b->buildObject(SimpleXMLObject::NAMESPACE, SimpleXMLObject::LOCAL_NAME, nullptr, &qtype))
             );
-        TS_ASSERT(sxObject.get()!=NULL);
+        TS_ASSERT(sxObject.get()!=nullptr);
         static_cast<AttributeExtensibleXMLObject*>(sxObject.get())->setAttribute(
-            xmltooling::QName(NULL, "attr1"), xmltooling::QName("http://www.example.org/testObjects/ext", "Value1", "test2")
+            xmltooling::QName(nullptr, "attr1"), xmltooling::QName("http://www.example.org/testObjects/ext", "Value1", "test2")
             );
 
         static const XMLCh TEST2_PREFIX[] = { chLatin_t, chLatin_e, chLatin_s, chLatin_t, chDigit_2, chNull };
@@ -53,15 +53,15 @@ public:
         bool cond1=false, cond2=false, cond3 = false;
         for (set<Namespace>::const_iterator ns = namespaces.begin(); ns != namespaces.end(); ++ns) {
             if (XMLString::equals(ns->getNamespacePrefix(), SimpleXMLObject::NAMESPACE_PREFIX)) {
-                TSM_ASSERT("'test' namespace was visibly used", !ns->visiblyUsed());
+                TSM_ASSERT("'test' namespace was visibly used", ns->usage() != Namespace::VisiblyUsed);
                 cond1 = true;
             }
             else if (XMLString::equals(ns->getNamespacePrefix(), TEST2_PREFIX)) {
-                TSM_ASSERT("'test2' namespace was visibly used", !ns->visiblyUsed());
+                TSM_ASSERT("'test2' namespace was visibly used", ns->usage() != Namespace::VisiblyUsed);
                 cond2 = true;
             }
             else if (XMLString::equals(ns->getNamespacePrefix(), &chNull)) {
-                TSM_ASSERT("Default namespace was not visibly used", ns->visiblyUsed());
+                TSM_ASSERT("Default namespace was not visibly used", ns->usage() == Namespace::VisiblyUsed);
                 cond3 = true;
             }
         }
@@ -74,25 +74,25 @@ public:
         string path=data_path + "SimpleXMLObjectWithNonVisible.xml";
         ifstream fs(path.c_str());
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(fs);
-        TS_ASSERT(doc!=NULL);
+        TS_ASSERT(doc!=nullptr);
 
         const XMLObjectBuilder* b = XMLObjectBuilder::getBuilder(doc->getDocumentElement());
-        TS_ASSERT(b!=NULL);
+        TS_ASSERT(b!=nullptr);
 
         auto_ptr<SimpleXMLObject> sxObject(
             dynamic_cast<SimpleXMLObject*>(b->buildFromDocument(doc))
             );
-        TS_ASSERT(sxObject.get()!=NULL);
+        TS_ASSERT(sxObject.get()!=nullptr);
 
         const set<Namespace>& namespaces = sxObject->getNamespaces();
         bool cond1=false, cond2=false, cond3=false;
         for (set<Namespace>::const_iterator ns = namespaces.begin(); ns != namespaces.end(); ++ns) {
             if (XMLString::equals(ns->getNamespacePrefix(), SimpleXMLObject::NAMESPACE_PREFIX)) {
-                TSM_ASSERT("'test' namespace was visibly used", !ns->visiblyUsed());
+                TSM_ASSERT("'test' namespace was visibly used", ns->usage() != Namespace::VisiblyUsed);
                 cond1 = true;
             }
             else if (XMLString::equals(ns->getNamespacePrefix(), &chNull)) {
-                TSM_ASSERT("Default namespace was not visibly used", ns->visiblyUsed());
+                TSM_ASSERT("Default namespace was not visibly used", ns->usage() == Namespace::VisiblyUsed);
                 cond2 = true;
             }
         }