Merge branch 'dmaclach-noAsserts'

Author: erikdoe

Source/OCMock/OCClassMockObject.m

@@ -27,7 +27,9 @@ @implementation OCClassMockObject
 
 - (id)initWithClass:(Class)aClass
 {
-    NSParameterAssert(aClass != nil);
+	if(aClass == Nil)
+		[NSException raise:NSInvalidArgumentException format:@"Class cannot be Nil."];
+
 	[super init];
 	mockedClass = aClass;
     [self prepareClassForClassMethodMocking];

Source/OCMock/OCMMacroState.m

@@ -140,7 +140,8 @@ - (id)initWithRecorder:(OCMRecorder *)aRecorder
 - (void)dealloc
 {
     [recorder release];
-    NSAssert([NSThread currentThread].threadDictionary[OCMGlobalStateKey] != self, @"Unexpected dealloc while set as the global state");
+    if([NSThread currentThread].threadDictionary[OCMGlobalStateKey] == self)
+        [NSException raise:NSInternalInconsistencyException format:@"Unexpected dealloc while set as the global state"];
     [super dealloc];
 }
 

Source/OCMock/OCPartialMockObject.m

@@ -30,7 +30,9 @@ @implementation OCPartialMockObject
 
 - (id)initWithObject:(NSObject *)anObject
 {
-    NSParameterAssert(anObject != nil);
+    if(anObject == nil)
+        [NSException raise:NSInvalidArgumentException format:@"Object cannot be nil."];
+
     Class const class = [self classToSubclassForObject:anObject];
     [self assertClassIsSupported:class];
 	[super initWithClass:class];

Source/OCMock/OCProtocolMockObject.m

@@ -24,7 +24,9 @@ @implementation OCProtocolMockObject
 
 - (id)initWithProtocol:(Protocol *)aProtocol
 {
-    NSParameterAssert(aProtocol != nil);
+	if(aProtocol == nil)
+		[NSException raise:NSInvalidArgumentException format:@"Protocol cannot be nil."];
+
 	[super init];
 	mockedProtocol = aProtocol;
 	return self;