Skip to content

GitLab

Commit 2a23ca00 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files

https://travis-ci.org/google/googletest/jobs/340995238

parent a66d2090
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
googletest/test/gtest-param-test_test.cc
View file @ 2a23ca00
...@@ -556,7 +556,7 @@ TEST(CombineTest, NonDefaultConstructAssign) { ...@@ -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, ...@@ -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) {} ...@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment