gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS

Browse Source
This commit is contained in:
Herbert Thielen
2017-09-08 11:47:14 +02:00
committed by GitHub
parent aa0b5458a1 894cdb82cb
commit c86fbd766b
6 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
googletest/test/gtest-param-test_test.cc
View File

@@ -855,8 +855,8 @@ TEST_P(CustomLambdaNamingTest, CustomTestNames) {}
INSTANTIATE_TEST_CASE_P(CustomParamNameLambda,
CustomLambdaNamingTest,
Values(std::string("LambdaName")),
[](const ::testing::TestParamInfo<std::string>& info) {
return info.param;
[](const ::testing::TestParamInfo<std::string>& tpinfo) {
return tpinfo.param;
});
#endif // GTEST_LANG_CXX11

2
googletest/test/gtest_unittest.cc
View File

@@ -2096,7 +2096,7 @@ class UnitTestRecordPropertyTestEnvironment : public Environment {
};
// This will test property recording outside of any test or test case.
static Environment* record_property_env =
Environment* record_property_env GTEST_ATTRIBUTE_UNUSED_ =
AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment);
// This group of tests is for predicate assertions (ASSERT_PRED*, etc)