Added ivars to test classes so that tests can run for MacOS 32-bit.

groue · Aug 4, 2012 · b5ff56d · b5ff56d
1 parent 1c8ccf7
commit b5ff56d
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 17 deletions.
diff --git a/src/GRMustache.xcodeproj/project.pbxproj b/src/GRMustache.xcodeproj/project.pbxproj
@@ -1335,6 +1335,7 @@
 		56DEC268152631040031E8DC /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1348,6 +1349,7 @@
 		56DEC269152631040031E8DC /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/src/tests/Private/GRPreventNSUndefinedKeyExceptionAttackTest.m b/src/tests/Private/GRPreventNSUndefinedKeyExceptionAttackTest.m
@@ -26,7 +26,11 @@
 #import "GRMustacheContext_private.h"
 #import <CoreData/CoreData.h>
 
-@interface GRPreventNSUndefinedKeyExceptionAttackTest : GRMustachePrivateAPITest
+@interface GRPreventNSUndefinedKeyExceptionAttackTest : GRMustachePrivateAPITest {
+    NSManagedObjectModel *_managedObjectModel;
+    NSPersistentStoreCoordinator *_persistentStoreCoordinator;
+    NSManagedObjectContext *_managedObjectContext;
+}
 @end
 
 @interface GRPreventNSUndefinedKeyExceptionAttackTest()

diff --git a/src/tests/Public/v4.0/GRBooleanTest.m b/src/tests/Public/v4.0/GRBooleanTest.m
@@ -26,7 +26,10 @@
 @interface GRBooleanTest : GRMustachePublicAPITest
 @end
 
-@interface GRBooleanTestSupport: NSObject
+@interface GRBooleanTestSupport: NSObject {
+    BOOL _customGetterBOOLProperty;
+    bool _customGetterboolProperty;
+}
 @property (readonly) bool boolFalseProperty;
 @property (readonly) bool boolTrueProperty;
 @property (readonly) BOOL BOOLFalseProperty;
@@ -42,8 +45,8 @@ @interface GRBooleanTestSupport: NSObject
 @end
 
 @implementation GRBooleanTestSupport
-@synthesize customGetterBOOLProperty;
-@synthesize customGetterboolProperty;
+@synthesize customGetterBOOLProperty=_customGetterBOOLProperty;
+@synthesize customGetterboolProperty=_customGetterboolProperty;
 - (bool)boolFalseProperty { return NO; }
 - (bool)boolTrueProperty { return YES; }
 - (BOOL)BOOLFalseProperty { return NO; }

diff --git a/src/tests/Public/v4.0/GRMustacheHelperTest.m b/src/tests/Public/v4.0/GRMustacheHelperTest.m
@@ -26,7 +26,9 @@
 @interface GRMustacheHelperTest : GRMustachePublicAPITest
 @end
 
-@interface GRMustacheStringHelper : NSObject<GRMustacheHelper>
+@interface GRMustacheStringHelper : NSObject<GRMustacheHelper> {
+    NSString *_string;
+}
 @property (nonatomic, copy) NSString *string;
 @end
 
@@ -43,7 +45,11 @@ - (NSString *)renderSection:(GRMustacheSection *)section
 }
 @end
 
-@interface GRMustacheRecorderHelper : NSObject<GRMustacheHelper>
+@interface GRMustacheRecorderHelper : NSObject<GRMustacheHelper> {
+    NSUInteger _invocationCount;
+    NSString *_lastInnerTemplateString;
+    NSString *_lastRenderedContent;
+}
 @property (nonatomic) NSUInteger invocationCount;
 @property (nonatomic, retain) NSString *lastInnerTemplateString;
 @property (nonatomic, retain) NSString *lastRenderedContent;
@@ -68,7 +74,9 @@ - (NSString *)renderSection:(GRMustacheSection *)section
 }
 @end
 
-@interface GRMustacheTemplateHelper : NSObject<GRMustacheHelper>
+@interface GRMustacheTemplateHelper : NSObject<GRMustacheHelper> {
+    NSString *_templateString;
+}
 @property (nonatomic, copy) NSString *templateString;
 @end
 

diff --git a/src/tests/Public/v4.0/GRMustacheTemplateDelegateTest.m b/src/tests/Public/v4.0/GRMustacheTemplateDelegateTest.m
@@ -26,15 +26,26 @@
 @interface GRMustacheTemplateDelegateTest : GRMustachePublicAPITest
 @end
 
-@interface GRMustacheTemplateDelegateAssistant : NSObject
+@interface GRMustacheTemplateDelegateAssistant : NSObject {
+    NSString *_stringProperty;
+}
 @property (nonatomic, retain) NSString *stringProperty;
 @end
 
 @implementation GRMustacheTemplateDelegateAssistant
-@synthesize stringProperty;
+@synthesize stringProperty=_stringProperty;
 @end
 
