@@ -15,10 +15,11 @@
  */
 
 #include "config.h"
 
 #import "OFURL.h"
+#import "OFArray.h"
 #ifdef OF_HAVE_FILES
 # import "OFFileManager.h"
 #endif
 #import "OFNumber.h"
 #import "OFString.h"
@@ -79,10 +80,24 @@
 	TEST(@"-[host]", [[u1 host] isEqual: @"ho%3Ast"] && [u4 port] == 0)
 	TEST(@"-[port]", [[u1 port] isEqual: [OFNumber numberWithUInt16: 1234]])
 	TEST(@"-[path]",
 	    [[u1 path] isEqual: @"/pa%3Bth"] &&
 	    [[u4 path] isEqual: @"/etc/passwd"])
+	TEST(@"-[pathComponents]",
+	    [[u1 pathComponents] isEqual:
+	    [OFArray arrayWithObjects: @"", @"pa%3Bth", nil]] &&
+	    [[u4 pathComponents] isEqual:
+	    [OFArray arrayWithObjects: @"", @"etc", @"passwd", nil]])
+	TEST(@"-[lastPathComponent",
+	    [[[OFURL URLWithString: @"http://host/foo//bar/baz"]
+	    lastPathComponent] isEqual: @"baz"] &&
+	    [[[OFURL URLWithString: @"http://host/foo//bar/baz/"]
+	    lastPathComponent] isEqual: @"baz"] &&
+	    [[[OFURL URLWithString: @"http://host/foo/"]
+	    lastPathComponent] isEqual: @"foo"] &&
+	    [[[OFURL URLWithString: @"http://host/"]
+	    lastPathComponent] isEqual: @""])
 	TEST(@"-[parameters]",
 	    [[u1 parameters] isEqual: @"pa%3Fram"] && [u4 parameters] == nil)
 	TEST(@"-[query]",
 	    [[u1 query] isEqual: @"que%23ry"] && [u4 query] == nil)
 	TEST(@"-[fragment]",