@@ -364,13 +364,24 @@
 	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
 	    @"#5", OFInvalidEncodingException, [@"&#g;" stringByXMLUnescaping])
 	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
 	    @"#6", OFInvalidEncodingException, [@"&#xg;" stringByXMLUnescaping])
 
-	TEST(@"-[stringByXMLUnescapingWithHandler:]",
+	TEST(@"-[stringByXMLUnescapingWithDelegate:]",
 	    (h = [[[EntityHandler alloc] init] autorelease]) &&
 	    [[@"x&foo;y" stringByXMLUnescapingWithDelegate: h]
 	    isEqual: @"xbary"])
+
+#ifdef OF_HAVE_BLOCKS
+	TEST(@"-[stringByXMLUnescapingWithBlock:]",
+	    [[@"x&foo;y" stringByXMLUnescapingWithBlock:
+	        ^ OFString* (OFString *str, OFString *entity) {
+		    if ([entity isEqual: @"foo"])
+			    return @"bar";
+
+		    return nil;
+	    }] isEqual: @"xbary"])
+#endif
 
 	[pool drain];
 }
 @end