gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds a cmake target for gmock_ex_test; also fixes name shadowing warnings.

Browse Source
This commit is contained in:
zhanyong.wan
2013-03-01 21:28:40 +00:00
parent c896504e41
commit a1a98f840e
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -103,6 +103,7 @@ if (gmock_build_tests)
cxx_test(gmock-actions_test gmock_main)
cxx_test(gmock-cardinalities_test gmock_main)
cxx_test(gmock_ex_test gmock_main)
cxx_test(gmock-generated-actions_test gmock_main)
cxx_test(gmock-generated-function-mockers_test gmock_main)
cxx_test(gmock-generated-internal-utils_test gmock_main)

14
test/gmock-actions_test.cc
View File

@@ -323,9 +323,9 @@ TEST(DefaultValueOfReferenceDeathTest, GetReturnsBuiltInDefaultValueWhenUnset) {
// Tests that ActionInterface can be implemented by defining the
// Perform method.
typedef int MyFunction(bool, int);
typedef int MyGlobalFunction(bool, int);
class MyActionImpl : public ActionInterface<MyFunction> {
class MyActionImpl : public ActionInterface<MyGlobalFunction> {
public:
virtual int Perform(const tuple<bool, int>& args) {
return get<0>(args) ? get<1>(args) : 0;
@@ -338,7 +338,7 @@ TEST(ActionInterfaceTest, CanBeImplementedByDefiningPerform) {
}
TEST(ActionInterfaceTest, MakeAction) {
Action<MyFunction> action = MakeAction(new MyActionImpl);
Action<MyGlobalFunction> action = MakeAction(new MyActionImpl);
// When exercising the Perform() method of Action<F>, we must pass
// it a tuple whose size and type are compatible with F's argument
@@ -351,12 +351,12 @@ TEST(ActionInterfaceTest, MakeAction) {
// Tests that Action<F> can be contructed from a pointer to
// ActionInterface<F>.
TEST(ActionTest, CanBeConstructedFromActionInterface) {
Action<MyFunction> action(new MyActionImpl);
Action<MyGlobalFunction> action(new MyActionImpl);
}
// Tests that Action<F> delegates actual work to ActionInterface<F>.
TEST(ActionTest, DelegatesWorkToActionInterface) {
const Action<MyFunction> action(new MyActionImpl);
const Action<MyGlobalFunction> action(new MyActionImpl);
EXPECT_EQ(5, action.Perform(make_tuple(true, 5)));
EXPECT_EQ(0, action.Perform(make_tuple(false, 1)));
@@ -364,8 +364,8 @@ TEST(ActionTest, DelegatesWorkToActionInterface) {
// Tests that Action<F> can be copied.
TEST(ActionTest, IsCopyable) {
Action<MyFunction> a1(new MyActionImpl);
Action<MyFunction> a2(a1); // Tests the copy constructor.
Action<MyGlobalFunction> a1(new MyActionImpl);
Action<MyGlobalFunction> a2(a1); // Tests the copy constructor.
// a1 should continue to work after being copied from.
EXPECT_EQ(5, a1.Perform(make_tuple(true, 5)));