diff options
| author | sdefresne@chromium.org <sdefresne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 11:31:31 +0000 |
|---|---|---|
| committer | sdefresne@chromium.org <sdefresne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 11:31:31 +0000 |
| commit | 06da49016a8294e1edf46762aa8a83a00f3b0150 (patch) | |
| tree | 0ae8917d2af27427c234c6205b0831444b71f219 | |
| parent | 989849944765fd2198795fdc18b49c32527591c5 (diff) | |
| download | chromium_src-06da49016a8294e1edf46762aa8a83a00f3b0150.zip chromium_src-06da49016a8294e1edf46762aa8a83a00f3b0150.tar.gz chromium_src-06da49016a8294e1edf46762aa8a83a00f3b0150.tar.bz2 | |
Add missing selector to mocked object to fix unit tests with Xcode 5
Unit tests on iOS were broken with Xcode 5 due to the absence of the selector
copyWithZone: from the mocked object. Add the missing selector.
This patches in OCMock e8a9cc97936bfa8be97706c5092110603745e708, "Small changes
for compatibility with Xcode 5 Preview."
BUG=256608,256607
TEST=None
Review URL: https://codereview.chromium.org/186193003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255011 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | third_party/ocmock/OCMock/OCMConstraint.m | 4 | ||||
| -rw-r--r-- | third_party/ocmock/README.chromium | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/third_party/ocmock/OCMock/OCMConstraint.m b/third_party/ocmock/OCMock/OCMConstraint.m index e70e259..b4535a4 100644 --- a/third_party/ocmock/OCMock/OCMConstraint.m +++ b/third_party/ocmock/OCMock/OCMConstraint.m @@ -18,6 +18,10 @@ return NO; } +- (id)copyWithZone:(NSZone *)zone +{ + return [self retain]; +} + (id)constraintWithSelector:(SEL)aSelector onObject:(id)anObject { diff --git a/third_party/ocmock/README.chromium b/third_party/ocmock/README.chromium index 436e321..a146526 100644 --- a/third_party/ocmock/README.chromium +++ b/third_party/ocmock/README.chromium @@ -23,3 +23,6 @@ Chromium adds gtest_support.h/.mm and ocmock_extensions.h/.mm. Chromium alters all NSLogging of -[NSArray count] to compile under both 32 and 64 bits. + +Chromium also patches in e8a9cc97936bfa8be97706c5092110603745e708 for fixing +unit tests broken with Xcode 5 due to the lack of copyWithZone: selector. |