Merge branch 'matrush-disableXCTestMacro'

Author: erikdoe

Source/OCMock.xcodeproj/project.pbxproj

@@ -2055,8 +2055,8 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
 					"$(inherited)",
+					OCM_DISABLE_XCTEST_FEATURES,
 				);
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@@ -2094,6 +2094,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = OCM_DISABLE_XCTEST_FEATURES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "OCMock/OCMock-Info.plist";

Source/OCMock/OCMFunctions.m

@@ -15,7 +15,7 @@
  */
 
 #import <objc/runtime.h>
-#if !TARGET_OS_WATCH
+#if !defined(OCM_DISABLE_XCTEST_FEATURES)
 #import <XCTest/XCTest.h>
 #endif
 #import "OCClassMockObject.h"
@@ -475,7 +475,7 @@ void OCMReportFailure(OCMLocation *loc, NSString *description)
 {
     id testCase = [loc testCase];
 #ifdef __IPHONE_14_0 // this is actually a test for Xcode 12; see issue #472
-#if !TARGET_OS_WATCH
+#if !defined(OCM_DISABLE_XCTEST_FEATURES)
     if((testCase != nil) && [testCase respondsToSelector:@selector(recordIssue:)])
     {
         XCTSourceCodeLocation *xctloc = [[[XCTSourceCodeLocation alloc] initWithFilePath:[loc file] lineNumber:[loc line]] autorelease];

Source/OCMock/OCMStubRecorder.h

@@ -19,7 +19,7 @@
 
 #import <objc/runtime.h>
 
-#if !TARGET_OS_WATCH
+#if !defined(OCM_DISABLE_XCTEST_FEATURES)
 @class XCTestExpectation;
 #endif
 
@@ -33,7 +33,7 @@
 - (id)andDo:(void (^)(NSInvocation *invocation))block;
 - (id)andForwardToRealObject;
 
-#if !TARGET_OS_WATCH
+#if !defined(OCM_DISABLE_XCTEST_FEATURES)
 - (id)andFulfill:(XCTestExpectation *)expectation;
 #endif
 
@@ -67,7 +67,7 @@
 #define andForwardToRealObject() _andForwardToRealObject()
 @property (nonatomic, readonly) OCMStubRecorder *(^ _andForwardToRealObject)(void);
 
-#if !TARGET_OS_WATCH
+#if !defined(OCM_DISABLE_XCTEST_FEATURES)
 #define andFulfill(anExpectation) _andFulfill(anExpectation)
 @property (nonatomic, readonly) OCMStubRecorder *(^ _andFulfill)(XCTestExpectation *);
 #endif
@@ -85,6 +85,3 @@
 })                                                                    \
 
 @end
-
-
-

Source/OCMock/OCMStubRecorder.m

@@ -24,7 +24,7 @@
 #import "OCMNotificationPoster.h"
 #import "OCMRealObjectForwarder.h"
 
-#if !TARGET_OS_WATCH
+#if !defined(OCM_DISABLE_XCTEST_FEATURES)
 #import <XCTest/XCTest.h>
 #endif
 
@@ -101,7 +101,7 @@ - (id)andForwardToRealObject
     return self;
 }
 
-#if !TARGET_OS_WATCH
+#if !defined(OCM_DISABLE_XCTEST_FEATURES)
 - (id)andFulfill:(XCTestExpectation *)expectation
 {
     return [self andDo:^(NSInvocation *invocation) {
@@ -198,7 +198,7 @@ @implementation OCMStubRecorder (Properties)
     return (id)[[theBlock copy] autorelease];
 }
 
-#if !TARGET_OS_WATCH
+#if !defined(OCM_DISABLE_XCTEST_FEATURES)
 
 @dynamic _andFulfill;
 

Source/OCMockTests/OCMQuantifierTests.m

@@ -49,7 +49,7 @@ - (void)setUp
     expectFailure = NO;
 }
 
-#ifdef __IPHONE_14_0 // this is actually a test for Xcode 12; see issue #472
+#if defined(__IPHONE_14_0) && !defined(OCM_DISABLE_XCTEST_FEATURES) // this is actually a test for Xcode 12; see issue #472
 
 - (void)recordIssue:(XCTIssue *)issue
 {

Source/OCMockTests/OCMockObjectMacroTests.m

@@ -108,7 +108,7 @@ @interface OCMockObjectMacroTests : XCTestCase
 
 @implementation OCMockObjectMacroTests
 
-#ifdef __IPHONE_14_0 // this is actually a test for Xcode 12; see issue #472
+#if defined(__IPHONE_14_0) && !defined(OCM_DISABLE_XCTEST_FEATURES) // this is actually a test for Xcode 12; see issue #472
 
 - (void)recordIssue:(XCTIssue *)issue
 {
@@ -306,6 +306,8 @@ - (NSString *)stringValueForTesting
     return @"TEST_STRING_FROM_TESTCASE";
 }
 
+#ifndef OCM_DISABLE_XCTEST_FEATURES
+
 - (void)testFulfillsExpectation
 {
     id mock = OCMStrictClassMock([NSString class]);
@@ -316,6 +318,8 @@ - (void)testFulfillsExpectation
     [self waitForExpectationsWithTimeout:0 handler:nil];
 }
 
+#endif
+
 - (void)testCanChainPropertyBasedActions
 {
     id mock = OCMPartialMock([[TestClassForMacroTesting alloc] init]);
@@ -576,7 +580,9 @@ - (void)testReturnsCorrectObjectFromInitMethodCalledOnRecorderInsideMacro
     OCMStub([[mock andThrow:nil] initWithString:OCMOCK_ANY]);
     OCMStub([[mock andPost:nil] initWithString:OCMOCK_ANY]);
     OCMStub([[mock andCall:nil onObject:nil] initWithString:OCMOCK_ANY]);
+#ifndef OCM_DISABLE_XCTEST_FEATURES
     OCMStub([[mock andFulfill:nil] initWithString:OCMOCK_ANY]);
+#endif
     OCMStub([[mock andDo:nil] initWithString:OCMOCK_ANY]);
     OCMStub([[mock andForwardToRealObject] initWithString:OCMOCK_ANY]);
     OCMExpect([[mock never] initWithString:OCMOCK_ANY]);