mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-15 11:13:50 +00:00
Implement CPURL isEqualToURL:.
This commit is contained in:
1 parent
bd28d688aa
commit
251ba407be
2 files changed
+21
-2
No files matched your search
+10
-2
@@ -179,9 +179,17 @@ CPURLCustomIconKey = @"CPURLCustomIconKey";
|
||||
if (!anObject || ![anObject isKindOfClass:[CPURL class]])
|
||||
return NO;
|
||||
|
||||
return [self isEqualToURL:anObject];
|
||||
}
|
||||
|
||||
- (BOOL)isEqualToURL:(id)aURL
|
||||
{
|
||||
if (self === aURL)
|
||||
return YES;
|
||||
|
||||
// Is checking if baseURL isEqual correct? Does "identical" mean same object or equivalent values?
|
||||
return [self relativeString] === [anObject relativeString] &&
|
||||
([self baseURL] === [anObject baseURL] || [[self baseURL] isEqual:[anObject baseURL]]);
|
||||
return [self relativeString] === [aURL relativeString] &&
|
||||
([self baseURL] === [aURL baseURL] || [[self baseURL] isEqual:[aURL baseURL]]);
|
||||
}
|
||||
|
||||
- (CPString)lastPathComponent
|
||||
|
||||
@@ -120,4 +120,15 @@ var exampleProtocol = "http",
|
||||
[self assert:url notEqual:[CPNull null]];
|
||||
}
|
||||
|
||||
- (void)testIsEqualToURL
|
||||
{
|
||||
var url = [CPURL URLWithString:@"http://www.cappuccino.org"],
|
||||
url2 = [CPURL URLWithString:@"http://www.cappuccino.org"],
|
||||
url3 = [CPURL URLWithString:@"http://www.cappuccino.org/index.html"];
|
||||
|
||||
[self assertTrue:[url isEqualToURL:url]];
|
||||
[self assertTrue:[url isEqualToURL:url2]];
|
||||
[self assertFalse:[url isEqualToURL:url3]];
|
||||
}
|
||||
|
||||
@end
|
||||
Reference in new issue
Block a user