* ns aware name tests are done

itod · May 29, 2014 · b927b24 · b927b24
1 parent c0db520
commit b927b24
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 34 deletions.
diff --git a/libxml2/XPLibXmlNodeImpl.m b/libxml2/XPLibXmlNodeImpl.m
@@ -23,7 +23,7 @@ @interface XPNodeSetValue ()
 @end
 
 static NSString *XPSTR(const xmlChar *zstr) {
-    NSString *res = nil;
+    NSString *res = @"";
     if (zstr) {
         res = [NSString stringWithUTF8String:(const char *)zstr];
     }
@@ -247,8 +247,7 @@ - (NSString *)name {
     NSString *qName = nil;
     NSString *localName = [self localName];
     NSString *prefix = [self prefix];
-    if (prefix) {
-        XPAssert([prefix length]);
+    if ([prefix length]) {
         qName = [NSString stringWithFormat:@"%@:%@", prefix, localName];
     } else {
         qName = localName;
@@ -260,7 +259,7 @@ - (NSString *)name {
 
 - (NSString *)localName {
     XPAssert(_node);
-    NSString *localName = nil;
+    NSString *localName = @"";
     switch (self.nodeType) {
         case XPNodeTypeElement:
         case XPNodeTypeAttribute:
@@ -284,7 +283,7 @@ - (NSString *)localName {
 
 - (NSString *)prefix {
     XPAssert(_node);
-    NSString *prefix = nil;
+    NSString *prefix = @"";
 
     xmlNsPtr ns = _node->ns;
     if (ns) {
@@ -297,7 +296,7 @@ - (NSString *)prefix {
 
 - (NSString *)namespaceURI {
     XPAssert(_node);
-    NSString *nsURI = nil;
+    NSString *nsURI = @"";
 
     xmlNsPtr ns = _node->ns;
     if (ns) {
@@ -318,7 +317,7 @@ - (NSString *)attributeValueForURI:(NSString *)nsURI localName:(NSString *)local
 
 - (NSString *)namespaceURIForPrefix:(NSString *)prefix {
     XPAssert(_node);
-    NSString *nsURI = nil;
+    NSString *nsURI = @"";
 
     XPAssert(_node->doc);
     xmlNsPtr ns = xmlSearchNs(_node->doc, _node, (xmlChar *)[prefix UTF8String]);

diff --git a/nsxml/XPNSXMLDocumentImpl.m b/nsxml/XPNSXMLDocumentImpl.m
@@ -25,4 +25,19 @@ - (XPNodeType)nodeType {
     return nil;
 }
 
+
+- (NSString *)name {
+    return @"";
+}
+
+
+- (NSString *)prefix {
+    return @"";
+}
+
+
+- (NSString *)namespaceURI {
+    return @"";
+}
+
 @end
diff --git a/nsxml/XPNSXMLNodeImpl.m b/nsxml/XPNSXMLNodeImpl.m
@@ -169,31 +169,36 @@ - (XPNodeType)nodeType {
 
 - (NSString *)stringValue {
     XPAssert(self.node);
-    return [self.node stringValue];
+    NSString *str = [self.node stringValue];
+    return str ? str : @"";
 }
 
 
 - (NSString *)name {
     XPAssert(self.node);
-    return [self.node name];
+    NSString *str = [self.node name];
+    return str ? str : @"";
 }
 
 
 - (NSString *)localName {
     XPAssert(self.node);
-    return [self.node localName];
+    NSString *str = [self.node localName];
+    return str ? str : @"";
 }
 
 
 - (NSString *)prefix {
     XPAssert(self.node);
-    return [self.node prefix];
+    NSString *str = [self.node prefix];
+    return str ? str : @"";
 }
 
 
 - (NSString *)namespaceURI {
     XPAssert(self.node);
-    return [self.node URI];
+    NSString *str = [self.node URI];
+    return str ? str : @"";
 }
 
 

diff --git a/src/FNNamespaceURI.m b/src/FNNamespaceURI.m
@@ -65,13 +65,7 @@ - (NSString *)evaluateAsStringInContext:(XPContext *)ctx {
         node = ctx.contextNode;
     }
 
-    NSString *prefix = [node prefix];
-    NSString *nsURI = @"";
-
-    if ([prefix length]) {
-        nsURI = [node namespaceURIForPrefix:prefix];
-    }
-
+    NSString *nsURI = [node namespaceURI];
     return nsURI;
 }
 

diff --git a/src/XPAssembler.m b/src/XPAssembler.m
@@ -496,7 +496,7 @@ - (void)parser:(PKParser *)p didMatchSpecificPITest:(PKAssembly *)a {
     PKToken *typeTok = [a pop];
     XPAssert([typeTok.stringValue isEqualToString:@"processing-instruction"]);
 
-    XPNameTest *nameTest = [[[XPNameTest alloc] initWithNamespaceURI:nil localName:localName] autorelease];
+    XPNameTest *nameTest = [[[XPNameTest alloc] initWithNamespaceURI:@"" localName:localName] autorelease];
     nameTest.nodeType = XPNodeTypePI;
 
     NSUInteger offset = typeTok.offset;
@@ -511,7 +511,7 @@ - (void)parser:(PKParser *)p didMatchNameTest:(PKAssembly *)a {
     XPAssertToken(nameTok);
 
     NSString *localName = nameTok.stringValue;
-    NSString *nsURI = nil;
+    NSString *nsURI = @"";
     id peek = [a pop];
     if ([_colon isEqualTo:peek]) {
         PKToken *prefixTok = [a pop];

diff --git a/src/XPNameTest.m b/src/XPNameTest.m
@@ -13,18 +13,21 @@ @interface XPNameTest ()
 @property (nonatomic, copy, readwrite) NSString *namespaceURI;
 @property (nonatomic, copy, readwrite) NSString *localName;
 @property (nonatomic, assign) BOOL isInNullNamespace;
-@property (nonatomic, assign) BOOL isWildcard;
+@property (nonatomic, assign) BOOL isNamespaceURIWildcard;
+@property (nonatomic, assign) BOOL isLocalNameWildcard;
 @end
 
 @implementation XPNameTest
 
 - (instancetype)initWithNamespaceURI:(NSString *)nsURI localName:(NSString *)localName {
     self = [super init];
     if (self) {
-        self.namespaceURI = nsURI;
+        self.namespaceURI = nsURI ? nsURI : @"";
         self.localName = localName;
-        self.isInNullNamespace = 0 == [nsURI length];
-        self.isWildcard = [localName isEqualToString:@"*"];
+
+        self.isLocalNameWildcard = [localName isEqualToString:@"*"];
+        self.isNamespaceURIWildcard = [nsURI isEqualToString:@"*"] || (_isLocalNameWildcard && 0 == [_namespaceURI length]);
+
         self.nodeType = XPNodeTypeNode;
     }
     return self;
@@ -39,23 +42,26 @@ - (void)dealloc {
 
 
 - (NSString *)description {
-    if (_isInNullNamespace) {
-        return _localName;
-    } else {
+    if ([_namespaceURI length]) {
         return [NSString stringWithFormat:@"%@:%@", _namespaceURI, _localName];
+    } else {
+        return _localName;
     }
 }
 
 
 - (BOOL)matches:(XPNodeType)nodeType namespaceURI:(NSString *)nsURI localName:(NSString *)localName {
+    XPAssert(nsURI);
+    XPAssert(localName);
+
     BOOL nsURIMatches = NO;
     BOOL localNameMatches = NO;
     BOOL typeMatches = (XPNodeTypeNode == nodeType || self.nodeType == nodeType);
 
     if (typeMatches) {
-        nsURIMatches = (_isInNullNamespace && 0 == [nsURI length]) || [_namespaceURI isEqualToString:nsURI];
+        nsURIMatches = _isNamespaceURIWildcard || [_namespaceURI isEqualToString:nsURI];
         if (nsURIMatches) {
-            localNameMatches = _isWildcard || [_localName isEqualToString:localName];
+            localNameMatches = _isLocalNameWildcard || [_localName isEqualToString:localName];
         }
     }
 

diff --git a/test/XPLocationPathLibxmlTest.m b/test/XPLocationPathLibxmlTest.m
@@ -574,6 +574,7 @@ - (void)testSlashSlashPara {
 
 
 - (void)testSlashSlashFoobarColonPara {
+    [_env declareNamespaceURI:@"bar" forPrefix:@"foobar"];
     [self eval:@"//foobar:para"];
 
     id <XPNodeEnumeration>enm = [_res enumerate];
@@ -1574,6 +1575,7 @@ - (void)testSlashSlashChapterPredicate1PredicateNamespaceURIEqEmptyStr {
 
 
 - (void)testSlashSlashChapterPredicate1PredicateNamespaceURIAtFooColonBazEqBar {
+    [_env declareNamespaceURI:@"bar" forPrefix:@"foobar"];
     [self eval:@"//chapter[1]/@*[namespace-uri(.)='bar']/.."];
 
     id <XPNodeEnumeration>enm = [_res enumerate];

diff --git a/test/XPLocationPathNSXMLTest.m b/test/XPLocationPathNSXMLTest.m
@@ -1442,6 +1442,7 @@ - (void)testSlashSlashChapterPredicate1PredicateNamespaceURIEqEmptyStr {
 
 
 - (void)testSlashSlashChapterPredicate1PredicateNamespaceURIAtFooColonBazEqBar {
+    [_env declareNamespaceURI:@"bar" forPrefix:@"foobar"];
     [self eval:@"//chapter[1]/@*[namespace-uri(.)='bar']/.."];
 
     id <XPNodeEnumeration>enm = [_res enumerate];
@@ -1489,7 +1490,7 @@ - (void)testSlashSlashComment {
     id <XPNodeEnumeration>enm = [_res enumerate];
 
     id <XPNodeInfo>node = [enm nextObject];
-    TDEqualObjects(nil, node.name);
+    TDEqualObjects(@"", node.name);
     TDEquals(XPNodeTypeComment, node.nodeType);
     TDEqualObjects(_comments[0], [node stringValue]);
 

diff --git a/test/XPStepTest.m b/test/XPStepTest.m
@@ -157,7 +157,7 @@ - (void)testDotDot {
     id <XPNodeEnumeration>enm = [_res enumerate];
 
     id <XPNodeInfo>node = [enm nextObject];
-    TDEqualObjects(nil, node.name);
+    TDEqualObjects(@"", node.name);
     TDEquals(XPNodeTypeRoot, node.nodeType);
 
     TDFalse([enm hasMoreObjects]);
@@ -173,7 +173,7 @@ - (void)testDotSlashDotDot {
     id <XPNodeEnumeration>enm = [_res enumerate];
 
     id <XPNodeInfo>node = [enm nextObject];
-    TDEqualObjects(nil, node.name);
+    TDEqualObjects(@"", node.name);
     TDEquals(XPNodeTypeRoot, node.nodeType);
 
     TDFalse([enm hasMoreObjects]);
@@ -189,7 +189,7 @@ - (void)testDotDotSlashDot {
     id <XPNodeEnumeration>enm = [_res enumerate];
 
     id <XPNodeInfo>node = [enm nextObject];
-    TDEqualObjects(nil, node.name);
+    TDEqualObjects(@"", node.name);
     TDEquals(XPNodeTypeRoot, node.nodeType);
 
     TDFalse([enm hasMoreObjects]);