Permalink
Browse files

Define new header for the new interface, optionally imported with KIW…

…I_USE_NEW_MACROS.
  • Loading branch information...
1 parent 47f83e3 commit 53395a750f53b3099289292892ee7d62fe5af359 @lukeredpath lukeredpath committed Jul 11, 2011
Showing with 34 additions and 1 deletion.
  1. +11 −0 Examples/OneTestPerSpecExample.m
  2. +8 −0 Kiwi.xcodeproj/project.pbxproj
  3. +5 −1 Kiwi/Kiwi.h
  4. +10 −0 Kiwi/KiwiNewMacros.h
@@ -0,0 +1,11 @@
+//
+// OneTestPerSpecExample.m
+// Kiwi
+//
+// Created by Luke Redpath on 11/07/2011.
+// Copyright 2011 Allen Ding. All rights reserved.
+//
+
+#define KIWI_USE_NEW_MACROS
+#import "Kiwi.h"
+
@@ -102,6 +102,8 @@
A352E9E812EDC30A0049C691 /* KWHaveValueMatcherTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A352E9E712EDC30A0049C691 /* KWHaveValueMatcherTest.m */; };
A352EA0E12EDC6F20049C691 /* KWHamrestMatchingAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A352EA0D12EDC6F20049C691 /* KWHamrestMatchingAdditions.m */; };
A352EA1B12EDC8380049C691 /* KWHamcrestMatcherTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A352EA1A12EDC8380049C691 /* KWHamcrestMatcherTest.m */; };
+ A35B033213CB30FF0045500C /* OneTestPerSpecExample.m in Sources */ = {isa = PBXBuildFile; fileRef = A35B033113CB30FF0045500C /* OneTestPerSpecExample.m */; };
+ A35B033413CB31250045500C /* KiwiNewMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = A35B033313CB31250045500C /* KiwiNewMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
A385CAE813AA7EA200DCA951 /* KWUserDefinedMatcherTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A385CAE713AA7EA200DCA951 /* KWUserDefinedMatcherTest.m */; };
A385CAEC13AA7EDD00DCA951 /* KWUserDefinedMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = A385CAEA13AA7ED800DCA951 /* KWUserDefinedMatcher.m */; };
A385CAF013AAC9B800DCA951 /* KWMatchers.m in Sources */ = {isa = PBXBuildFile; fileRef = A385CAEE13AAC9B700DCA951 /* KWMatchers.m */; };
@@ -270,6 +272,8 @@
A352EA1712EDC8160049C691 /* KWHamcrestMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWHamcrestMatcher.h; sourceTree = "<group>"; };
A352EA1812EDC8160049C691 /* KWHamcrestMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWHamcrestMatcher.m; sourceTree = "<group>"; };
A352EA1A12EDC8380049C691 /* KWHamcrestMatcherTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWHamcrestMatcherTest.m; sourceTree = "<group>"; };
+ A35B033113CB30FF0045500C /* OneTestPerSpecExample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OneTestPerSpecExample.m; sourceTree = "<group>"; };
+ A35B033313CB31250045500C /* KiwiNewMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KiwiNewMacros.h; sourceTree = "<group>"; };
A385CAE713AA7EA200DCA951 /* KWUserDefinedMatcherTest.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = KWUserDefinedMatcherTest.m; sourceTree = "<group>"; tabWidth = 4; };
A385CAE913AA7ED800DCA951 /* KWUserDefinedMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KWUserDefinedMatcher.h; sourceTree = "<group>"; tabWidth = 4; };
A385CAEA13AA7ED800DCA951 /* KWUserDefinedMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = KWUserDefinedMatcher.m; sourceTree = "<group>"; tabWidth = 4; };
@@ -616,6 +620,7 @@
F5015B501158398E002E9A98 /* Kiwi.h */,
F57C754C11B030E300C3015B /* KiwiConfiguration.h */,
F55252AD116CD4BA0028A401 /* KiwiMacros.h */,
+ A35B033313CB31250045500C /* KiwiNewMacros.h */,
);
path = Kiwi;
sourceTree = "<group>";
@@ -891,6 +896,7 @@
F5ECAEE3116711D200B0BEEF /* ExampleTestCase.m */,
F5CDEC4811C151120022A0BF /* SimpleSpec.m */,
A3A1739B12E47068004DFD70 /* ExampleAsyncSpec.m */,
+ A35B033113CB30FF0045500C /* OneTestPerSpecExample.m */,
);
path = Examples;
sourceTree = "<group>";
@@ -992,6 +998,7 @@
A34FADAA13BBF4A4003968B2 /* Kiwi.h in Headers */,
A34FADAB13BBF4A4003968B2 /* KiwiConfiguration.h in Headers */,
A34FADAC13BBF4A4003968B2 /* KiwiMacros.h in Headers */,
+ A35B033413CB31250045500C /* KiwiNewMacros.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1188,6 +1195,7 @@
A3B1655D1399694900E9CC6E /* SpaceShip.m in Sources */,
A3B1655E1399694900E9CC6E /* Robot.m in Sources */,
A3B1655F1399695000E9CC6E /* StringPrefixMatcher.m in Sources */,
+ A35B033213CB30FF0045500C /* OneTestPerSpecExample.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
@@ -78,4 +78,8 @@
// Some Foundation headers use Kiwi keywords (e.g. 'should') as identifiers for
// parameter names. Including this last allows the use of Kiwi keywords without
// conflicting with these headers (hopefully!).
-#import "KiwiMacros.h"
+#ifdef KIWI_USE_NEW_MACROS
+ #import "KiwiNewMacros.h"
+#else
+ #import "KiwiMacros.h"
+#endif
View
@@ -0,0 +1,10 @@
+//
+// KiwiNewMacros.h
+// Kiwi
+//
+// Created by Luke Redpath on 11/07/2011.
+// Copyright 2011 Allen Ding. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+

0 comments on commit 53395a7

Please sign in to comment.