From 4483e8137a06292a699879c94943e558e702decb Mon Sep 17 00:00:00 2001 From: Derek Brown Date: Tue, 14 Jan 2020 18:23:30 -0800 Subject: [PATCH 1/3] Add additional valid characters to parameter names I feel as though the alphanumeric + `_` charset is too restrictive, especially when formatting complex objects into names. Added a few extra characters which will help with this. --- googletest/include/gtest/internal/gtest-param-util.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/googletest/include/gtest/internal/gtest-param-util.h b/googletest/include/gtest/internal/gtest-param-util.h index ffa7d72c..e97343b9 100644 --- a/googletest/include/gtest/internal/gtest-param-util.h +++ b/googletest/include/gtest/internal/gtest-param-util.h @@ -633,6 +633,8 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase { int line; }; typedef ::std::vector InstantiationContainer; + + static std::string validParamChars = "_-:/"; static bool IsValidParamName(const std::string& name) { // Check for empty string @@ -641,7 +643,7 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase { // Check for invalid characters for (std::string::size_type index = 0; index < name.size(); ++index) { - if (!isalnum(name[index]) && name[index] != '_') + if (!isalnum(name[index]) && validParamChars.find(name[index]) == std::string::npos) return false; } From 364eeb5d89baec3166abe9d1bab69b4c813c76b3 Mon Sep 17 00:00:00 2001 From: Derek Brown Date: Fri, 3 Jun 2022 09:07:42 -0700 Subject: [PATCH 2/3] Update gtest-param-util.h --- googletest/include/gtest/internal/gtest-param-util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/googletest/include/gtest/internal/gtest-param-util.h b/googletest/include/gtest/internal/gtest-param-util.h index 41a16bfb..0d4aafc5 100644 --- a/googletest/include/gtest/internal/gtest-param-util.h +++ b/googletest/include/gtest/internal/gtest-param-util.h @@ -652,9 +652,9 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase { }; typedef ::std::vector InstantiationContainer; - static std::string validParamChars = "_-:/"; - static bool IsValidParamName(const std::string& name) { + static constexpr validParamChars = "_-:/"; + // Check for empty string if (name.empty()) return false; From 7754b4042f6d08026617dea21a4d476872aacf2f Mon Sep 17 00:00:00 2001 From: Derek Brown Date: Tue, 14 Jun 2022 21:34:40 -0400 Subject: [PATCH 3/3] Update gtest-param-util.h --- googletest/include/gtest/internal/gtest-param-util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/googletest/include/gtest/internal/gtest-param-util.h b/googletest/include/gtest/internal/gtest-param-util.h index 0d4aafc5..063ba323 100644 --- a/googletest/include/gtest/internal/gtest-param-util.h +++ b/googletest/include/gtest/internal/gtest-param-util.h @@ -653,7 +653,7 @@ class ParameterizedTestSuiteInfo : public ParameterizedTestSuiteInfoBase { typedef ::std::vector InstantiationContainer; static bool IsValidParamName(const std::string& name) { - static constexpr validParamChars = "_-:/"; + static constexpr validParamChars = "_-:/"; // Check for empty string if (name.empty()) return false;