eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makes ByRef(x) printable as a reference to x.

Browse Source
This commit is contained in:
zhanyong.wan 2009-07-20 21:16:35 +00:00
parent b5937dab69
commit 387bdd551d
4 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/gmock/gmock-generated-actions.h
View File

@ -39,6 +39,7 @@
#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
#include <gmock/gmock-actions.h>
#include <gmock/gmock-printers.h>
#include <gmock/internal/gmock-port.h>
namespace testing {
@ -321,6 +322,9 @@ class InvokeMethodAction {
const MethodPtr method_ptr_;
};
// TODO(wan@google.com): ReferenceWrapper and ByRef() are neither
// action-specific nor variadic. Move them to a better place.
// A ReferenceWrapper<T> object represents a reference to type T,
// which can be either const or not. It can be explicitly converted
// from, and implicitly converted to, a T&. Unlike a reference,
@ -341,6 +345,13 @@ class ReferenceWrapper {
T* pointer_;
};
// Allows the expression ByRef(x) to be printed as a reference to x.
template <typename T>
void PrintTo(const ReferenceWrapper<T>& ref, ::std::ostream* os) {
T& value = ref;
UniversalPrinter<T&>::Print(value, os);
}
// CallableHelper has static methods for invoking "callables",
// i.e. function pointers and functors. It uses overloading to
// provide a uniform interface for invoking different kinds of

11
include/gmock/gmock-generated-actions.h.pump
View File

@ -43,6 +43,7 @@ $$}} This meta comment fixes auto-indentation in editors.
#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
#include <gmock/gmock-actions.h>
#include <gmock/gmock-printers.h>
#include <gmock/internal/gmock-port.h>
namespace testing {
@ -123,6 +124,9 @@ class InvokeMethodAction {
const MethodPtr method_ptr_;
};
// TODO(wan@google.com): ReferenceWrapper and ByRef() are neither
// action-specific nor variadic. Move them to a better place.
// A ReferenceWrapper<T> object represents a reference to type T,
// which can be either const or not. It can be explicitly converted
// from, and implicitly converted to, a T&. Unlike a reference,
@ -143,6 +147,13 @@ class ReferenceWrapper {
T* pointer_;
};
// Allows the expression ByRef(x) to be printed as a reference to x.
template <typename T>
void PrintTo(const ReferenceWrapper<T>& ref, ::std::ostream* os) {
T& value = ref;
UniversalPrinter<T&>::Print(value, os);
}
// CallableHelper has static methods for invoking "callables",
// i.e. function pointers and functors. It uses overloading to
// provide a uniform interface for invoking different kinds of

1
scripts/gmock_doctor.py
View File

@ -71,7 +71,6 @@ _COMMON_GMOCK_SYMBOLS = [
'Not',
'NotNull',
'Pointee',
'PointeeIsInitializedProto',
'Property',
'Ref',
'ResultOf',

10
test/gmock-generated-actions_test.cc
View File

@ -36,6 +36,7 @@
#include <gmock/gmock-generated-actions.h>
#include <functional>
#include <sstream>
#include <string>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@ -546,6 +547,15 @@ TEST(ByRefTest, ExplicitType) {
// ByRef<Derived>(b);
}
// Tests that Google Mock prints expression ByRef(x) as a reference to x.
TEST(ByRefTest, PrintsCorrectly) {
int n = 42;
::std::stringstream expected, actual;
testing::internal::UniversalPrinter<const int&>::Print(n, &expected);
testing::internal::UniversalPrint(ByRef(n), &actual);
EXPECT_EQ(expected.str(), actual.str());
}
// Tests InvokeArgument<N>(...).
// Tests using InvokeArgument with a nullary function.