Tidied up imports in tests.

erikdoe · erikdoe · commit 401afb41dfa3 · 2020-08-22T00:01:33.000+02:00
diff --git a/Source/OCMockTests/NSInvocationOCMAdditionsTests.m b/Source/OCMockTests/NSInvocationOCMAdditionsTests.m
@@ -18,6 +18,7 @@
 #import "NSInvocation+OCMAdditions.h"
 #import "OCMArg.h"
 
+
 @implementation NSValue(OCMTestAdditions)
 
 - (id)initialValue
diff --git a/Source/OCMockTests/NSMethodSignatureOCMAdditionsTests.m b/Source/OCMockTests/NSMethodSignatureOCMAdditionsTests.m
@@ -17,6 +17,7 @@
 #import <XCTest/XCTest.h>
 #import "NSMethodSignature+OCMAdditions.h"
 
+
 #if TARGET_OS_IPHONE
 #define NSPoint CGPoint
 #define NSSize  CGSize
diff --git a/Source/OCMockTests/OCMBoxedReturnValueProviderTests.m b/Source/OCMockTests/OCMBoxedReturnValueProviderTests.m
@@ -17,6 +17,7 @@
 #import <XCTest/XCTest.h>
 #import "OCMBoxedReturnValueProvider.h"
 
+
 @interface OCMBoxedReturnValueProvider(Private)
 - (BOOL)isMethodReturnType:(const char *)returnType compatibleWithValueType:(const char *)valueType value:(const char*)value valueSize:(size_t)valueSize;
 @end
diff --git a/Source/OCMockTests/OCMCPlusPlus11Tests.mm b/Source/OCMockTests/OCMCPlusPlus11Tests.mm
@@ -15,7 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
 
 #if !defined(__cplusplus)
 #error This file must be compiled with C++
diff --git a/Source/OCMockTests/OCMCPlusPlus98Tests.mm b/Source/OCMockTests/OCMCPlusPlus98Tests.mm
@@ -15,7 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
 
 #if !defined(__cplusplus)
 #error This file must be compiled with C++
diff --git a/Source/OCMockTests/OCMConstraintTests.m b/Source/OCMockTests/OCMConstraintTests.m
@@ -15,7 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMConstraint.h>
+#import "OCMConstraint.h"
 
 
 @interface OCMConstraintTests : XCTestCase
diff --git a/Source/OCMockTests/OCMInvocationMatcherTests.m b/Source/OCMockTests/OCMInvocationMatcherTests.m
@@ -15,9 +15,8 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMArg.h>
+#import "OCMock.h"
 #import "OCMInvocationMatcher.h"
-#import "OCClassMockObject.h"
 #import "OCMFunctionsPrivate.h"
 
 
diff --git a/Source/OCMockTests/OCMNoEscapeBlockTests.m b/Source/OCMockTests/OCMNoEscapeBlockTests.m
@@ -15,9 +15,10 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
 #import "OCMFunctionsPrivate.h"
 
+
 @interface NSString(NoEscapeBlock)
 @end
 
diff --git a/Source/OCMockTests/OCMQuantifierTests.m b/Source/OCMockTests/OCMQuantifierTests.m
@@ -15,8 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
-#import "OCMQuantifier.h"
+#import "OCMock.h"
 
 
 @interface TestClassForQuantifiers : NSObject
diff --git a/Source/OCMockTests/OCMStubRecorderTests.m b/Source/OCMockTests/OCMStubRecorderTests.m
@@ -15,13 +15,12 @@
  */
 
 #import <XCTest/XCTest.h>
-#import "OCMStubRecorder.h"
-#import <OCMock/OCMockObject.h>
+#import "OCMock.h"
 #import "OCMObjectReturnValueProvider.h"
 #import "OCMExceptionReturnValueProvider.h"
-#import "OCMInvocationMatcher.h"
 #import "OCMInvocationStub.h"
 
+
 @interface OCMStubRecorderTests : XCTestCase
 
 @end
diff --git a/Source/OCMockTests/OCMockObjectClassMethodMockingTests.m b/Source/OCMockTests/OCMockObjectClassMethodMockingTests.m
@@ -15,7 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
 #import "OCClassMockObject.h"
 #import "OCPartialMockObject.h"
 
diff --git a/Source/OCMockTests/OCMockObjectDynamicPropertyMockingTests.m b/Source/OCMockTests/OCMockObjectDynamicPropertyMockingTests.m
@@ -15,7 +15,8 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
+
 
 #pragma mark   Helper classes
 
diff --git a/Source/OCMockTests/OCMockObjectForwardingTargetTests.m b/Source/OCMockTests/OCMockObjectForwardingTargetTests.m
@@ -15,8 +15,9 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
 #import <objc/runtime.h>
+#import "OCMock.h"
+
 
 #pragma mark   Helper classes
 
