Permalink
Browse files

Made the html references follow the same convention as apples. Would …

…still be nice if more were added.
  • Loading branch information...
1 parent e691099 commit e700063734c8f04cf1b2916b0a46dfc1b87cefcd @beelsebob committed Dec 26, 2012
View
2 Application/GBApplicationSettingsProvider.m
@@ -373,7 +373,7 @@ - (NSString *)htmlReferenceForMember:(GBModelBase *)member prefixedWith:(NSStrin
NSParameterAssert(prefix != nil);
if ([member isKindOfClass:[GBMethodData class]]) {
GBMethodData *method = (GBMethodData *)member;
- return [NSString stringWithFormat:@"%@//api/name/%@", prefix, method.methodSelector];
+ return [NSString stringWithFormat:@"%@//apple_ref/occ/%@/%@/%@", prefix, [method methodTypeString], [method parentObject], method.methodSelector];
}
return @"";
}
View
4 Model/GBMethodData.h
@@ -119,6 +119,10 @@ typedef NSUInteger GBMethodType;
*/
@property (retain) GBMethodSectionData *methodSection;
+/** A string representing the type of the method
+ */
+@property (readonly) NSString *methodTypeString;
+
///---------------------------------------------------------------------------------------
/// @name Helper properties
///---------------------------------------------------------------------------------------
View
17 Model/GBMethodData.m
@@ -10,6 +10,8 @@
#import "GBMethodArgument.h"
#import "GBMethodSectionData.h"
#import "GBMethodData.h"
+#import "GBClassData.h"
+#import "GBProtocolData.h"
#import "RegexKitLite.h"
@interface GBMethodData ()
@@ -365,6 +367,21 @@ - (NSString *)description {
#pragma mark Properties
+- (NSString *)methodTypeString {
+ BOOL isInterfaceParent = (![self.parentObject isKindOfClass:[GBClassData class]] &&
+ ![self.parentObject isKindOfClass:[GBProtocolData class]]);
+ switch (self.methodType)
+ {
+ case GBMethodTypeClass:
+ return isInterfaceParent ? @"intfcm" : @"clm";
+ case GBMethodTypeInstance:
+ return isInterfaceParent ? @"intfm" : @"instm";
+ case GBMethodTypeProperty:
+ return isInterfaceParent ? @"intfp" : @"instp";
+ }
+ return @"";
+}
+
- (BOOL)isInstanceMethod {
return (self.methodType == GBMethodTypeInstance);
}
View
22 Testing/GBApplicationSettingsProviderTesting.m
@@ -178,9 +178,9 @@ - (void)testHtmlReferenceNameForObject_shouldReturnProperValueForMethods {
[class.methods registerMethod:method2];
[class.methods registerMethod:property];
// execute & verify
- assertThat([settings htmlReferenceNameForObject:method1], is(@"//api/name/method"));
- assertThat([settings htmlReferenceNameForObject:method2], is(@"//api/name/doSomething:withVars:"));
- assertThat([settings htmlReferenceNameForObject:property], is(@"//api/name/value"));
+ assertThat([settings htmlReferenceNameForObject:method1], is(@"//apple_ref/occ/instm/Class/method"));
+ assertThat([settings htmlReferenceNameForObject:method2], is(@"//apple_ref/occ/instm/Class/doSomething:withVars:"));
+ assertThat([settings htmlReferenceNameForObject:property], is(@"//apple_ref/occ/instp/Class/value"));
}
#pragma mark HTML href references handling - index
@@ -194,7 +194,7 @@ - (void)testHtmlReferenceForObjectFromSource_shouldReturnProperValueForClassFrom
[class.methods registerMethod:method];
// execute & verify
assertThat([settings htmlReferenceForObject:class fromSource:nil], is(@"Classes/Class.html"));
- assertThat([settings htmlReferenceForObject:method fromSource:nil], is(@"Classes/Class.html#//api/name/method:"));
+ assertThat([settings htmlReferenceForObject:method fromSource:nil], is(@"Classes/Class.html#//apple_ref/occ/instm/Class/method:"));
}
- (void)testHtmlReferenceForObjectFromSource_shouldReturnProperValueForCategoryFromIndex {
@@ -206,7 +206,7 @@ - (void)testHtmlReferenceForObjectFromSource_shouldReturnProperValueForCategoryF
[category.methods registerMethod:method];
// execute & verify
assertThat([settings htmlReferenceForObject:category fromSource:nil], is(@"Categories/Class+Category.html"));
- assertThat([settings htmlReferenceForObject:method fromSource:nil], is(@"Categories/Class+Category.html#//api/name/method:"));
+ assertThat([settings htmlReferenceForObject:method fromSource:nil], is(@"Categories/Class+Category.html#//apple_ref/occ/intfm/Class(Category)/method:"));
}
- (void)testHtmlReferenceForObjectFromSource_shouldReturnProperValueForProtocolFromIndex {
@@ -218,7 +218,7 @@ - (void)testHtmlReferenceForObjectFromSource_shouldReturnProperValueForProtocolF
[protocol.methods registerMethod:method];
// execute & verify
assertThat([settings htmlReferenceForObject:protocol fromSource:nil], is(@"Protocols/Protocol.html"));
- assertThat([settings htmlReferenceForObject:method fromSource:nil], is(@"Protocols/Protocol.html#//api/name/method:"));
+ assertThat([settings htmlReferenceForObject:method fromSource:nil], is(@"Protocols/Protocol.html#//apple_ref/occ/instm/Protocol/method:"));
}
- (void)testHtmlReferenceForObjectFromSource_shouldReturnProperValueForDocumentFromIndex {
@@ -352,7 +352,7 @@ - (void)testHtmlReferenceForObjectFromSource_shouldReturnProperValueForTopLevelO
GBMethodData *method = [GBTestObjectsRegistry propertyMethodWithArgument:@"value"];
[class.methods registerMethod:method];
// execute & verify
- assertThat([settings htmlReferenceForObject:method fromSource:class], is(@"#//api/name/value"));
+ assertThat([settings htmlReferenceForObject:method fromSource:class], is(@"#//apple_ref/occ/instp/Class/value"));
assertThat([settings htmlReferenceForObject:class fromSource:method], is(@"Class.html"));
}
@@ -365,8 +365,8 @@ - (void)testHtmlReferenceForObjectFromSource_shouldReturnProperValueForTopLevelO
GBMethodData *method = [GBTestObjectsRegistry propertyMethodWithArgument:@"value"];
[class1.methods registerMethod:method];
// execute & verify
- assertThat([settings htmlReferenceForObject:method fromSource:class2], is(@"../Classes/Class1.html#//api/name/value"));
- assertThat([settings htmlReferenceForObject:method fromSource:class1], is(@"#//api/name/value"));
+ assertThat([settings htmlReferenceForObject:method fromSource:class2], is(@"../Classes/Class1.html#//apple_ref/occ/instp/Class1/value"));
+ assertThat([settings htmlReferenceForObject:method fromSource:class1], is(@"#//apple_ref/occ/instp/Class1/value"));
assertThat([settings htmlReferenceForObject:class1 fromSource:method], is(@"Class1.html"));
assertThat([settings htmlReferenceForObject:class2 fromSource:method], is(@"../Classes/Class2.html"));
}
@@ -382,8 +382,8 @@ - (void)testHtmlReferenceForObjectFromSource_shouldReturnProperValueForTopLevelO
[class.methods registerMethod:method1];
[protocol.methods registerMethod:method2];
// execute & verify
- assertThat([settings htmlReferenceForObject:method1 fromSource:protocol], is(@"../Classes/Class.html#//api/name/value1"));
- assertThat([settings htmlReferenceForObject:method2 fromSource:class], is(@"../Protocols/Protocol.html#//api/name/value2"));
+ assertThat([settings htmlReferenceForObject:method1 fromSource:protocol], is(@"../Classes/Class.html#//apple_ref/occ/instp/Class/value1"));
+ assertThat([settings htmlReferenceForObject:method2 fromSource:class], is(@"../Protocols/Protocol.html#//apple_ref/occ/instp/Protocol/value2"));
}
#pragma mark Template files handling
View
26 Testing/GBCommentsProcessor-MarkdownTesting.m
@@ -95,9 +95,9 @@ - (void)testProcessCommentWithContextStore_markdown_shouldKeepInlineLocalMemberC
[processor processComment:comment2 withContext:context store:store];
[processor processComment:comment3 withContext:context store:store];
// verify
- [self assertComment:comment1 matchesLongDescMarkdown:@"[instanceMethod:](#//api/name/instanceMethod:)", nil];
- [self assertComment:comment2 matchesLongDescMarkdown:@"[classMethod:](#//api/name/classMethod:)", nil];
- [self assertComment:comment3 matchesLongDescMarkdown:@"[value](#//api/name/value)", nil];
+ [self assertComment:comment1 matchesLongDescMarkdown:@"[instanceMethod:](#//apple_ref/occ/instm/Class/instanceMethod:)", nil];
+ [self assertComment:comment2 matchesLongDescMarkdown:@"[classMethod:](#//apple_ref/occ/clm/Class/classMethod:)", nil];
+ [self assertComment:comment3 matchesLongDescMarkdown:@"[value](#//apple_ref/occ/instp/Class/value)", nil];
}
- (void)testProcessCommentWithContextStore_markdown_shouldKeepInlineRemoteMemberCrossRefsTexts {
@@ -112,9 +112,9 @@ - (void)testProcessCommentWithContextStore_markdown_shouldKeepInlineRemoteMember
[processor processComment:comment2 withContext:nil store:store];
[processor processComment:comment3 withContext:nil store:store];
// verify
- [self assertComment:comment1 matchesLongDescMarkdown:@"[[Class instanceMethod:]](Classes/Class.html#//api/name/instanceMethod:)", nil];
- [self assertComment:comment2 matchesLongDescMarkdown:@"[[Class classMethod:]](Classes/Class.html#//api/name/classMethod:)", nil];
- [self assertComment:comment3 matchesLongDescMarkdown:@"[[Class value]](Classes/Class.html#//api/name/value)", nil];
+ [self assertComment:comment1 matchesLongDescMarkdown:@"[[Class instanceMethod:]](Classes/Class.html#//apple_ref/occ/instm/Class/instanceMethod:)", nil];
+ [self assertComment:comment2 matchesLongDescMarkdown:@"[[Class classMethod:]](Classes/Class.html#//apple_ref/occ/clm/Class/classMethod:)", nil];
+ [self assertComment:comment3 matchesLongDescMarkdown:@"[[Class value]](Classes/Class.html#//apple_ref/occ/instp/Class/value)", nil];
}
- (void)testProcessCommentWithContextStore_markdown_shouldProperlyFormatInlineLinksWithinStandardMarkdownFormattingMarkers {
@@ -216,9 +216,9 @@ - (void)testProcessCommentWithContextStore_markdown_shouldUsePrefixForRelatedIte
[processor processComment:comment2 withContext:context store:store];
[processor processComment:comment3 withContext:context store:store];
// verify
- [self assertComponents:comment1.relatedItems matchMarkdown:@"[- instanceMethod:](#//api/name/instanceMethod:)", nil];
- [self assertComponents:comment2.relatedItems matchMarkdown:@"[+ classMethod:](#//api/name/classMethod:)", nil];
- [self assertComponents:comment3.relatedItems matchMarkdown:@"[@property value](#//api/name/value)", nil];
+ [self assertComponents:comment1.relatedItems matchMarkdown:@"[- instanceMethod:](#//apple_ref/occ/instm/Class/instanceMethod:)", nil];
+ [self assertComponents:comment2.relatedItems matchMarkdown:@"[+ classMethod:](#//apple_ref/occ/clm/Class/classMethod:)", nil];
+ [self assertComponents:comment3.relatedItems matchMarkdown:@"[@property value](#//apple_ref/occ/instp/Class/value)", nil];
}
- (void)testProcessCommentWithContextStore_markdown_shouldKeepRelatedItemsRemoteMemberCrossRefsTexts {
@@ -233,9 +233,9 @@ - (void)testProcessCommentWithContextStore_markdown_shouldKeepRelatedItemsRemote
[processor processComment:comment2 withContext:nil store:store];
[processor processComment:comment3 withContext:nil store:store];
// verify
- [self assertComponents:comment1.relatedItems matchMarkdown:@"[[Class instanceMethod:]](Classes/Class.html#//api/name/instanceMethod:)", nil];
- [self assertComponents:comment2.relatedItems matchMarkdown:@"[[Class classMethod:]](Classes/Class.html#//api/name/classMethod:)", nil];
- [self assertComponents:comment3.relatedItems matchMarkdown:@"[[Class value]](Classes/Class.html#//api/name/value)", nil];
+ [self assertComponents:comment1.relatedItems matchMarkdown:@"[[Class instanceMethod:]](Classes/Class.html#//apple_ref/occ/instm/Class/instanceMethod:)", nil];
+ [self assertComponents:comment2.relatedItems matchMarkdown:@"[[Class classMethod:]](Classes/Class.html#//apple_ref/occ/clm/Class/classMethod:)", nil];
+ [self assertComponents:comment3.relatedItems matchMarkdown:@"[[Class value]](Classes/Class.html#//apple_ref/occ/instp/Class/value)", nil];
}
#pragma mark Making sure reasonably complex stuff gets handled properly
@@ -274,7 +274,7 @@ - (void)testStringByConvertingCrossReferencesInString_copied_shouldUseUniversalR
// execute
[processor processComment:comment withContext:class store:store];
// verify
- [self assertComment:comment matchesLongDescMarkdown:@"[instanceMethod:](../Classes/Class.html#//api/name/instanceMethod:)", nil];
+ [self assertComment:comment matchesLongDescMarkdown:@"[instanceMethod:](../Classes/Class.html#//apple_ref/occ/instm/Class/instanceMethod:)", nil];
}
- (void)testStringByConvertingCrossReferencesInString_copied_shouldIgnoreCommentIfOriginalContextDoesntMatch {
View
88 Testing/GBCommentsProcessor-PreprocessingTesting.m
@@ -184,10 +184,10 @@ - (void)testStringByConvertingCrossReferencesInString_shouldConvertClassLocalIns
NSString *result5 = [processor stringByConvertingCrossReferencesInString:@"another:" withFlags:0];
NSString *result6 = [processor stringByConvertingCrossReferencesInString:@"<another:>" withFlags:0];
// verify
- assertThat(result1, is(@"[method:](#//api/name/method:)"));
- assertThat(result2, is(@"[method:](#//api/name/method:)"));
- assertThat(result3, is(@"[method:](#//api/name/method:)"));
- assertThat(result4, is(@"[method:](#//api/name/method:)"));
+ assertThat(result1, is(@"[method:](#//apple_ref/occ/instm/Class/method:)"));
+ assertThat(result2, is(@"[method:](#//apple_ref/occ/instm/Class/method:)"));
+ assertThat(result3, is(@"[method:](#//apple_ref/occ/instm/Class/method:)"));
+ assertThat(result4, is(@"[method:](#//apple_ref/occ/instm/Class/method:)"));
assertThat(result5, is(@"another:"));
assertThat(result6, is(@"<another:>"));
}
@@ -205,10 +205,10 @@ - (void)testStringByConvertingCrossReferencesInString_shouldConvertClassLocalCla
NSString *result5 = [processor stringByConvertingCrossReferencesInString:@"another:" withFlags:0];
NSString *result6 = [processor stringByConvertingCrossReferencesInString:@"<another:>" withFlags:0];
// verify
- assertThat(result1, is(@"[method:](#//api/name/method:)"));
- assertThat(result2, is(@"[method:](#//api/name/method:)"));
- assertThat(result3, is(@"[method:](#//api/name/method:)"));
- assertThat(result4, is(@"[method:](#//api/name/method:)"));
+ assertThat(result1, is(@"[method:](#//apple_ref/occ/clm/Class/method:)"));
+ assertThat(result2, is(@"[method:](#//apple_ref/occ/clm/Class/method:)"));
+ assertThat(result3, is(@"[method:](#//apple_ref/occ/clm/Class/method:)"));
+ assertThat(result4, is(@"[method:](#//apple_ref/occ/clm/Class/method:)"));
assertThat(result5, is(@"another:"));
assertThat(result6, is(@"<another:>"));
}
@@ -226,8 +226,8 @@ - (void)testStringByConvertingCrossReferencesInString_shouldConvertClassLocalPro
NSString *result5 = [processor stringByConvertingCrossReferencesInString:@"another" withFlags:0];
NSString *result6 = [processor stringByConvertingCrossReferencesInString:@"<another>" withFlags:0];
// verify
- assertThat(result1, is(@"[method](#//api/name/method)"));
- assertThat(result2, is(@"[method](#//api/name/method)"));
+ assertThat(result1, is(@"[method](#//apple_ref/occ/instp/Class/method)"));
+ assertThat(result2, is(@"[method](#//apple_ref/occ/instp/Class/method)"));
assertThat(result3, is(@"method:"));
assertThat(result4, is(@"<method:>"));
assertThat(result5, is(@"another"));
@@ -251,11 +251,11 @@ - (void)testStringByConvertingCrossReferencesInString_shouldConvertCategoryAndPr
NSString *result5 = [processor2 stringByConvertingCrossReferencesInString:@"<method2:>" withFlags:0];
NSString *result6 = [processor2 stringByConvertingCrossReferencesInString:@"method1:" withFlags:0];
// verify
- assertThat(result1, is(@"[method1:](#//api/name/method1:)"));
- assertThat(result2, is(@"[method1:](#//api/name/method1:)"));
+ assertThat(result1, is(@"[method1:](#//apple_ref/occ/intfm/Class(Category)/method1:)"));
+ assertThat(result2, is(@"[method1:](#//apple_ref/occ/intfm/Class(Category)/method1:)"));
assertThat(result3, is(@"method2:"));
- assertThat(result4, is(@"[method2:](#//api/name/method2:)"));
- assertThat(result5, is(@"[method2:](#//api/name/method2:)"));
+ assertThat(result4, is(@"[method2:](#//apple_ref/occ/instm/Protocol/method2:)"));
+ assertThat(result5, is(@"[method2:](#//apple_ref/occ/instm/Protocol/method2:)"));
assertThat(result6, is(@"method1:"));
}
@@ -276,11 +276,11 @@ - (void)testStringByConvertingCrossReferencesInString_shouldConvertCategoryAndPr
NSString *result5 = [processor2 stringByConvertingCrossReferencesInString:@"<method2:>" withFlags:0];
NSString *result6 = [processor2 stringByConvertingCrossReferencesInString:@"method1:" withFlags:0];
// verify
- assertThat(result1, is(@"[method1:](#//api/name/method1:)"));
- assertThat(result2, is(@"[method1:](#//api/name/method1:)"));
+ assertThat(result1, is(@"[method1:](#//apple_ref/occ/intfcm/Class(Category)/method1:)"));
+ assertThat(result2, is(@"[method1:](#//apple_ref/occ/intfcm/Class(Category)/method1:)"));
assertThat(result3, is(@"method2:"));
- assertThat(result4, is(@"[method2:](#//api/name/method2:)"));
- assertThat(result5, is(@"[method2:](#//api/name/method2:)"));
+ assertThat(result4, is(@"[method2:](#//apple_ref/occ/clm/Protocol/method2:)"));
+ assertThat(result5, is(@"[method2:](#//apple_ref/occ/clm/Protocol/method2:)"));
assertThat(result6, is(@"method1:"));
}
@@ -301,11 +301,11 @@ - (void)testStringByConvertingCrossReferencesInString_shouldConvertCategoryAndPr
NSString *result5 = [processor2 stringByConvertingCrossReferencesInString:@"<method2>" withFlags:0];
NSString *result6 = [processor2 stringByConvertingCrossReferencesInString:@"method1" withFlags:0];
// verify
- assertThat(result1, is(@"[method1](#//api/name/method1)"));
- assertThat(result2, is(@"[method1](#//api/name/method1)"));
+ assertThat(result1, is(@"[method1](#//apple_ref/occ/intfp/Class(Category)/method1)"));
+ assertThat(result2, is(@"[method1](#//apple_ref/occ/intfp/Class(Category)/method1)"));
assertThat(result3, is(@"method2"));
- assertThat(result4, is(@"[method2](#//api/name/method2)"));
- assertThat(result5, is(@"[method2](#//api/name/method2)"));
+ assertThat(result4, is(@"[method2](#//apple_ref/occ/instp/Protocol/method2)"));
+ assertThat(result5, is(@"[method2](#//apple_ref/occ/instp/Protocol/method2)"));
assertThat(result6, is(@"method1"));
}
@@ -325,10 +325,10 @@ - (void)testStringByConvertingCrossReferencesInString_shouldConvertClassRemoteIn
NSString *result5 = [processor stringByConvertingCrossReferencesInString:@"[Unknown method:]" withFlags:0];
NSString *result6 = [processor stringByConvertingCrossReferencesInString:@"method:" withFlags:0];
// verify
- assertThat(result1, is(@"[[Class1 method:]](../Classes/Class1.html#//api/name/method:)"));
- assertThat(result2, is(@"[[Class1 method:]](../Classes/Class1.html#//api/name/method:)"));
- assertThat(result3, is(@"[[Class1 method:]](../Classes/Class1.html#//api/name/method:)"));
- assertThat(result4, is(@"[[Class1 method:]](../Classes/Class1.html#//api/name/method:)"));
+ assertThat(result1, is(@"[[Class1 method:]](../Classes/Class1.html#//apple_ref/occ/instm/Class1/method:)"));
+ assertThat(result2, is(@"[[Class1 method:]](../Classes/Class1.html#//apple_ref/occ/instm/Class1/method:)"));
+ assertThat(result3, is(@"[[Class1 method:]](../Classes/Class1.html#//apple_ref/occ/instm/Class1/method:)"));
+ assertThat(result4, is(@"[[Class1 method:]](../Classes/Class1.html#//apple_ref/occ/instm/Class1/method:)"));
assertThat(result5, is(@"[Unknown method:]"));
assertThat(result6, is(@"method:"));
}
@@ -347,10 +347,10 @@ - (void)testStringByConvertingCrossReferencesInString_shouldConvertCategoryRemot
NSString *result5 = [processor stringByConvertingCrossReferencesInString:@"[Class(Unknown) method:]" withFlags:0];
NSString *result6 = [processor stringByConvertingCrossReferencesInString:@"[Unknown(Category) method:]" withFlags:0];
// verify
- assertThat(result1, is(@"[[Class(Category) method:]](../Categories/Class+Category.html#//api/name/method:)"));
- assertThat(result2, is(@"[[Class(Category) method:]](../Categories/Class+Category.html#//api/name/method:)"));
- assertThat(result3, is(@"[[Class(Category) method:]](../Categories/Class+Category.html#//api/name/method:)"));
- assertThat(result4, is(@"[[Class(Category) method:]](../Categories/Class+Category.html#//api/name/method:)"));
+ assertThat(result1, is(@"[[Class(Category) method:]](../Categories/Class+Category.html#//apple_ref/occ/intfm/Class(Category)/method:)"));
+ assertThat(result2, is(@"[[Class(Category) method:]](../Categories/Class+Category.html#//apple_ref/occ/intfm/Class(Category)/method:)"));
+ assertThat(result3, is(@"[[Class(Category) method:]](../Categories/Class+Category.html#//apple_ref/occ/intfm/Class(Category)/method:)"));
+ assertThat(result4, is(@"[[Class(Category) method:]](../Categories/Class+Category.html#//apple_ref/occ/intfm/Class(Category)/method:)"));
assertThat(result5, is(@"[Class(Unknown) method:]"));
assertThat(result6, is(@"[Unknown(Category) method:]"));
}
@@ -369,10 +369,10 @@ - (void)testStringByConvertingCrossReferencesInString_shouldConvertProtocolRemot
NSString *result5 = [processor stringByConvertingCrossReferencesInString:@"[Unknown method:]" withFlags:0];
NSString *result6 = [processor stringByConvertingCrossReferencesInString:@"method:" withFlags:0];
// verify
- assertThat(result1, is(@"[[Protocol method:]](../Protocols/Protocol.html#//api/name/method:)"));
- assertThat(result2, is(@"[[Protocol method:]](../Protocols/Protocol.html#//api/name/method:)"));
- assertThat(result3, is(@"[[Protocol method:]](../Protocols/Protocol.html#//api/name/method:)"));
- assertThat(result4, is(@"[[Protocol method:]](../Protocols/Protocol.html#//api/name/method:)"));
+ assertThat(result1, is(@"[[Protocol method:]](../Protocols/Protocol.html#//apple_ref/occ/instm/Protocol/method:)"));
+ assertThat(result2, is(@"[[Protocol method:]](../Protocols/Protocol.html#//apple_ref/occ/instm/Protocol/method:)"));
+ assertThat(result3, is(@"[[Protocol method:]](../Protocols/Protocol.html#//apple_ref/occ/instm/Protocol/method:)"));
+ assertThat(result4, is(@"[[Protocol method:]](../Protocols/Protocol.html#//apple_ref/occ/instm/Protocol/method:)"));
assertThat(result5, is(@"[Unknown method:]"));
assertThat(result6, is(@"method:"));
}
@@ -617,16 +617,16 @@ - (void)testStringByConvertingCrossReferencesInString_shouldKeepManualObjectMeth
NSString *result7 = [processor stringByConvertingCrossReferencesInString:@"[doSomething:withVars:]([Class doSomething:withVars:]), [text with space]([Class method])" withFlags:0];
NSString *result8 = [processor stringByConvertingCrossReferencesInString:@"[text](<-[Class value]>)" withFlags:0];
- assertThat(result1, is(@"[text](Classes/Class.html#//api/name/method)"));
- assertThat(result2, is(@"[text](Classes/Class.html#//api/name/doSomething:withVars:)"));
- assertThat(result3, is(@"[text](Classes/Class.html#//api/name/value)"));
- assertThat(result4, is(@"[text with space](Classes/Class.html#//api/name/method)"));
- assertThat(result4b, is(@"[text onlyOneSpace](Classes/Class.html#//api/name/method)"));
- assertThat(result4c, is(@"[text](Classes/Class.html#//api/name/method), [text onlyOneSpace](Classes/Class.html#//api/name/method)"));
- assertThat(result5, is(@"[doSomething:withVars:](Classes/Class.html#//api/name/doSomething:withVars:)"));
- assertThat(result6, is(@"[doSomething:withVars:](Classes/Class.html#//api/name/doSomething:withVars:), [text](Classes/Class.html#//api/name/method)"));
- assertThat(result7, is(@"[doSomething:withVars:](Classes/Class.html#//api/name/doSomething:withVars:), [text with space](Classes/Class.html#//api/name/method)"));
- assertThat(result8, is(@"[text](Classes/Class.html#//api/name/value)"));
+ assertThat(result1, is(@"[text](Classes/Class.html#//apple_ref/occ/instm/Class/method)"));
+ assertThat(result2, is(@"[text](Classes/Class.html#//apple_ref/occ/instm/Class/doSomething:withVars:)"));
+ assertThat(result3, is(@"[text](Classes/Class.html#//apple_ref/occ/instp/Class/value)"));
+ assertThat(result4, is(@"[text with space](Classes/Class.html#//apple_ref/occ/instm/Class/method)"));
+ assertThat(result4b, is(@"[text onlyOneSpace](Classes/Class.html#//apple_ref/occ/instm/Class/method)"));
+ assertThat(result4c, is(@"[text](Classes/Class.html#//apple_ref/occ/instm/Class/method), [text onlyOneSpace](Classes/Class.html#//apple_ref/occ/instm/Class/method)"));
+ assertThat(result5, is(@"[doSomething:withVars:](Classes/Class.html#//apple_ref/occ/instm/Class/doSomething:withVars:)"));
+ assertThat(result6, is(@"[doSomething:withVars:](Classes/Class.html#//apple_ref/occ/instm/Class/doSomething:withVars:), [text](Classes/Class.html#//apple_ref/occ/instm/Class/method)"));
+ assertThat(result7, is(@"[doSomething:withVars:](Classes/Class.html#//apple_ref/occ/instm/Class/doSomething:withVars:), [text with space](Classes/Class.html#//apple_ref/occ/instm/Class/method)"));
+ assertThat(result8, is(@"[text](Classes/Class.html#//apple_ref/occ/instp/Class/value)"));
}
- (void)testStringByConvertingCrossReferencesInString_shouldIgnoreKnownObjectsInManualLinkDescriptionOrTitle {

0 comments on commit e700063

Please sign in to comment.