Move all iVars to external storage

Author: dmaclach

Source/OCMock/OCClassMockObject.m

@@ -21,12 +21,23 @@
 #import "OCMInvocationStub.h"
 #import "NSMethodSignature+OCMAdditions.h"
 
+@interface OCClassMockObjectInstanceVars : NSObject
+@property (nonatomic) Class mockedClass;
+@property (nonatomic) Class originalMetaClass;
+@property (nonatomic) Class classCreatedForNewMetaClass;
+@end
+
+@implementation OCClassMockObjectInstanceVars
+@end
+
 @interface OCClassMockObject ()
-  @property (nonatomic) Class mockedClass;
-  @property (nonatomic) Class originalMetaClass;
-  @property (nonatomic) Class classCreatedForNewMetaClass;
+@property (nonatomic) Class mockedClass;
+@property (nonatomic) Class originalMetaClass;
+@property (nonatomic) Class classCreatedForNewMetaClass;
 @end
 
+static const char *OCClassMockObjectInstanceVarsKey = "OCClassMockObjectInstanceVarsKey";
+
 @implementation OCClassMockObject
 
 #pragma mark  Initialisers, description, accessors, etc.
@@ -37,6 +48,10 @@ - (id)initWithClass:(Class)aClass
 		[NSException raise:NSInvalidArgumentException format:@"Class cannot be Nil."];
 
 	self = [super init];
+  OCClassMockObjectInstanceVars *vars = [[OCClassMockObjectInstanceVars alloc] init];
+  objc_setAssociatedObject(self, OCClassMockObjectInstanceVarsKey, vars, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  [vars release];
+
 	self.mockedClass = aClass;
     [self prepareClassForClassMethodMocking];
 	return self;
@@ -53,9 +68,40 @@ - (NSString *)description
 	return [NSString stringWithFormat:@"OCClassMockObject(%@)", NSStringFromClass(self.mockedClass)];
 }
 
+#pragma mark  Setters/Getters
+
+- (OCClassMockObjectInstanceVars *)classMockObjectInstanceVars {
+  return objc_getAssociatedObject(self, OCClassMockObjectInstanceVarsKey);
+}
+
 - (Class)mockedClass
 {
-	return _mockedClass;
+	return self.classMockObjectInstanceVars.mockedClass;
+}
+
+- (Class)classCreatedForNewMetaClass
+{
+  return self.classMockObjectInstanceVars.classCreatedForNewMetaClass;
+}
+
+- (Class)originalMetaClass
+{
+  return self.classMockObjectInstanceVars.originalMetaClass;
+}
+
+- (void)setMockedClass:(Class)mockedClass
+{
+  self.classMockObjectInstanceVars.mockedClass = mockedClass;
+}
+
+- (void)setClassCreatedForNewMetaClass:(Class)classCreatedForNewMetaClass
+{
+  self.classMockObjectInstanceVars.classCreatedForNewMetaClass = classCreatedForNewMetaClass;
+}
+
+- (void)setOriginalMetaClass:(Class)originalMetaClass
+{
+  self.classMockObjectInstanceVars.originalMetaClass = originalMetaClass;
 }
 
 
@@ -209,7 +255,7 @@ - (Class)mockObjectClass
 
 - (Class)class
 {
-    return _mockedClass;
+    return self.mockedClass;
 }
 
 - (BOOL)respondsToSelector:(SEL)selector

Source/OCMock/OCMockObject.m

@@ -30,6 +30,20 @@
 #import "OCMExceptionReturnValueProvider.h"
 #import "OCMExpectationRecorder.h"
 
+@interface OCMockObjectInstanceVars : NSObject
+@property (nonatomic) BOOL isNice;
+@property (nonatomic) BOOL expectationOrderMatters;
+@property (nonatomic, assign) NSMutableArray *stubs;
+@property (nonatomic, assign) NSMutableArray *expectations;
+@property (nonatomic, assign) NSMutableArray *exceptions;
+@property (nonatomic, assign) NSMutableArray *invocations;
+@end
+
+@implementation OCMockObjectInstanceVars
+@end
+
+static const char *OCMockObjectInstanceVarsKey = "OCMockObjectInstanceVarsKey";
+
 @interface OCMockObject ()
 @property (nonatomic) BOOL isNice;
 @property (nonatomic) BOOL expectationOrderMatters;
@@ -105,11 +119,14 @@ - (instancetype)init
     }
 
 	// skip initialisation when init is called again, which can happen when stubbing alloc/init
-    if(self.stubs != nil)
+    if(self.mockObjectInstanceVars != nil)
     {
         return self;
     }
 
+  OCMockObjectInstanceVars *vars = [[OCMockObjectInstanceVars alloc] init];
+  objc_setAssociatedObject(self, OCMockObjectInstanceVarsKey, vars, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  [vars release];
 	// no [super init], we're inheriting from NSProxy
 	self.expectationOrderMatters = NO;
   self.stubs = [[NSMutableArray alloc] init];
@@ -184,12 +201,52 @@ - (void)addInvocation:(NSInvocation *)anInvocation
     }
 }
 
-#pragma mark  Public API
+# pragma mark  Getters/Setters
+- (OCMockObjectInstanceVars *)mockObjectInstanceVars {
+  return objc_getAssociatedObject(self, OCMockObjectInstanceVarsKey);
+}
 
