forked from erikdoe/ocmock
-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feature/update ocmock #10
Closed
Closed
Conversation
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
# Conflicts: # Source/OCMock.xcodeproj/project.pbxproj # Source/OCMock/OCMockObject.m
Fix up printf specifiers for NSUInteger types.
Remove duplicate header from copy headers phase.
In cases where people are doing things like NSBundle *foo = OCClassMock([NSBundle class]) or id<MyProtocol> bar = OCClassMock([MyClass class]) calling OCMVerifyAll or OCMVerifyAllWithDelay requires a cast to (OCMockObject *) so that the verify methods can be found. This makes it so callers don't have to constantly do OCMVerifyAll((id)bar) or something similar.
Previous code would only catch references to self when using the OCMStub/OCMExpect macros. Now we avoid self referential retain loops if you use the `[[[foo stub] andReturn:foo] sharedInstance]` API.
Fix up printf specifiers
Fix up duplicate header copy
Cast mock arguments in OCMVerify* macros
…maclach-returnValue
…twitterkb/ocmock into twitterkb-Xcode-clang-false-positives-456
…maclach-encodings
…dmaclach-lazy_mocks # Conflicts: # Source/OCMock/OCMockObject.m
…into dmaclach-partial_proxies
…into matrush-fixQuantifierTests
…into matrush-disableXCTestMacro
This is somewhat pointless because (at least now) the recorder's `init` method will always throw an exception. It avoids an analyser warning, though. See erikdoe#456 for details.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
resolveClassMethod:
from having a forwarder set up for it.-Wmisleading-indentation
.[OCM anyPointer]
to invocation descriptionsbyref
sometimes just returns 'R' as encoding.