This commit is contained in:
parent
a66d209061
commit
2a23ca0009
@ -556,7 +556,7 @@ TEST(CombineTest, NonDefaultConstructAssign) {
|
|||||||
Combine(Values(0, 1), Values(NonDefaultConstructAssignString("A"),
|
Combine(Values(0, 1), Values(NonDefaultConstructAssignString("A"),
|
||||||
NonDefaultConstructAssignString("B")));
|
NonDefaultConstructAssignString("B")));
|
||||||
|
|
||||||
ParamGenerator<tuple<int, NonDefaultConstructAssignString>>::iterator it =
|
ParamGenerator<tuple<int, NonDefaultConstructAssignString> >::iterator it =
|
||||||
gen.begin();
|
gen.begin();
|
||||||
|
|
||||||
EXPECT_EQ(0, std::get<0>(*it));
|
EXPECT_EQ(0, std::get<0>(*it));
|
||||||
@ -871,8 +871,8 @@ INSTANTIATE_TEST_CASE_P(AllAllowedCharacters,
|
|||||||
CustomParamNameFunctor());
|
CustomParamNameFunctor());
|
||||||
|
|
||||||
inline std::string CustomParamNameFunction(
|
inline std::string CustomParamNameFunction(
|
||||||
const ::testing::TestParamInfo<std::string>& info) {
|
const ::testing::TestParamInfo<std::string>& inf) {
|
||||||
return info.param;
|
return inf.param;
|
||||||
}
|
}
|
||||||
|
|
||||||
class CustomFunctionNamingTest : public TestWithParam<std::string> {};
|
class CustomFunctionNamingTest : public TestWithParam<std::string> {};
|
||||||
@ -893,8 +893,8 @@ TEST_P(CustomLambdaNamingTest, CustomTestNames) {}
|
|||||||
INSTANTIATE_TEST_CASE_P(CustomParamNameLambda,
|
INSTANTIATE_TEST_CASE_P(CustomParamNameLambda,
|
||||||
CustomLambdaNamingTest,
|
CustomLambdaNamingTest,
|
||||||
Values(std::string("LambdaName")),
|
Values(std::string("LambdaName")),
|
||||||
[](const ::testing::TestParamInfo<std::string>& inf) {
|
[](const ::testing::TestParamInfo<std::string>& info) {
|
||||||
return inf.param;
|
return info.param;
|
||||||
});
|
});
|
||||||
|
|
||||||
#endif // GTEST_LANG_CXX11
|
#endif // GTEST_LANG_CXX11
|
||||||
|
Loading…
Reference in New Issue
Block a user