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

Merge branch 'master' of https://github.com/google/googletest

Browse Source
This commit is contained in:
Jerry Turcios 2018-10-04 07:41:43 -04:00
commit 50ec6ee33c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
googletest/include/gtest/gtest.h
View File

@ -1815,11 +1815,8 @@ class WithParamInterface {
virtual ~WithParamInterface() {} virtual ~WithParamInterface() {}
// The current parameter value. Is also available in the test fixture's // The current parameter value. Is also available in the test fixture's
// constructor. This member function is non-static, even though it only // constructor.
// references static data, to reduce the opportunity for incorrect uses static const ParamType& GetParam() {
// like writing 'WithParamInterface<bool>::GetParam()' for a test that
// uses a fixture whose parameter type is int.
const ParamType& GetParam() const {
GTEST_CHECK_(parameter_ != NULL) GTEST_CHECK_(parameter_ != NULL)
<< "GetParam() can only be called inside a value-parameterized test " << "GetParam() can only be called inside a value-parameterized test "
<< "-- did you intend to write TEST_P instead of TEST_F?"; << "-- did you intend to write TEST_P instead of TEST_F?";