Merge d830440d48a9502161448bc78be33a53388dd1f4 into f5260ae757

Closes #1830

PiperOrigin-RevId: 215563532
This commit is contained in:
1camper 2018-10-03 11:05:36 -04:00 committed by Gennadiy Civil
parent f5260ae757
commit bea3d61975

View File

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