Skip to content

Commit 794f6fa

Browse files
dmaclachdmaclach
authored
Merge branch 'master' into class_fix
2 parents 8fba6a1 + 3dde0e4 commit 794f6fa

File tree

59 files changed

+263
-276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+263
-276
lines changed

‎OCMock.podspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ Pod::Spec.new do |s|
2929
s.public_header_files = ["OCMock.h", "OCMockObject.h", "OCMArg.h", "OCMConstraint.h",
3030
"OCMLocation.h", "OCMMacroState.h", "OCMRecorder.h",
3131
"OCMStubRecorder.h", "NSNotificationCenter+OCMAdditions.h",
32-
"OCMFunctions.h", "OCMVerifier.h", "OCMQuantifier.h" ]
32+
"OCMFunctions.h", "OCMVerifier.h", "OCMQuantifier.h",
33+
"OCMockMacros.h" ]
3334
.map { |file| "Source/OCMock/" + file }
3435

3536
end

‎Source/OCMock.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
030EF0B614632FD000B04273 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 030EF0B414632FD000B04273 /* InfoPlist.strings */; };
1110
031E50581BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 031E50571BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m */; };
1211
031E50591BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 031E50571BB4A56300E257C3 /* OCMBoxedReturnValueProviderTests.m */; };
1312
0322DA65191188D100CACAF1 /* OCMockObjectVerifyAfterRunTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0322DA64191188D100CACAF1 /* OCMockObjectVerifyAfterRunTests.m */; };
@@ -16,8 +15,12 @@
1615
0322DA6A19118B4600CACAF1 /* OCMVerifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 0322DA6719118B4600CACAF1 /* OCMVerifier.h */; settings = {ATTRIBUTES = (Public, ); }; };
1716
0322DA6B19118B4600CACAF1 /* OCMVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 0322DA6819118B4600CACAF1 /* OCMVerifier.m */; };
1817
0322DA6C19118B4600CACAF1 /* OCMVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 0322DA6819118B4600CACAF1 /* OCMVerifier.m */; };
18+
033AB1FA24F046C7002014AE /* OCMockMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 033AB1F924F046C7002014AE /* OCMockMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
19+
033AB1FB24F046C7002014AE /* OCMockMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 033AB1F924F046C7002014AE /* OCMockMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
20+
033AB1FC24F046C7002014AE /* OCMockMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 033AB1F924F046C7002014AE /* OCMockMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
21+
033AB1FD24F046C7002014AE /* OCMockMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 033AB1F924F046C7002014AE /* OCMockMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
22+
033AB1FE24F046C7002014AE /* OCMockMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 033AB1F924F046C7002014AE /* OCMockMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
1923
033E1FF414FEF5E0004456B0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 033E1FF314FEF5E0004456B0 /* Foundation.framework */; };
20-
03565A3818F0566F003AE91E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 03565A3618F0566F003AE91E /* InfoPlist.strings */; };
2124
03565A4218F05721003AE91E /* OCMockObjectPartialMocksTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03AC5C1416DF9FA500D82ECD /* OCMockObjectPartialMocksTests.m */; };
2225
03565A4318F05721003AE91E /* OCMockObjectClassMethodMockingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 039F91C516EFB493006C3D70 /* OCMockObjectClassMethodMockingTests.m */; };
2326
03565A4418F05721003AE91E /* OCMockObjectProtocolMocksTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FA286BFBD8B9D068B41E7EF /* OCMockObjectProtocolMocksTests.m */; };
@@ -356,7 +359,6 @@
356359
8DE97C9B22B43EE60098C63F /* OCMArgAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2FA2833B48908EAD36444671 /* OCMArgAction.h */; };
357360
A02926821CA0725A00594AAF /* TestObjects.xcdatamodeld in Resources */ = {isa = PBXBuildFile; fileRef = A02926801CA0725A00594AAF /* TestObjects.xcdatamodeld */; };
358361
A06930951CA1BFC900513023 /* TestObjects.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = A02926801CA0725A00594AAF /* TestObjects.xcdatamodeld */; };
359-
D31108BA1828DB8700737925 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D31108B81828DB8700737925 /* InfoPlist.strings */; };
360362
D31108C41828DBD600737925 /* OCMockObjectPartialMocksTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03AC5C1416DF9FA500D82ECD /* OCMockObjectPartialMocksTests.m */; };
361363
D31108C51828DBD600737925 /* OCMockObjectClassMethodMockingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 039F91C516EFB493006C3D70 /* OCMockObjectClassMethodMockingTests.m */; };
362364
D31108C61828DBD600737925 /* OCMockObjectForwardingTargetTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0354D71F16F23AF5001766BB /* OCMockObjectForwardingTargetTests.m */; };
@@ -465,7 +467,6 @@
465467
/* Begin PBXFileReference section */
466468
030EF0A814632FD000B04273 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
467469
030EF0B314632FD000B04273 /* OCMock-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OCMock-Info.plist"; sourceTree = "<group>"; };
468-
030EF0B514632FD000B04273 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
469470
030EF0B714632FD000B04273 /* OCMock-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCMock-Prefix.pch"; sourceTree = "<group>"; };
470471
030EF0B814632FD000B04273 /* OCMock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCMock.h; sourceTree = "<group>"; };
471472
030EF0DC14632FF700B04273 /* libOCMock.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOCMock.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -474,12 +475,12 @@
474475
0322DA64191188D100CACAF1 /* OCMockObjectVerifyAfterRunTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMockObjectVerifyAfterRunTests.m; sourceTree = "<group>"; };
475476
0322DA6719118B4600CACAF1 /* OCMVerifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMVerifier.h; sourceTree = "<group>"; };
476477
0322DA6819118B4600CACAF1 /* OCMVerifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMVerifier.m; sourceTree = "<group>"; };
478+
033AB1F924F046C7002014AE /* OCMockMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCMockMacros.h; sourceTree = "<group>"; };
477479
033E1FF314FEF5E0004456B0 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
478480
0354D71F16F23AF5001766BB /* OCMockObjectForwardingTargetTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMockObjectForwardingTargetTests.m; sourceTree = "<group>"; };
479481
03565A1D18F05626003AE91E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
480482
03565A3118F0566E003AE91E /* OCMockTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OCMockTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
481483
03565A3518F0566F003AE91E /* OCMockTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OCMockTests-Info.plist"; sourceTree = "<group>"; };
482-
03565A3718F0566F003AE91E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
483484
03565A3B18F0566F003AE91E /* OCMockTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCMockTests-Prefix.pch"; sourceTree = "<group>"; };
484485
03618D81195B553400389166 /* OCMRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMRecorder.h; sourceTree = "<group>"; };
485486
03618D82195B553400389166 /* OCMRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMRecorder.m; sourceTree = "<group>"; };
@@ -582,10 +583,8 @@
582583
A02926811CA0725A00594AAF /* TestObjects.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TestObjects.xcdatamodel; sourceTree = "<group>"; };
583584
D31108AD1828DB8700737925 /* OCMockLibTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OCMockLibTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
584585
D31108B71828DB8700737925 /* OCMockLibTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OCMockLibTests-Info.plist"; sourceTree = "<group>"; };
585-
D31108B91828DB8700737925 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
586586
D31108BD1828DB8700737925 /* OCMockLibTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCMockLibTests-Prefix.pch"; sourceTree = "<group>"; };
587587
F0B950F11B0080BE00942C38 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
588-
F0B950F41B0080BE00942C38 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = "OCMock iOS/Info.plist"; sourceTree = SOURCE_ROOT; };
589588
F0B9510A1B0080D500942C38 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
590589
/* End PBXFileReference section */
591590