-@interface GRMustacheTemplateRecorder : NSObject<GRMustacheTemplateDelegate>
+@interface GRMustacheTemplateRecorder : NSObject<GRMustacheTemplateDelegate> {
+    GRMustacheInvocation *_lastInvocation;
+    NSUInteger _templateWillRenderCount;
+    NSUInteger _templateDidRenderCount;
+    NSUInteger _willRenderReturnValueOfInvocationCount;
+    NSUInteger _didRenderReturnValueOfInvocationCount;
+    NSUInteger _nilReturnValueCount;
+    NSString *_lastUsedValue;
+    NSString *_lastUsedKey;
+}
 @property (nonatomic, retain) GRMustacheInvocation *lastInvocation;
 @property (nonatomic) NSUInteger templateWillRenderCount;
 @property (nonatomic) NSUInteger templateDidRenderCount;

diff --git a/src/tests/Public/v4.0/GRMustacheTemplateFromMethodsTest.m b/src/tests/Public/v4.0/GRMustacheTemplateFromMethodsTest.m
@@ -27,12 +27,14 @@
 @interface GRMustacheTemplateFromMethodsTest : GRMustachePublicAPITest
 @end
 
-@interface GRMustacheTemplateFromMethodsTestSupport: NSObject
+@interface GRMustacheTemplateFromMethodsTestSupport: NSObject {
+    NSString *_stringProperty;
+}
 @property (nonatomic, retain) NSString *stringProperty;
 @end
 
 @implementation GRMustacheTemplateFromMethodsTestSupport
-@synthesize stringProperty;
+@synthesize stringProperty=_stringProperty;
 @end
 
 @interface GRMustacheTemplateFromMethodsTest()

diff --git a/src/tests/Public/v4.0/GRMustacheTemplateRenderMethodsTest.m b/src/tests/Public/v4.0/GRMustacheTemplateRenderMethodsTest.m
@@ -27,14 +27,17 @@
 @interface GRMustacheTemplateRenderMethodsTest : GRMustachePublicAPITest
 @end
 
-@interface GRMustacheTemplateRenderMethodsTestSupport: NSObject
+@interface GRMustacheTemplateRenderMethodsTestSupport: NSObject {
+    NSString *_stringProperty;
+    BOOL _BOOLProperty;
+}
 @property (nonatomic, retain) NSString *stringProperty;
 @property (nonatomic) BOOL BOOLProperty;
 @end
 
 @implementation GRMustacheTemplateRenderMethodsTestSupport
-@synthesize stringProperty;
-@synthesize BOOLProperty;
+@synthesize stringProperty=_stringProperty;
+@synthesize BOOLProperty=_BOOLProperty;
 @end
 
 @interface GRMustacheTemplateRenderMethodsTest()

diff --git a/src/tests/Public/v4.0/GRMustacheTemplateRepositoryDataSourceTest.m b/src/tests/Public/v4.0/GRMustacheTemplateRepositoryDataSourceTest.m
@@ -26,7 +26,10 @@
 @interface GRMustacheTemplateRepositoryDataSourceTest : GRMustachePublicAPITest
 @end
 
-@interface GRMustacheTemplateRepositoryTestDataSource : NSObject<GRMustacheTemplateRepositoryDataSource>
+@interface GRMustacheTemplateRepositoryTestDataSource : NSObject<GRMustacheTemplateRepositoryDataSource> {
+    NSUInteger _templateIDForNameCount;
+    NSUInteger _templateStringForTemplateIDCount;
+}
 @property (nonatomic) NSUInteger templateIDForNameCount;
 @property (nonatomic) NSUInteger templateStringForTemplateIDCount;
 @end

diff --git a/src/tests/Public/v4.1/GRMustacheTemplateDelegate_v4_1_Test.m b/src/tests/Public/v4.1/GRMustacheTemplateDelegate_v4_1_Test.m
@@ -26,7 +26,13 @@
 @interface GRMustacheTemplateDelegate_v4_1_Test : GRMustachePublicAPITest
 @end
 
-@interface GRMustacheTemplateRecorder_v4_1 : NSObject<GRMustacheTemplateDelegate>
+@interface GRMustacheTemplateRecorder_v4_1 : NSObject<GRMustacheTemplateDelegate> {
+    NSUInteger _willRenderReturnValueOfInvocationCount;
+    NSUInteger _didRenderReturnValueOfInvocationCount;
+    NSUInteger _willInterpretReturnValueOfInvocationAsCount;
+    NSUInteger _didInterpretReturnValueOfInvocationAsCount;
+    GRMustacheInterpretation _lastInterpretation;
+}
 @property (nonatomic) NSUInteger willRenderReturnValueOfInvocationCount;
 @property (nonatomic) NSUInteger didRenderReturnValueOfInvocationCount;
 @property (nonatomic) NSUInteger willInterpretReturnValueOfInvocationAsCount;