@@ -28,72 +28,74 @@
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
OFXMLElement *elem[4];
TEST(@"+[elementWithName:]",
(elem[0] = [OFXMLElement elementWithName: @"foo"]) &&
- [[elem[0] string] isEqual: @""])
+ [[elem[0] stringValue] isEqual: @""])
TEST(@"+[elementWithName:stringValue:]",
(elem[1] = [OFXMLElement elementWithName: @"foo"
stringValue: @"b&ar"]) &&
- [[elem[1] string] isEqual: @"b&ar"])
+ [[elem[1] stringValue] isEqual: @"b&ar"])
TEST(@"+[elementWithName:namespace:]",
(elem[2] = [OFXMLElement elementWithName: @"foo"
namespace: @"urn:objfw:test"]) &&
R([elem[2] addAttributeWithName: @"test"
stringValue: @"test"]) &&
R([elem[2] setPrefix: @"objfw-test"
forNamespace: @"urn:objfw:test"]) &&
- [[elem[2] string] isEqual: @""])
+ [[elem[2] stringValue] isEqual: @""])
TEST(@"+[elementWithName:namespace:stringValue:]",
(elem[3] = [OFXMLElement elementWithName: @"foo"
namespace: @"urn:objfw:test"
stringValue: @"x"]) &&
R([elem[3] setPrefix: @"objfw-test"
forNamespace: @"urn:objfw:test"]) &&
- [[elem[3] string] isEqual: @"x"])
+ [[elem[3] stringValue] isEqual:
+ @"x"])
TEST(@"+[elementWithCharacters:]",
(elem[3] = [OFXMLElement elementWithCharacters: @""]) &&
- [[elem[3] string] isEqual: @"<foo>"])
+ [[elem[3] stringValue] isEqual: @"<foo>"])
TEST(@"+[elementWithCDATA:]",
(elem[3] = [OFXMLElement elementWithCDATA: @""]) &&
- [[elem[3] string] isEqual: @"]]>"]);
+ [[elem[3] stringValue] isEqual: @"]]>"]);
TEST(@"+[elementWithComment:]",
(elem[3] = [OFXMLElement elementWithComment: @" comment "]) &&
- [[elem[3] string] isEqual: @""])
+ [[elem[3] stringValue] isEqual: @""])
TEST(@"-[addAttributeWithName:stringValue:]",
R([elem[0] addAttributeWithName: @"foo"
stringValue: @"b&ar"]) &&
- [[elem[0] string] isEqual: @""] &&
+ [[elem[0] stringValue] isEqual: @""] &&
R([elem[1] addAttributeWithName: @"foo"
stringValue: @"b&ar"]) &&
- [[elem[1] string] isEqual: @"b&ar"])
+ [[elem[1] stringValue] isEqual:
+ @"b&ar"])
TEST(@"-[setPrefix:forNamespace:]",
R([elem[1] setPrefix: @"objfw-test"
forNamespace: @"urn:objfw:test"]))
TEST(@"-[addAttributeWithName:namespace:stringValue:]",
R([elem[1] addAttributeWithName: @"foo"
namespace: @"urn:objfw:test"
stringValue: @"bar"]) &&
- [[elem[1] string] isEqual:
+ [[elem[1] stringValue] isEqual:
@"b&ar"])
TEST(@"-[addChild:]",
R([elem[0] addChild: [OFXMLElement elementWithName: @"bar"]]) &&
- [[elem[0] string] isEqual: @""] &&
- R([elem[2] addChild:
- [OFXMLElement elementWithName: @"bar"
- namespace: @"urn:objfw:test"]]) &&
- [[elem[2] string] isEqual:
+ [[elem[0] stringValue] isEqual:
+ @""] &&
+ R([elem[2] addChild: [OFXMLElement elementWithName: @"bar"
+ namespace: @"urn:objfw:test"]]) &&
+ [[elem[2] stringValue] isEqual:
@""])
[pool drain];
}
@end