-
Notifications
You must be signed in to change notification settings - Fork 609
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Handle using nil as argument for andReturn in ObjC++ code.
Fix for #403. This improves the special case handling of passing nil in return values to handle C++ cases that previously weren't working. Adds tests for C++11 and C++98 variants. To test fully tests need to be executed in both 32bit and 64 bit modes.
- Loading branch information
Showing
6 changed files
with
171 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Copyright (c) 2020 Erik Doernenburg and contributors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
| * not use these files except in compliance with the License. You may obtain | ||
| * a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| #import <XCTest/XCTest.h> | ||
| #import <OCMock/OCMock.h> | ||
|
|
||
| #if !defined(__cplusplus) | ||
| #error This file must be compiled with C++ | ||
| #endif | ||
|
|
||
| #if !__has_feature(cxx_nullptr) | ||
| #error This file must be compiled with a version of C++ that supports nullptr | ||
| #endif | ||
|
|
||
| @interface OCMCPlusPlus11Tests : XCTestCase | ||
| @end | ||
|
|
||
|
|
||
| @implementation OCMCPlusPlus11Tests | ||
|
|
||
| - (void)testSetsUpStubReturningNilForIdReturnType | ||
| { | ||
| id mock = OCMPartialMock([NSArray arrayWithObject:@"Foo"]); | ||
|
|
||
| OCMExpect([mock lastObject]).andReturn(nil); | ||
| XCTAssertNil([mock lastObject], @"Should have returned stubbed value"); | ||
|
|
||
| OCMExpect([mock lastObject]).andReturn(Nil); | ||
| XCTAssertNil([mock lastObject], @"Should have returned stubbed value"); | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Copyright (c) 2020 Erik Doernenburg and contributors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
| * not use these files except in compliance with the License. You may obtain | ||
| * a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| #import <XCTest/XCTest.h> | ||
| #import <OCMock/OCMock.h> | ||
|
|
||
| #if !defined(__cplusplus) | ||
| #error This file must be compiled with C++ | ||
| #endif | ||
|
|
||
| #if __has_feature(cxx_nullptr) | ||
| #error This file must be compiled with a version of C++ (98) that doesn't support nullptr | ||
| #endif | ||
|
|
||
| @interface OCMCPlusPlus98Tests : XCTestCase | ||
| @end | ||
|
|
||
|
|
||
| @implementation OCMCPlusPlus98Tests | ||
|
|
||
| - (void)testSetsUpStubReturningNilForIdReturnType | ||
| { | ||
| id mock = OCMPartialMock([NSArray arrayWithObject:@"Foo"]); | ||
|
|
||
| OCMExpect([mock lastObject]).andReturn(nil); | ||
| XCTAssertNil([mock lastObject], @"Should have returned stubbed value"); | ||
|
|
||
| OCMExpect([mock lastObject]).andReturn(Nil); | ||
| XCTAssertNil([mock lastObject], @"Should have returned stubbed value"); | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters