diff options
author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-21 16:03:44 +0000 |
---|---|---|
committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-21 16:03:44 +0000 |
commit | 5849bc7c3056c81153d5831e6834de15f2567132 (patch) | |
tree | a5addd401c705a5bb7b4f1e7d240996d6ac356d8 /third_party/ocmock/OCMock/OCMockObjectTests.m | |
parent | 14e5bca82b5ac6f0a2b59d087d3f38e19017c127 (diff) | |
download | chromium_src-5849bc7c3056c81153d5831e6834de15f2567132.zip chromium_src-5849bc7c3056c81153d5831e6834de15f2567132.tar.gz chromium_src-5849bc7c3056c81153d5831e6834de15f2567132.tar.bz2 |
Roll OCMock r54:55 to pull in some memory and warning fixes.
BUG=32564
TEST=Trybots
Review URL: http://codereview.chromium.org/554030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ocmock/OCMock/OCMockObjectTests.m')
-rw-r--r-- | third_party/ocmock/OCMock/OCMockObjectTests.m | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/third_party/ocmock/OCMock/OCMockObjectTests.m b/third_party/ocmock/OCMock/OCMockObjectTests.m index 942cffd..cd8dbe3 100644 --- a/third_party/ocmock/OCMock/OCMockObjectTests.m +++ b/third_party/ocmock/OCMock/OCMockObjectTests.m @@ -1,5 +1,5 @@ //--------------------------------------------------------------------------------------- -// $Id: OCMockObjectTests.m 54 2009-08-18 06:27:36Z erik $ +// $Id: OCMockObjectTests.m 55 2009-10-16 06:42:18Z erik $ // Copyright (c) 2004-2008 by Mulle Kybernetik. See License file for details. //--------------------------------------------------------------------------------------- @@ -217,6 +217,36 @@ static NSString *TestNotification = @"TestNotification"; } +- (void)testCanPassMocksAsArguments +{ + id mockArg = [OCMockObject mockForClass:[NSString class]]; + [[mock stub] stringByAppendingString:[OCMArg any]]; + [mock stringByAppendingString:mockArg]; +} + +- (void)testCanStubWithMockArguments +{ + id mockArg = [OCMockObject mockForClass:[NSString class]]; + [[mock stub] stringByAppendingString:mockArg]; + [mock stringByAppendingString:mockArg]; +} + +- (void)testRaisesExceptionWhenStubbedMockArgIsNotUsed +{ + id mockArg = [OCMockObject mockForClass:[NSString class]]; + [[mock stub] stringByAppendingString:mockArg]; + STAssertThrows([mock stringByAppendingString:@"foo"], @"Should have raised an exception."); +} + +- (void)testRaisesExceptionWhenDifferentMockArgumentIsPassed +{ + id expectedArg = [OCMockObject mockForClass:[NSString class]]; + id otherArg = [OCMockObject mockForClass:[NSString class]]; + [[mock stub] stringByAppendingString:otherArg]; + STAssertThrows([mock stringByAppendingString:expectedArg], @"Should have raised an exception."); +} + + // -------------------------------------------------------------------------------------- // returning values from stubbed methods // -------------------------------------------------------------------------------------- |