Handle using nil as argument for andReturn in ObjC++ code. #404
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change breaks the build for me. When I change the file type back to Objective-C it works. The error is:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ahh.. that is probably an accidental mod when I changed the file to objc++ before I broke the tests out into their own files. No need to pull that across. Apologies.