diff options
author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-06-11 20:07:00 +0000 |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-06-11 20:07:00 +0000 |
commit | 34d57f3612417aacdc33f4fc779538818aa6614f (patch) | |
tree | 3a9e718fed1d8b2a60eceb5a58fe0e5f0f836df2 | |
parent | 12206f1b7469f4f8c7acd4b5625f3ff95351af2a (diff) | |
download | googlemock-34d57f3612417aacdc33f4fc779538818aa6614f.tar.gz |
Removes the .WithArguments() clause from ON_CALL and EXPECT_CALL.
git-svn-id: http://googlemock.googlecode.com/svn/trunk@172 8415998a-534a-0410-bf83-d39667b30386
-rw-r--r-- | include/gmock/gmock-spec-builders.h | 14 | ||||
-rw-r--r-- | test/gmock-spec-builders_test.cc | 28 |
2 files changed, 0 insertions, 42 deletions
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h index b570c00..a22bcd1 100644 --- a/include/gmock/gmock-spec-builders.h +++ b/include/gmock/gmock-spec-builders.h @@ -163,14 +163,6 @@ class DefaultActionSpec { return *this; } - // Implements the .WithArguments() clause as a synonym of .With() - // for backward compatibility. WithArguments() is deprecated and - // new code should always use With(), as .With(Args<1, 2>(m)) is - // clearer than .WithArguments(Args<1, 2>(m)). - DefaultActionSpec& WithArguments(const Matcher<const ArgumentTuple&>& m) { - return With(m); - } - // Implements the .WillByDefault() clause. DefaultActionSpec& WillByDefault(const Action<F>& action) { ExpectSpecProperty(last_clause_ < kWillByDefault, @@ -615,12 +607,6 @@ class Expectation : public ExpectationBase { return *this; } - // Implements the .WithArguments() clause as a synonym of .With(). - // This is deprecated and new code should always use With(). - Expectation& WithArguments(const Matcher<const ArgumentTuple&>& m) { - return With(m); - } - // Implements the .Times() clause. Expectation& Times(const Cardinality& cardinality) { if (last_clause_ ==kTimes) { diff --git a/test/gmock-spec-builders_test.cc b/test/gmock-spec-builders_test.cc index 2462137..058d343 100644 --- a/test/gmock-spec-builders_test.cc +++ b/test/gmock-spec-builders_test.cc @@ -194,21 +194,6 @@ TEST(OnCallSyntaxTest, WithCanAppearAtMostOnce) { }, ".With() cannot appear more than once in an ON_CALL()"); } -TEST(OnCallSyntaxTest, WithArgumentsIsSynonymOfWith) { - MockA a; - ON_CALL(a, ReturnInt(_, _)) - .WithArguments(Lt()) - .WillByDefault(Return(1)); - ON_CALL(a, ReturnInt(_, _)) - .WithArguments(Gt()) - .WillByDefault(Return(2)); - EXPECT_CALL(a, ReturnInt(_, _)) - .Times(AnyNumber()); - - EXPECT_EQ(1, a.ReturnInt(1, 2)); - EXPECT_EQ(2, a.ReturnInt(2, 1)); -} - #if GTEST_HAS_DEATH_TEST TEST(OnCallSyntaxTest, WillByDefaultIsMandatory) { @@ -296,19 +281,6 @@ TEST(ExpectCallSyntaxTest, WithMustBeFirstClause) { a.DoA(2); } -TEST(ExpectCallSyntaxTest, WithArgumentsIsSynonymOfWith) { - MockA a; - EXPECT_CALL(a, ReturnInt(_, _)) - .WithArguments(Lt()) - .WillOnce(Return(1)); - EXPECT_CALL(a, ReturnInt(_, _)) - .WithArguments(Gt()) - .WillOnce(Return(2)); - - EXPECT_EQ(1, a.ReturnInt(1, 2)); - EXPECT_EQ(2, a.ReturnInt(2, 1)); -} - TEST(ExpectCallSyntaxTest, TimesCanBeInferred) { MockA a; |