Implements .With() as a synonym of .WithArguments(); implements AllArgs(m) as a synonym of m; relies on gtest-port to #include tuple; fixes a compatibility with Symbian.
diff --git a/include/gmock/gmock-matchers.h b/include/gmock/gmock-matchers.h
index f4d5b0a..dc252e3 100644
--- a/include/gmock/gmock-matchers.h
+++ b/include/gmock/gmock-matchers.h
@@ -2354,6 +2354,16 @@
return testing::Matches(matcher)(value);
}
+// AllArgs(m) is a synonym of m. This is useful in
+//
+// EXPECT_CALL(foo, Bar(_, _)).With(AllArgs(Eq()));
+//
+// which is easier to read than
+//
+// EXPECT_CALL(foo, Bar(_, _)).With(Eq());
+template <typename InnerMatcher>
+inline InnerMatcher AllArgs(const InnerMatcher& matcher) { return matcher; }
+
// These macros allow using matchers to check values in Google Test
// tests. ASSERT_THAT(value, matcher) and EXPECT_THAT(value, matcher)
// succeed iff the value matches the matcher. If the assertion fails,
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h
index c002ae7..b570c00 100644
--- a/include/gmock/gmock-spec-builders.h
+++ b/include/gmock/gmock-spec-builders.h
@@ -37,16 +37,16 @@
// a mock method. The syntax is:
//
// ON_CALL(mock_object, Method(argument-matchers))
-// .WithArguments(multi-argument-matcher)
+// .With(multi-argument-matcher)
// .WillByDefault(action);
//
-// where the .WithArguments() clause is optional.
+// where the .With() clause is optional.
//
// A user can use the EXPECT_CALL() macro to specify an expectation on
// a mock method. The syntax is:
//
// EXPECT_CALL(mock_object, Method(argument-matchers))
-// .WithArguments(multi-argument-matchers)
+// .With(multi-argument-matchers)
// .Times(cardinality)
// .InSequence(sequences)
// .WillOnce(action)
@@ -144,31 +144,39 @@
// bug in Symbian's C++ compiler (cannot decide between two
// overloaded constructors of Matcher<const ArgumentTuple&>).
extra_matcher_(A<const ArgumentTuple&>()),
- last_clause_(NONE) {
+ last_clause_(kNone) {
}
// Where in the source file was the default action spec defined?
const char* file() const { return file_; }
int line() const { return line_; }
- // Implements the .WithArguments() clause.
- DefaultActionSpec& WithArguments(const Matcher<const ArgumentTuple&>& m) {
+ // Implements the .With() clause.
+ DefaultActionSpec& With(const Matcher<const ArgumentTuple&>& m) {
// Makes sure this is called at most once.
- ExpectSpecProperty(last_clause_ < WITH_ARGUMENTS,
- ".WithArguments() cannot appear "
+ ExpectSpecProperty(last_clause_ < kWith,
+ ".With() cannot appear "
"more than once in an ON_CALL().");
- last_clause_ = WITH_ARGUMENTS;
+ last_clause_ = kWith;
extra_matcher_ = m;
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_ < WILL_BY_DEFAULT,
+ ExpectSpecProperty(last_clause_ < kWillByDefault,
".WillByDefault() must appear "
"exactly once in an ON_CALL().");
- last_clause_ = WILL_BY_DEFAULT;
+ last_clause_ = kWillByDefault;
ExpectSpecProperty(!action.IsDoDefault(),
"DoDefault() cannot be used in ON_CALL().");
@@ -183,7 +191,7 @@
// Returns the action specified by the user.
const Action<F>& GetAction() const {
- AssertSpecProperty(last_clause_ == WILL_BY_DEFAULT,
+ AssertSpecProperty(last_clause_ == kWillByDefault,
".WillByDefault() must appear exactly "
"once in an ON_CALL().");
return action_;
@@ -193,9 +201,9 @@
enum Clause {
// Do not change the order of the enum members! The run-time
// syntax checking relies on it.
- NONE,
- WITH_ARGUMENTS,
- WILL_BY_DEFAULT,
+ kNone,
+ kWith,
+ kWillByDefault,
};
// Asserts that the ON_CALL() statement has a certain property.
@@ -211,7 +219,7 @@
// The information in statement
//
// ON_CALL(mock_object, Method(matchers))
- // .WithArguments(multi-argument-matcher)
+ // .With(multi-argument-matcher)
// .WillByDefault(action);
//
// is recorded in the data members like this:
@@ -228,7 +236,7 @@
Action<F> action_;
// The last clause in the ON_CALL() statement as seen so far.
- // Initially NONE and changes as the statement is parsed.
+ // Initially kNone and changes as the statement is parsed.
Clause last_clause_;
}; // class DefaultActionSpec
@@ -437,13 +445,13 @@
enum Clause {
// Don't change the order of the enum members!
- NONE,
- WITH_ARGUMENTS,
- TIMES,
- IN_SEQUENCE,
- WILL_ONCE,
- WILL_REPEATEDLY,
- RETIRES_ON_SATURATION,
+ kNone,
+ kWith,
+ kTimes,
+ kInSequence,
+ kWillOnce,
+ kWillRepeatedly,
+ kRetiresOnSaturation,
};
// Asserts that the EXPECT_CALL() statement has the given property.
@@ -581,7 +589,7 @@
repeated_action_specified_(false),
repeated_action_(DoDefault()),
retires_on_saturation_(false),
- last_clause_(NONE),
+ last_clause_(kNone),
action_count_checked_(false) {}
virtual ~Expectation() {
@@ -590,36 +598,42 @@
CheckActionCountIfNotDone();
}
- // Implements the .WithArguments() clause.
- Expectation& WithArguments(const Matcher<const ArgumentTuple&>& m) {
- if (last_clause_ == WITH_ARGUMENTS) {
+ // Implements the .With() clause.
+ Expectation& With(const Matcher<const ArgumentTuple&>& m) {
+ if (last_clause_ == kWith) {
ExpectSpecProperty(false,
- ".WithArguments() cannot appear "
+ ".With() cannot appear "
"more than once in an EXPECT_CALL().");
} else {
- ExpectSpecProperty(last_clause_ < WITH_ARGUMENTS,
- ".WithArguments() must be the first "
+ ExpectSpecProperty(last_clause_ < kWith,
+ ".With() must be the first "
"clause in an EXPECT_CALL().");
}
- last_clause_ = WITH_ARGUMENTS;
+ last_clause_ = kWith;
extra_matcher_ = m;
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_ ==TIMES) {
+ if (last_clause_ ==kTimes) {
ExpectSpecProperty(false,
".Times() cannot appear "
"more than once in an EXPECT_CALL().");
} else {
- ExpectSpecProperty(last_clause_ < TIMES,
+ ExpectSpecProperty(last_clause_ < kTimes,
".Times() cannot appear after "
".InSequence(), .WillOnce(), .WillRepeatedly(), "
"or .RetiresOnSaturation().");
}
- last_clause_ = TIMES;
+ last_clause_ = kTimes;
ExpectationBase::SpecifyCardinality(cardinality);
return *this;
@@ -632,11 +646,11 @@
// Implements the .InSequence() clause.
Expectation& InSequence(const Sequence& s) {
- ExpectSpecProperty(last_clause_ <= IN_SEQUENCE,
+ ExpectSpecProperty(last_clause_ <= kInSequence,
".InSequence() cannot appear after .WillOnce(),"
" .WillRepeatedly(), or "
".RetiresOnSaturation().");
- last_clause_ = IN_SEQUENCE;
+ last_clause_ = kInSequence;
s.AddExpectation(owner_->GetLinkedExpectationBase(this));
return *this;
@@ -660,10 +674,10 @@
// Implements the .WillOnce() clause.
Expectation& WillOnce(const Action<F>& action) {
- ExpectSpecProperty(last_clause_ <= WILL_ONCE,
+ ExpectSpecProperty(last_clause_ <= kWillOnce,
".WillOnce() cannot appear after "
".WillRepeatedly() or .RetiresOnSaturation().");
- last_clause_ = WILL_ONCE;
+ last_clause_ = kWillOnce;
actions_.push_back(action);
if (!cardinality_specified()) {
@@ -674,16 +688,16 @@
// Implements the .WillRepeatedly() clause.
Expectation& WillRepeatedly(const Action<F>& action) {
- if (last_clause_ == WILL_REPEATEDLY) {
+ if (last_clause_ == kWillRepeatedly) {
ExpectSpecProperty(false,
".WillRepeatedly() cannot appear "
"more than once in an EXPECT_CALL().");
} else {
- ExpectSpecProperty(last_clause_ < WILL_REPEATEDLY,
+ ExpectSpecProperty(last_clause_ < kWillRepeatedly,
".WillRepeatedly() cannot appear "
"after .RetiresOnSaturation().");
}
- last_clause_ = WILL_REPEATEDLY;
+ last_clause_ = kWillRepeatedly;
repeated_action_specified_ = true;
repeated_action_ = action;
@@ -699,10 +713,10 @@
// Implements the .RetiresOnSaturation() clause.
Expectation& RetiresOnSaturation() {
- ExpectSpecProperty(last_clause_ < RETIRES_ON_SATURATION,
+ ExpectSpecProperty(last_clause_ < kRetiresOnSaturation,
".RetiresOnSaturation() cannot appear "
"more than once.");
- last_clause_ = RETIRES_ON_SATURATION;
+ last_clause_ = kRetiresOnSaturation;
retires_on_saturation_ = true;
// Now that no more action clauses can be specified, we check
@@ -717,7 +731,7 @@
return matchers_;
}
- // Returns the matcher specified by the .WithArguments() clause.
+ // Returns the matcher specified by the .With() clause.
const Matcher<const ArgumentTuple&>& extra_matcher() const {
return extra_matcher_;
}
diff --git a/include/gmock/gmock.h b/include/gmock/gmock.h
index 22e7028..29d9727 100644
--- a/include/gmock/gmock.h
+++ b/include/gmock/gmock.h
@@ -39,14 +39,14 @@
// This file implements the following syntax:
//
// ON_CALL(mock_object.Method(...))
-// .WithArguments(...) ?
+// .With(...) ?
// .WillByDefault(...);
//
-// where WithArguments() is optional and WillByDefault() must appear
-// exactly once.
+// where With() is optional and WillByDefault() must appear exactly
+// once.
//
// EXPECT_CALL(mock_object.Method(...))
-// .WithArguments(...) ?
+// .With(...) ?
// .Times(...) ?
// .InSequence(...) *
// .WillOnce(...) *
diff --git a/include/gmock/internal/gmock-port.h b/include/gmock/internal/gmock-port.h
index 75be9ed..9ee8f72 100644
--- a/include/gmock/internal/gmock-port.h
+++ b/include/gmock/internal/gmock-port.h
@@ -47,18 +47,8 @@
// To avoid conditional compilation everywhere, we make it
// gmock-port.h's responsibility to #include the header implementing
-// tr1/tuple.
-#if defined(__GNUC__) && GTEST_GCC_VER_ >= 40000
-// GTEST_GCC_VER_ is defined in gtest-port.h and 40000 corresponds to
-// version 4.0.0.
-// GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header. This does
-// not conform to the TR1 spec, which requires the header to be <tuple>.
-#include <tr1/tuple>
-#else
-// If the compiler is not GCC 4.0+, we assume the user is using a
-// spec-conforming TR1 implementation.
-#include <tuple>
-#endif // __GNUC__
+// tr1/tuple. gmock-port.h does this via gtest-port.h, which is
+// guaranteed to pull in the tuple header.
#if GTEST_OS_LINUX