-- (void)setExpectationOrderMatters:(BOOL)flag
-{
-  _expectationOrderMatters = flag;
+- (BOOL)isNice {
+  return self.mockObjectInstanceVars.isNice;
+}
+
+- (BOOL)expectationOrderMatters {
+  return self.mockObjectInstanceVars.expectationOrderMatters;
+}
+- (NSMutableArray *)stubs {
+  return self.mockObjectInstanceVars.stubs;
 }
+- (NSMutableArray *)expectations {
+  return self.mockObjectInstanceVars.expectations;
+}
+- (NSMutableArray *)exceptions {
+  return self.mockObjectInstanceVars.exceptions;
+}
+- (NSMutableArray *)invocations {
+  return self.mockObjectInstanceVars.invocations;
+}
+
+- (void)setIsNice:(BOOL)isNice {
+  self.mockObjectInstanceVars.isNice = isNice;
+}
+
+- (void)setExpectationOrderMatters:(BOOL)expectationOrderMatters {
+  self.mockObjectInstanceVars.expectationOrderMatters = expectationOrderMatters;
+}
+- (void)setStubs:(NSMutableArray *)stubs {
+  self.mockObjectInstanceVars.stubs = stubs;
+}
+- (void)setExpectations:(NSMutableArray *)expectations {
+  self.mockObjectInstanceVars.expectations = expectations;
+}
+- (void)setExceptions:(NSMutableArray *)exceptions {
+  self.mockObjectInstanceVars.exceptions = exceptions;
+}
+- (void)setInvocations:(NSMutableArray *)invocations {
+  self.mockObjectInstanceVars.invocations = invocations;
+}
+
+#pragma mark  Public API
 
 - (void)stopMocking
 {
@@ -200,7 +257,6 @@ - (void)stopMocking
     @synchronized(self.invocations)
     {
         [self.invocations removeAllObjects];
-        [self.invocations autorelease];
       self.invocations = nil;
     }
 }

Source/OCMock/OCPartialMockObject.m

@@ -23,6 +23,16 @@
 #import "OCMInvocationStub.h"
 #import "NSInvocation+OCMAdditions.h"
 
+@interface OCPartialMockObjectInstanceVars : NSObject
+@property (nonatomic, assign) NSObject *realObject;
+@property (nonatomic) NSInvocation *invocationFromMock;
+@end
+
+@implementation OCPartialMockObjectInstanceVars
+@end
+
+static const char *OCPartialMockObjectInstanceVarsKey = "OCPartialMockObjectInstanceVarsKey";
+
 @interface OCPartialMockObject ()
 @property (nonatomic) NSObject *realObject;
 @property (nonatomic) NSInvocation *invocationFromMock;
@@ -40,6 +50,9 @@ - (id)initWithObject:(NSObject *)anObject
     Class const class = [self classToSubclassForObject:anObject];
     [self assertClassIsSupported:class];
 	self = [super initWithClass:class];
+  OCPartialMockObjectInstanceVars *vars = [[OCPartialMockObjectInstanceVars alloc] init];
+  objc_setAssociatedObject(self, OCPartialMockObjectInstanceVarsKey, vars, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  [vars release];
 	self.realObject = [anObject retain];
     [self prepareObjectForInstanceMethodMocking];
 	return self;
@@ -50,9 +63,30 @@ - (NSString *)description
 	return [NSString stringWithFormat:@"OCPartialMockObject(%@)", NSStringFromClass(self.mockedClass)];
 }
 
+#pragma mark  Setters/Getters
+
+- (OCPartialMockObjectInstanceVars *)partialMockObjectInstanceVars {
+  return objc_getAssociatedObject(self, OCPartialMockObjectInstanceVarsKey);
+}
+
 - (NSObject *)realObject
 {
-	return _realObject;
+  return self.partialMockObjectInstanceVars.realObject;
+}
+
+- (void)setRealObject:(NSObject *)realObject
+{
+  self.partialMockObjectInstanceVars.realObject = realObject;
+}
+
+- (NSInvocation *)invocationFromMock
+{
+  return self.partialMockObjectInstanceVars.invocationFromMock;
+}
+
+- (void)setInvocationFromMock:(NSInvocation *)invocationFromMock
+{
+  self.partialMockObjectInstanceVars.invocationFromMock = invocationFromMock;
 }
 
 #pragma mark  Helper methods

Source/OCMockTests/OCMockObjectTests.m

@@ -17,7 +17,8 @@
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
 #import "OCMBoxedReturnValueProvider.h"
-
+#import "OCPartialMockObject.h"
+#import "OCClassMockObject.h"
 
 #pragma mark    Helper classes and protocols for testing
 
@@ -1100,6 +1101,12 @@ - (void)testUncalledRejectStubDoesNotCountAsExpectation
 
 }
 
+- (void)testMockObjectsHaveNoInstanceVariables
+{
+  XCTAssertEqual(class_getInstanceSize([NSProxy class]), class_getInstanceSize([OCMockObject class]));
+  XCTAssertEqual(class_getInstanceSize([NSProxy class]), class_getInstanceSize([OCPartialMockObject class]));
+  XCTAssertEqual(class_getInstanceSize([NSProxy class]), class_getInstanceSize([OCClassMockObject class]));
+}
 
 @end