Updated example.

The comma in the stringWithFormat call was causing a conflict with the precisely specified macro, so change it to delegate to a function call with VA_ARGS and have the function call KWMatchers.
allending · Jun 17, 2011 · fab24c5 · fab24c5
1 parent 8737c71
commit fab24c5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/Examples/ExampleSpec.m b/Examples/ExampleSpec.m
@@ -71,6 +71,9 @@ - (void)haveFighters;
                 Cruiser *cruiser = subject;
                 return cruiser.fighters.count > 0; 
             }];
+            [builder failureMessageForShould:^(id subject) {
+                return [NSString stringWithFormat:@"%@ should have fighters", subject];
+            }];
         });
 
         it(@"should have fighters (using custom matcher)", ^{

diff --git a/Kiwi/KWMatchers.h b/Kiwi/KWMatchers.h
@@ -31,3 +31,5 @@ typedef void (^KWMatchersBuildingBlock)(KWUserDefinedMatcherBuilder *);
 
 - (KWUserDefinedMatcher *)matcherForSelector:(SEL)selector subject:(id)subject;
 @end
+
+void KWDefineMatchers(NSString *selectorString, KWMatchersBuildingBlock block);
diff --git a/Kiwi/KWMatchers.m b/Kiwi/KWMatchers.m
@@ -64,3 +64,9 @@ - (KWUserDefinedMatcher *)matcherForSelector:(SEL)selector subject:(id)subject {
 
 
 @end
+
+void KWDefineMatchers(NSString *selectorString, KWMatchersBuildingBlock block)
+{
+    [KWMatchers defineMatcher:selectorString as:block];
+}
+
diff --git a/Kiwi/KiwiMacros.h b/Kiwi/KiwiMacros.h
@@ -46,7 +46,7 @@
     #define it(...) itWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
     #define pending(...) pendingWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
     #define xit(...) pendingWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
-    #define defineMatcher(selectorString, block) [KWMatchers defineMatcher:selectorString as:block]
+    #define defineMatcher(...) KWDefineMatchers(__VA_ARGS__)
 #endif // #if KW_BLOCKS_ENABLED
 
 // If a gcc compatible compiler is available, use the statement and