Skip to content

Commit da28d71

Browse files
committed
Remove +constraint method
Most constraints now require init values, so having `+constraint` is relatively useless.
1 parent 2b6f0c8 commit da28d71

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

Source/OCMock/NSInvocation+OCMAdditions.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#import "NSInvocation+OCMAdditions.h"
1919
#import "NSMethodSignature+OCMAdditions.h"
2020
#import "OCMArg.h"
21+
#import "OCMConstraint.h"
2122
#import "OCMFunctionsPrivate.h"
2223

2324
#if(TARGET_OS_OSX && (!defined(__MAC_10_10) || __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_10)) || \

Source/OCMock/OCMArg.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ @implementation OCMArg
2525

2626
+ (id)any
2727
{
28-
return [OCMAnyConstraint constraint];
28+
return [[[OCMAnyConstraint alloc] init] autorelease];
2929
}
3030

3131
+ (void *)anyPointer
@@ -45,12 +45,12 @@ + (SEL)anySelector
4545

4646
+ (id)isNil
4747
{
48-
return [OCMIsNilConstraint constraint];
48+
return [[OCMIsNilConstraint alloc] init];
4949
}
5050

5151
+ (id)isNotNil
5252
{
53-
return [OCMIsNotNilConstraint constraint];
53+
return [[OCMIsNotNilConstraint alloc] init];
5454
}
5555

5656
+ (id)isEqual:(id)value

Source/OCMock/OCMConstraint.h

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

1919
@interface OCMConstraint : NSObject
2020

21-
+ (instancetype)constraint;
2221
- (BOOL)evaluate:(id)value;
2322

2423
// if you are looking for any, isNil, etc, they have moved to OCMArg

Source/OCMock/OCMConstraint.m

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020

2121
@implementation OCMConstraint
2222

23-
+ (instancetype)constraint
24-
{
25-
return [[[self alloc] init] autorelease];
26-
}
27-
2823
- (BOOL)evaluate:(id)value
2924
{
3025
return NO;

Source/OCMockTests/OCMConstraintTests.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ - (void)setUp
4747

4848
- (void)testAnyAcceptsAnything
4949
{
50-
OCMConstraint *constraint = [OCMAnyConstraint constraint];
50+
OCMConstraint *constraint = [[OCMAnyConstraint alloc] init];
5151
XCTAssertTrue([constraint evaluate:@"foo"], @"Should have accepted a value.");
5252
XCTAssertTrue([constraint evaluate:@"bar"], @"Should have accepted another value.");
5353
XCTAssertTrue([constraint evaluate:nil], @"Should have accepted nil.");
5454
}
5555

5656
- (void)testIsNilAcceptsOnlyNil
5757
{
58-
OCMConstraint *constraint = [OCMIsNilConstraint constraint];
58+
OCMConstraint *constraint = [[OCMIsNilConstraint alloc] init];
5959

6060
XCTAssertFalse([constraint evaluate:@"foo"], @"Should not have accepted a value.");
6161
XCTAssertTrue([constraint evaluate:nil], @"Should have accepted nil.");
6262
}
6363

6464
- (void)testIsNotNilAcceptsAnythingButNil
6565
{
66-
OCMConstraint *constraint = [OCMIsNotNilConstraint constraint];
66+
OCMConstraint *constraint = [[OCMIsNotNilConstraint alloc] init];
6767

6868
XCTAssertTrue([constraint evaluate:@"foo"], @"Should have accepted a value.");
6969
XCTAssertFalse([constraint evaluate:nil], @"Should not have accepted nil.");

0 commit comments

Comments
 (0)