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/test/gmock_output_test_.cc b/test/gmock_output_test_.cc
index 97619af..8244f10 100644
--- a/test/gmock_output_test_.cc
+++ b/test/gmock_output_test_.cc
@@ -177,19 +177,19 @@
foo_.Bar(s, 0, 0);
}
-TEST_F(GMockOutputTest, MismatchWithArguments) {
+TEST_F(GMockOutputTest, MismatchWith) {
EXPECT_CALL(foo_, Bar2(Ge(2), Ge(1)))
- .WithArguments(Ge());
+ .With(Ge());
- foo_.Bar2(2, 3); // Mismatch WithArguments()
+ foo_.Bar2(2, 3); // Mismatch With()
foo_.Bar2(2, 1);
}
-TEST_F(GMockOutputTest, MismatchArgumentsAndWithArguments) {
+TEST_F(GMockOutputTest, MismatchArgumentsAndWith) {
EXPECT_CALL(foo_, Bar2(Ge(2), Ge(1)))
- .WithArguments(Ge());
+ .With(Ge());
- foo_.Bar2(1, 3); // Mismatch arguments and mismatch WithArguments()
+ foo_.Bar2(1, 3); // Mismatch arguments and mismatch With()
foo_.Bar2(2, 1);
}