@@ -9,11 +9,10 @@
  * the packaging of this file.
  */
 
 #include "config.h"
 
-#include <string.h>
 #include <assert.h>
 
 #import "OFXMLElement.h"
 #import "OFXMLParser.h"
 #import "OFXMLElementBuilder.h"
@@ -35,22 +34,20 @@
 - (void)XMLElementBuilderTests
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFXMLParser *p = [OFXMLParser parser];
 	OFXMLElementBuilder *builder = [OFXMLElementBuilder elementBuilder];
-	const char *str = "<foo>bar<![CDATA[f<oo]]>baz<qux/>"
+	OFString *str = @"<foo>bar<![CDATA[f<oo]]>baz<qux/>"
 	    " <qux xmlns:qux='urn:qux'><qux:bar/><x qux:y='z'/></qux>"
 	    "</foo>";
 
 	[p setDelegate: builder];
 	[builder setDelegate: self];
 
 	TEST(@"Building element from parsed XML",
-	    R([p parseBuffer: str
-		    withSize: strlen(str)]) &&
-    	    elem != nil && !strcmp([[elem string] cString], str))
-
+	    R([p parseString: str]) &&
+	    elem != nil && [[elem stringValue] isEqual: str])
 
 	[elem release];
 	[pool drain];
 }
 @end