@@ -46,37 +46,44 @@
 	i++;
 	msg = [OFString stringWithFormat: @"Parsing part #%d", i];
 
 	switch (i) {
 	case 1:
-		TEST(msg, et == STRING && [string isEqual: @"foo"])
+		TEST(msg, et == TAG_START && [name isEqual: @"root"] &&
+		    prefix == nil && ns == nil && [attrs count] == 0)
 		break;
 	case 2:
+		TEST(msg, et == STRING && [string isEqual: @"\n "])
+		break;
+	case 3:
+		TEST(msg, et == STRING && [string isEqual: @"f<oo"])
+		break;
+	case 4:
 		TEST(msg, et == TAG_START && [name isEqual: @"bar"] &&
 		    prefix == nil && ns == nil && attrs == nil)
 		break;
-	case 3:
+	case 5:
 		TEST(msg, et == TAG_END && [name isEqual: @"bar"] &&
 		    prefix == nil && ns == nil && attrs == nil)
 		break;
-	case 4:
-		TEST(msg, et == STRING && [string isEqual: @"\n"])
+	case 6:
+		TEST(msg, et == STRING && [string isEqual: @"\n "])
 		break;
-	case 5:
+	case 7:
 		TEST(msg, et == TAG_START && [name isEqual: @"foobar"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"] &&
 		    [attrs count] == 1 &&
 		    /* xmlns attr */
 		    [[[attrs objectAtIndex: 0] name] isEqual: @"xmlns"] &&
 		    [[attrs objectAtIndex: 0] namespace] == nil &&
 		    [[[attrs objectAtIndex: 0] stringValue] isEqual:
 		    @"urn:objfw:test:foobar"])
 		break;
-	case 6:
-		TEST(msg, et == STRING && [string isEqual: @"\n "])
+	case 8:
+		TEST(msg, et == STRING && [string isEqual: @"\n  "])
 		break;
-	case 7:
+	case 9:
 		TEST(msg, et == TAG_START && [name isEqual: @"qux"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"] &&
 		    [attrs count] == 1 &&
 		    /* xmlns:foo attr */
 		    [[[attrs objectAtIndex: 0] name] isEqual: @"foo"] &&
@@ -83,14 +90,14 @@
 		    [[[attrs objectAtIndex: 0] namespace] isEqual:
 		    @"http://www.w3.org/2000/xmlns/"] &&
 		    [[[attrs objectAtIndex: 0] stringValue] isEqual:
 		    @"urn:objfw:test:foo"])
 		break;
-	case 8:
-		TEST(msg, et == STRING && [string isEqual: @"\n  "])
+	case 10:
+		TEST(msg, et == STRING && [string isEqual: @"\n   "])
 		break;
-	case 9:
+	case 11:
 		TEST(msg, et == TAG_START && [name isEqual: @"bla"] &&
 		    [prefix isEqual: @"foo"] &&
 		    [ns isEqual: @"urn:objfw:test:foo"] &&
 		    [attrs count] == 2 &&
 		    /* foo:bla attr */
@@ -102,14 +109,14 @@
 		    [[[attrs objectAtIndex: 1] name] isEqual: @"blafoo"] &&
 		    [[[attrs objectAtIndex: 1] namespace] isEqual:
 		    @"urn:objfw:test:foo"] &&
 		    [[[attrs objectAtIndex: 1] stringValue] isEqual: @"foo"])
 		break;
-	case 10:
-		TEST(msg, et == STRING && [string isEqual: @"\n   "])
+	case 12:
+		TEST(msg, et == STRING && [string isEqual: @"\n    "])
 		break;
-	case 11:
+	case 13:
 		TEST(msg, et == TAG_START && [name isEqual: @"blup"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"] &&
 		    [attrs count] == 2 &&
 		    /* foo:qux attr */
 		    [[[attrs objectAtIndex: 0] name] isEqual: @"qux"] &&
@@ -120,18 +127,18 @@
 		    [[[attrs objectAtIndex: 1] name] isEqual: @"quxqux"] &&
 		    [[[attrs objectAtIndex: 1] namespace] isEqual:
 		    @"urn:objfw:test:foobar"] &&
 		    [[[attrs objectAtIndex: 1] stringValue] isEqual: @"test"])
 		break;
-	case 12:
+	case 14:
 		TEST(msg, et == TAG_END && [name isEqual: @"blup"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"])
 		break;
-	case 13:
-		TEST(msg, et == STRING && [string isEqual: @"\n   "])
+	case 15:
+		TEST(msg, et == STRING && [string isEqual: @"\n    "])
 		break;
-	case 14:
+	case 16:
 		TEST(msg, et == TAG_START && [name isEqual: @"bla"] &&
 		    [prefix isEqual: @"bla"] &&
 		    [ns isEqual: @"urn:objfw:test:bla"] && [attrs count] == 3 &&
 		    /* xmlns:bla attr */
 		    [[[attrs objectAtIndex: 0] name] isEqual: @"bla"] &&
@@ -148,19 +155,19 @@
 		    [[[attrs objectAtIndex: 2] name] isEqual: @"foo"] &&
 		    [[[attrs objectAtIndex: 2] namespace] isEqual:
 		    @"urn:objfw:test:bla"] &&
 		    [[[attrs objectAtIndex: 2] stringValue] isEqual: @"blafoo"])
 		break;
-	case 15:
+	case 17:
 		TEST(msg, et == TAG_END && [name isEqual: @"bla"] &&
 		    [prefix isEqual: @"bla"] &&
 		    [ns isEqual: @"urn:objfw:test:bla"])
 		break;
-	case 16:
-		TEST(msg, et == STRING && [string isEqual: @"\n   "])
+	case 18:
+		TEST(msg, et == STRING && [string isEqual: @"\n    "])
 		break;
-	case 17:
+	case 19:
 		TEST(msg, et == TAG_START && [name isEqual: @"abc"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:abc"] &&
 		    [attrs count] == 3 &&
 		    /* xmlns attr */
 		    [[[attrs objectAtIndex: 0] name] isEqual: @"xmlns"] &&
@@ -176,42 +183,49 @@
 		    [[[attrs objectAtIndex: 2] name] isEqual: @"abc"] &&
 		    [[[attrs objectAtIndex: 2] namespace] isEqual:
 		    @"urn:objfw:test:foo"] &&
 		    [[[attrs objectAtIndex: 2] stringValue] isEqual: @"abc"])
 		break;
-	case 18:
+	case 20:
 		TEST(msg, et == TAG_END && [name isEqual: @"abc"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:abc"])
 		break;
-	case 19:
-		TEST(msg, et == STRING && [string isEqual: @"\n  "])
+	case 21:
+		TEST(msg, et == STRING && [string isEqual: @"\n   "])
 		break;
-	case 20:
+	case 22:
 		TEST(msg, et == TAG_END && [name isEqual: @"bla"] &&
 		    [prefix isEqual: @"foo"] &&
 		    [ns isEqual: @"urn:objfw:test:foo"])
 		break;
-	case 21:
+	case 23:
+		TEST(msg, et == STRING && [string isEqual: @"\n   "])
+		break;
+	case 24:
+		TEST(msg, et == COMMENT && [comment isEqual: @" commänt "])
+		break;
+	case 25:
 		TEST(msg, et == STRING && [string isEqual: @"\n  "])
 		break;
-	case 22:
-		TEST(msg, et == COMMENT && [comment isEqual: @"commänt"])
-		break;
-	case 23:
-		TEST(msg, et == STRING && [string isEqual: @"\n "])
-		break;
-	case 24:
+	case 26:
 		TEST(msg, et == TAG_END && [name isEqual: @"qux"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"])
 		break;
-	case 25:
-		TEST(msg, et == STRING && [string isEqual: @"\n"])
+	case 27:
+		TEST(msg, et == STRING && [string isEqual: @"\n "])
 		break;
-	case 26:
+	case 28:
 		TEST(msg, et == TAG_END && [name isEqual: @"foobar"] &&
 		    prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"])
 		break;
+	case 29:
+		TEST(msg, et == STRING && [string isEqual: @"\n"])
+		break;
+	case 30:
+		TEST(msg, et == TAG_END && [name isEqual: @"root"] &&
+		    prefix == nil && ns == nil);
+		break;
 	}
 }
 
 -     (void)xmlParser: (OFXMLParser*)parser
   didStartTagWithName: (OFString*)name
@@ -241,11 +255,11 @@
 				      string: nil
 				     comment: nil];
 }
 
 - (void)xmlParser: (OFXMLParser*)parser
-      foundString: (OFString*)string
+    didFindString: (OFString*)string
 {
 	[self xmlParserCallbackWithEventType: STRING
 					name: nil
 				      prefix: nil
 				   namespace: nil
@@ -253,11 +267,11 @@
 				      string: string
 				     comment: nil];
 }
 
 - (void)xmlParser: (OFXMLParser*)parser
-     foundComment: (OFString*)comment
+   didFindComment: (OFString*)comment
 {
 	[self xmlParserCallbackWithEventType: COMMENT
 					name: nil
 				      prefix: nil
 				   namespace: nil
@@ -264,12 +278,12 @@
 				  attributes: nil
 				      string: nil
 				     comment: comment];
 }
 
--    (OFString*)xmlParser: (OFXMLParser*)parser
-  foundUnknownEntityNamed: (OFString*)entity
+-      (OFString*)xmlParser: (OFXMLParser*)parser
+  didFindUnknownEntityNamed: (OFString*)entity
 {
 	if ([entity isEqual: @"foo"])
 		return @"foobar";
 
 	return nil;
@@ -277,22 +291,24 @@
 
 - (void)XMLParserTests
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFXMLParser *parser;
-	const char *str = "foo<bar/>\n"
-	    "<foobar xmlns='urn:objfw:test:foobar'>\n"
-	    " <qux xmlns:foo='urn:objfw:test:foo'>\n"
-	    "  <foo:bla foo:bla='&#x62;&#x6c;&#x61;' blafoo='foo'>\n"
-	    "   <blup foo:qux='asd' quxqux='test'/>\n"
-	    "   <bla:bla\r\rxmlns:bla=\"urn:objfw:test:bla\" qux='qux'\r\n"
-	    "    bla:foo='blafoo'/>\n"
-	    "   <abc xmlns='urn:objfw:test:abc' abc='abc' foo:abc='abc'/>\n"
-	    "  </foo:bla>\n"
-	    "  <!-- commänt -->\n"
-	    " </qux>\n"
-	    "</foobar>";
+	const char *str = "<root>\n"
+	    " <![CDATA[f<oo]]><bar/>\n"
+	    " <foobar xmlns='urn:objfw:test:foobar'>\n"
+	    "  <qux xmlns:foo='urn:objfw:test:foo'>\n"
+	    "   <foo:bla foo:bla='&#x62;&#x6c;&#x61;' blafoo='foo'>\n"
+	    "    <blup foo:qux='asd' quxqux='test'/>\n"
+	    "    <bla:bla\r\rxmlns:bla=\"urn:objfw:test:bla\" qux='qux'\r\n"
+	    "     bla:foo='blafoo'/>\n"
+	    "    <abc xmlns='urn:objfw:test:abc' abc='abc' foo:abc='abc'/>\n"
+	    "   </foo:bla>\n"
+	    "   <!-- commänt -->\n"
+	    "  </qux>\n"
+	    " </foobar>\n"
+	    "</root>";
 	size_t j, len;
 
 	TEST(@"+[xmlParser]", (parser = [OFXMLParser xmlParser]))
 
 	TEST(@"-[setDelegate:]", R([parser setDelegate: self]))
@@ -307,10 +323,10 @@
 		else
 			[parser parseBuffer: str + j
 				   withSize: 2];
 	}
 
-	TEST(@"Checking if everything was parsed", i == 26)
+	TEST(@"Checking if everything was parsed", i == 30)
 
 	[pool drain];
 }
 @end