diff --git a/Source/OCMockTests/OCMockObjectHamcrestTests.m b/Source/OCMockTests/OCMockObjectHamcrestTests.m
@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 #import <OCHamcrest/OCHamcrest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
 
 
 @interface OCMockObjectHamcrestTests : XCTestCase
diff --git a/Source/OCMockTests/OCMockObjectInternalTests.m b/Source/OCMockTests/OCMockObjectInternalTests.m
@@ -15,7 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
 
 
 #pragma mark    Helper classes
diff --git a/Source/OCMockTests/OCMockObjectMacroTests.m b/Source/OCMockTests/OCMockObjectMacroTests.m
@@ -15,7 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
 
 
 @protocol TestProtocolForMacroTesting
diff --git a/Source/OCMockTests/OCMockObjectPartialMocksTests.m b/Source/OCMockTests/OCMockObjectPartialMocksTests.m
@@ -16,7 +16,7 @@
 
 #import <CoreData/CoreData.h>
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
 #import "OCPartialMockObject.h"
 #import "TestClassWithCustomReferenceCounting.h"
 
@@ -27,6 +27,7 @@
 #define valueWithRect valueWithCGRect
 #endif
 
+
 #pragma mark   Helper classes
 
 @interface TestClassWithSimpleMethod : NSObject
diff --git a/Source/OCMockTests/OCMockObjectProtocolMocksTests.m b/Source/OCMockTests/OCMockObjectProtocolMocksTests.m
@@ -15,7 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
 
 
 // --------------------------------------------------------------------------------------
diff --git a/Source/OCMockTests/OCMockObjectRuntimeTests.m b/Source/OCMockTests/OCMockObjectRuntimeTests.m
@@ -15,7 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
 
 
 #pragma mark   Helper classes
diff --git a/Source/OCMockTests/OCMockObjectTests.m b/Source/OCMockTests/OCMockObjectTests.m
@@ -15,8 +15,7 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
-#import "OCMBoxedReturnValueProvider.h"
+#import "OCMock/OCMock.h"
 
 
 #pragma mark    Helper classes and protocols for testing
@@ -91,13 +90,13 @@ @implementation TestClassWithProperty
 
 @interface TestClassWithBlockArgMethod : NSObject
 
-- (void)doStuffWithBlock:(void (^)(void))block andString:(id)aString;
+- (void)doStuffWithBlock:(__unused void (^)(void))block andString:(id)aString;
 
 @end
 
 @implementation TestClassWithBlockArgMethod
 
-- (void)doStuffWithBlock:(void (^)(void))block andString:(id)aString;
+- (void)doStuffWithBlock:(__unused void (^)(void))block andString:(id)aString;
 {
     // stubbed out anyway
 }
@@ -157,13 +156,13 @@ - (id)objectValue;
 
 @interface TestClassWithProtocolBlockArgMethod : NSObject
 
-- (void)doStuffWithBlock:(void (^)(id<TestProtocol> arg))block;
+- (void)doStuffWithBlock:(__unused void (^)(id<TestProtocol> arg))block;
 
 @end
 
 @implementation TestClassWithProtocolBlockArgMethod
 
-- (void)doStuffWithBlock:(void (^)(id<TestProtocol> arg))block;
+- (void)doStuffWithBlock:(__unused void (^)(id<TestProtocol> arg))block;
 {
     // stubbed out anyway
 }
@@ -868,7 +867,7 @@ - (void)testInvokesBlockWithProtocolMockArgs
 
     __block BOOL wasCalled = NO;
     __block id<TestProtocol> firstParam;
-    void (^block)(id<TestProtocol> arg) = ^(id<TestProtocol> arg) {
+    void (^block)(id<TestProtocol>) = ^(id<TestProtocol> arg) {
         wasCalled = YES;
         firstParam = arg;
     };
diff --git a/Source/OCMockTests/OCMockObjectVerifyAfterRunTests.m b/Source/OCMockTests/OCMockObjectVerifyAfterRunTests.m
@@ -15,8 +15,8 @@
  */
 
 #import <XCTest/XCTest.h>
-#import "OCMockObject.h"
-#import "OCMStubRecorder.h"
+#import "OCMock.h"
+
 
 @interface TestBaseClassForVerifyAfterRun : NSObject
 
diff --git a/Source/OCMockTests/OCObserverMockObjectTests.m b/Source/OCMockTests/OCObserverMockObjectTests.m
@@ -15,7 +15,8 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <OCMock/OCMock.h>
+#import "OCMock.h"
+
 
 static NSString *TestNotificationOne = @"TestNotificationOne";
 
diff --git a/Source/OCMockTests/TestClassWithCustomReferenceCounting.m b/Source/OCMockTests/TestClassWithCustomReferenceCounting.m
@@ -17,6 +17,7 @@
 #import <libkern/OSAtomic.h>
 #import "TestClassWithCustomReferenceCounting.h"
 
+
 @implementation TestClassWithCustomReferenceCounting
 {
 #if __LP64__