@@ -695,9 +694,7 @@
695694
030EF0B214632FD000B04273 /* Supporting Files */ = {
696695
isa = PBXGroup;
697696
children = (
698-
F0B950F41B0080BE00942C38 /* Info.plist */,
699697
030EF0B314632FD000B04273 /* OCMock-Info.plist */,
700-
030EF0B414632FD000B04273 /* InfoPlist.strings */,
701698
030EF0B714632FD000B04273 /* OCMock-Prefix.pch */,
702699
);
703700
name = "Supporting Files";
@@ -774,7 +771,6 @@
774771
03565A3418F0566F003AE91E /* Supporting Files */ = {
775772
isa = PBXGroup;
776773
children = (
777-
03565A3618F0566F003AE91E /* InfoPlist.strings */,
778774
03565A3518F0566F003AE91E /* OCMockTests-Info.plist */,
779775
03565A3B18F0566F003AE91E /* OCMockTests-Prefix.pch */,
780776
A02926801CA0725A00594AAF /* TestObjects.xcdatamodeld */,
@@ -805,6 +801,7 @@
805801
03B315841463334E0052CD09 /* Core Mocks */ = {
806802
isa = PBXGroup;
807803
children = (
804+
033AB1F924F046C7002014AE /* OCMockMacros.h */,
808805
03B3159D146333BF0052CD09 /* OCMockObject.h */,
809806
03B3159E146333BF0052CD09 /* OCMockObject.m */,
810807
03B3158B146333BF0052CD09 /* OCClassMockObject.h */,
@@ -934,7 +931,6 @@
934931
isa = PBXGroup;
935932
children = (
936933
D31108B71828DB8700737925 /* OCMockLibTests-Info.plist */,
937-
D31108B81828DB8700737925 /* InfoPlist.strings */,
938934
D31108BD1828DB8700737925 /* OCMockLibTests-Prefix.pch */,
939935
);
940936
name = "Supporting Files";
@@ -982,6 +978,7 @@
982978
2FA2821C9066C5E439288C76 /* OCMMacroState.h in Headers */,
983979
2FA28F090622C9DF868CCA8C /* NSValue+OCMAdditions.h in Headers */,
984980
2FA28DC9A2D732666124D640 /* OCMBlockArgCaller.h in Headers */,
981+
033AB1FA24F046C7002014AE /* OCMockMacros.h in Headers */,
985982
2FA28BCF08C1CBC133E8E84E /* OCMArgAction.h in Headers */,
986983
2FA28C1FE2E8E2C114E3FA54 /* OCMNonRetainingObjectReturnValueProvider.h in Headers */,
987984
);
@@ -1003,6 +1000,7 @@
10031000
03C7BF0B195DA2F200A545DD /* OCMInvocationStub.h in Headers */,
10041001
03B315BF146333BF0052CD09 /* OCClassMockObject.h in Headers */,
10051002
03B315C9146333BF0052CD09 /* OCMBlockCaller.h in Headers */,
1003+
033AB1FB24F046C7002014AE /* OCMockMacros.h in Headers */,
10061004
03E0FAD81B93C00B000C5096 /* OCMBlockArgCaller.h in Headers */,
10071005
03C7BF11195DAB5300A545DD /* OCMExpectationRecorder.h in Headers */,
10081006
03B315CE146333BF0052CD09 /* OCMBoxedReturnValueProvider.h in Headers */,
@@ -1069,6 +1067,7 @@
10691067
817EB15A1BD765130047E85A /* NSValue+OCMAdditions.h in Headers */,
10701068
817EB15B1BD765130047E85A /* OCMFunctions.h in Headers */,
10711069
817EB15C1BD765130047E85A /* OCMBlockArgCaller.h in Headers */,
1070+
033AB1FD24F046C7002014AE /* OCMockMacros.h in Headers */,
10721071
817EB15D1BD765130047E85A /* OCMArgAction.h in Headers */,
10731072
2FA28806443827E286F12F6F /* OCMNonRetainingObjectReturnValueProvider.h in Headers */,
10741073
);
@@ -1113,6 +1112,7 @@
11131112
8DE97C9822B43EE60098C63F /* NSValue+OCMAdditions.h in Headers */,
11141113
8DE97C9922B43EE60098C63F /* OCMFunctions.h in Headers */,
11151114
8DE97C9A22B43EE60098C63F /* OCMBlockArgCaller.h in Headers */,
1115+
033AB1FE24F046C7002014AE /* OCMockMacros.h in Headers */,
11161116
8DE97C9B22B43EE60098C63F /* OCMArgAction.h in Headers */,
11171117
2FA2883A0BD4BF6A03AAB49C /* OCMNonRetainingObjectReturnValueProvider.h in Headers */,
11181118
);
@@ -1157,6 +1157,7 @@
11571157
F0B951491B00810C00942C38 /* NSValue+OCMAdditions.h in Headers */,
11581158
F0B9514A1B00810C00942C38 /* OCMFunctions.h in Headers */,
11591159
2FA28B7BDB3319A499E90525 /* OCMBlockArgCaller.h in Headers */,
1160+
033AB1FC24F046C7002014AE /* OCMockMacros.h in Headers */,
11601161
2FA280E60213BA09F007C173 /* OCMArgAction.h in Headers */,
11611162
2FA28AFBD67EAB9DD1F23BF5 /* OCMNonRetainingObjectReturnValueProvider.h in Headers */,
11621163
);
@@ -1342,7 +1343,6 @@
13421343
isa = PBXResourcesBuildPhase;
13431344
buildActionMask = 2147483647;
13441345
files = (
1345-
030EF0B614632FD000B04273 /* InfoPlist.strings in Resources */,
13461346
);
13471347
runOnlyForDeploymentPostprocessing = 0;
13481348
};
@@ -1352,7 +1352,6 @@
13521352
files = (
13531353
A02926821CA0725A00594AAF /* TestObjects.xcdatamodeld in Resources */,
13541354
03CED2E22390770C001845CC /* OCHamcrest.framework.dSYM in Resources */,
1355-
03565A3818F0566F003AE91E /* InfoPlist.strings in Resources */,
13561355
);
13571356
runOnlyForDeploymentPostprocessing = 0;
13581357
};
@@ -1374,7 +1373,6 @@
13741373
isa = PBXResourcesBuildPhase;
13751374
buildActionMask = 2147483647;
13761375
files = (
1377-
D31108BA1828DB8700737925 /* InfoPlist.strings in Resources */,
13781376
);
13791377
runOnlyForDeploymentPostprocessing = 0;
13801378
};
@@ -1691,33 +1689,6 @@
16911689
};
16921690
/* End PBXTargetDependency section */
16931691

