summaryrefslogtreecommitdiffstats
path: root/googletest/include
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2019-10-16 15:45:27 (GMT)
committerAndy Soffer <asoffer@google.com>2019-10-16 18:32:23 (GMT)
commit4c25e2b87fcb78abcfdee2739db9ed7a19754cd3 (patch)
tree8b82ac1283f1760fe34c96e7f378e4beb7a0f265 /googletest/include
parent9e466f1eb0fa4eb8cd391c6fed2b8bcb24b590ab (diff)
downloadgoogletest-4c25e2b87fcb78abcfdee2739db9ed7a19754cd3.zip
googletest-4c25e2b87fcb78abcfdee2739db9ed7a19754cd3.tar.gz
googletest-4c25e2b87fcb78abcfdee2739db9ed7a19754cd3.tar.bz2
Googletest export
Remove a test case rendered obsolete by disallowing empty argument for INSTANTIATE_TEST_SUITE_P. Remove the code that it was testing. PiperOrigin-RevId: 275040108
Diffstat (limited to 'googletest/include')
-rw-r--r--googletest/include/gtest/internal/gtest-param-util.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/googletest/include/gtest/internal/gtest-param-util.h b/googletest/include/gtest/internal/gtest-param-util.h
index 9753399..e900b3f 100644
--- a/googletest/include/gtest/internal/gtest-param-util.h
+++ b/googletest/include/gtest/internal/gtest-param-util.h
@@ -565,10 +565,7 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase {
test_param_names.insert(param_name);
- if (!test_info->test_base_name.empty()) {
- test_name_stream << test_info->test_base_name << "/";
- }
- test_name_stream << param_name;
+ test_name_stream << test_info->test_base_name << "/" << param_name;
MakeAndRegisterTestInfo(
test_suite_name.c_str(), test_name_stream.GetString().c_str(),
nullptr, // No type parameter.