gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-11 16:50:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSXMLNode.m: minor fix in nodesForXPath:... don't

Browse source 
set error to NULL if it doesn't point to anything.
	* Tests/base/NSXMLDocument/basic.m: Improved tests.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/nsxml_using_libxml2@34720 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2012-02-04 13:09:29 +00:00
parent 0c96a6f479
commit 3924b65349
3 changed files with 62 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-02-04 08:08-EST Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSXMLNode.m: minor fix in nodesForXPath:... don't
set error to NULL if it doesn't point to anything.
* Tests/base/NSXMLDocument/basic.m: Improved tests.
2012-02-03 11:43-EST Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSXMLNode.m: Conditionally compile out code if

5
Source/NSXMLNode.m
View file

@ -1415,7 +1415,10 @@ NSLog(@"RELEASING TRICKY EXTRA RETAIN in %@ now: %d", self, internal->externalRe
- (NSArray*) nodesForXPath: (NSString*)anxpath error: (NSError**)error
{
*error = NULL;
if(error != NULL)
{
*error = NULL;
}
return execute_xpath(self, anxpath, NULL);
}

54
Tests/base/NSXMLDocument/basic.m
View file

@ -6,8 +6,41 @@
int main()
{
NSAutoreleasePool *arp = [NSAutoreleasePool new];
NSArray *nodes = nil;
NSXMLDocument *node;
NSXMLElement *elem;
NSString *documentXML =
@"<?xml version=\"1.0\" encoding=\"utf-8\"?>"
@"<bookstore>"
@" <book category=\"COOKING\">"
@" <title lang=\"en\">Everyday Italian</title>"
@" <author>Giada De Laurentiis</author>"
@" <year>2005</year>"
@" <price>30.00</price>"
@" </book>"
@" <book category=\"CHILDREN\">"
@" <title lang=\"en\">Harry Potter</title>"
@" <author>J K. Rowling</author>"
@" <year>2005</year>"
@" <price>29.99</price>"
@" </book>"
@" <book category=\"WEB\">"
@" <title lang=\"en\">XQuery Kick Start</title>"
@" <author>James McGovern</author>"
@" <author>Per Bothner</author>"
@" <author>Kurt Cagle</author>"
@" <author>James Linn</author>"
@" <author>Vaidyanathan Nagarajan</author>"
@" <year>2003</year>"
@" <price>49.99</price>"
@" </book>"
@" <book category=\"WEB\">"
@" <title lang=\"en\">Learning XML</title>"
@" <author>Erik T. Ray</author>"
@" <year>2003</year>"
@" <price>39.95</price>"
@" </book>"
@"</bookstore>";
node = [NSXMLDocument alloc];
PASS_EXCEPTION([node initWithData: nil options: 0 error: 0],
@ -35,10 +68,27 @@ int main()
PASS_RUNS([node setRootElement: nil], "setting a nil root is ignored");
PASS_EQUAL([node rootElement], elem, "root element remains");
node = [[NSXMLDocument alloc] initWithXMLString:documentXML
options:0
error:NULL];
elem = [node rootElement];
PASS(node != nil, "document was initialized from a string");
PASS_EQUAL([node rootElement], elem, "root element is correct");
PASS_EQUAL([elem name],@"bookstore", "root element is bookstore");
nodes = [node nodesForXPath:@"/bookstore/book" error:NULL];
PASS([nodes count] == 4,
"Xpath function returns the correct number of elements (4)");
elem = [nodes objectAtIndex: 0];
PASS_EQUAL([elem class],[NSXMLElement class],
"first node in Xpath result is an element");
PASS([[elem name] isEqualToString: @"book"],
"Got the correct elements from XPath query");
[arp release];
arp = nil;
[elem release];
[node release];
// [elem release];
// [node release];
return 0;
}