1694-
/* Begin PBXVariantGroup section */
1695-
030EF0B414632FD000B04273 /* InfoPlist.strings */ = {
1696-
isa = PBXVariantGroup;
1697-
children = (
1698-
030EF0B514632FD000B04273 /* en */,
1699-
);
1700-
name = InfoPlist.strings;
1701-
sourceTree = "<group>";
1702-
};
1703-
03565A3618F0566F003AE91E /* InfoPlist.strings */ = {
1704-
isa = PBXVariantGroup;
1705-
children = (
1706-
03565A3718F0566F003AE91E /* en */,
1707-
);
1708-
name = InfoPlist.strings;
1709-
sourceTree = "<group>";
1710-
};
1711-
D31108B81828DB8700737925 /* InfoPlist.strings */ = {
1712-
isa = PBXVariantGroup;
1713-
children = (
1714-
D31108B91828DB8700737925 /* en */,
1715-
);
1716-
name = InfoPlist.strings;
1717-
sourceTree = "<group>";
1718-
};
1719-
/* End PBXVariantGroup section */
1720-
17211692
/* Begin XCBuildConfiguration section */
17221693
030EF0D014632FD000B04273 /* Debug */ = {
17231694
isa = XCBuildConfiguration;

‎Source/OCMock/NSInvocation+OCMAdditions.m‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
*/
1616

1717
#import <objc/runtime.h>
18-
#import <Availability.h>
19-
#import <TargetConditionals.h>
2018
#import "NSInvocation+OCMAdditions.h"
19+
#import "OCMArg.h"
2120
#import "OCMFunctionsPrivate.h"
2221
#import "NSMethodSignature+OCMAdditions.h"
23-
#import "OCMArg.h"
2422

2523
#if (TARGET_OS_OSX && (!defined(__MAC_10_10) || __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_10)) || \
2624
(TARGET_OS_IPHONE && (!defined(__IPHONE_8_0) || __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0))

‎Source/OCMock/NSMethodSignature+OCMAdditions.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* under the License.
1515
*/
1616

17+
#import <objc/runtime.h>
1718
#import "NSMethodSignature+OCMAdditions.h"
1819
#import "OCMFunctionsPrivate.h"
19-
#import <objc/runtime.h>
2020

2121

2222
@implementation NSMethodSignature(OCMAdditions)

‎Source/OCMock/NSObject+OCMAdditions.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
* under the License.
1515
*/
1616

17+
#import <objc/runtime.h>
1718
#import "NSObject+OCMAdditions.h"
1819
#import "NSMethodSignature+OCMAdditions.h"
19-
#import <objc/runtime.h>
20+
2021

2122
@implementation NSObject(OCMAdditions)
2223

‎Source/OCMock/NSValue+OCMAdditions.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#import "NSValue+OCMAdditions.h"
1818
#import "OCMFunctionsPrivate.h"
1919

20+
2021
@implementation NSValue(OCMAdditions)
2122

2223
static NSNumber *OCMNumberForValue(NSValue *value)

‎Source/OCMock/OCClassMockObject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* under the License.
1515
*/
1616

17-
#import <OCMock/OCMockObject.h>
17+
#import "OCMockObject.h"
1818

1919
@interface OCClassMockObject : OCMockObject
2020

‎Source/OCMock/OCClassMockObject.m‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
#import <objc/runtime.h>
1818
#import "OCClassMockObject.h"
19-
#import "NSObject+OCMAdditions.h"
20-
#import "OCMFunctionsPrivate.h"
2119
#import "OCMInvocationStub.h"
20+
#import "OCMFunctionsPrivate.h"
2221
#import "NSMethodSignature+OCMAdditions.h"
22+
#import "NSObject+OCMAdditions.h"
23+
2324

2425
@interface OCClassMockObjectInstanceVars : NSObject
2526
@property (nonatomic) Class mockedClass;

‎Source/OCMock/OCMArg.m‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
*/
1616

1717
#import <objc/runtime.h>
18-
#import <OCMock/OCMArg.h>
19-
#import <OCMock/OCMConstraint.h>
20-
#import "OCMPassByRefSetter.h"
18+
#import "OCMArg.h"
2119
#import "OCMBlockArgCaller.h"
20+
#import "OCMConstraint.h"
21+
#import "OCMPassByRefSetter.h"
22+
2223

2324
@implementation OCMArg
2425

‎Source/OCMock/OCMBlockCaller.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#import <Foundation/Foundation.h>
1818

19-
2019
@interface OCMBlockCaller : NSObject
2120
{
2221
void (^block)(NSInvocation *);

0 commit comments

Comments
 (0)