diff options
author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-11-17 02:28:09 +0000 |
---|---|---|
committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2014-11-17 02:28:09 +0000 |
commit | a465636c8354ad6783b2b514fb0513a46720376e (patch) | |
tree | 28b5e9e95b8aae5655a917c2e4ef9c0e7dbb989d /include | |
parent | 4f2dd9de6f85d34fcfa87e3cce7ed0a73f746b61 (diff) | |
download | googletest-a465636c8354ad6783b2b514fb0513a46720376e.tar.gz |
Strip trailing whitespace when stringifying type lists.
git-svn-id: http://googletest.googlecode.com/svn/trunk@698 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include')
-rw-r--r-- | include/gtest/internal/gtest-internal.h | 2 | ||||
-rw-r--r-- | include/gtest/internal/gtest-port.h | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h index 21a0f56..ba7175c 100644 --- a/include/gtest/internal/gtest-internal.h +++ b/include/gtest/internal/gtest-internal.h @@ -612,7 +612,7 @@ class TypeParameterizedTest { MakeAndRegisterTestInfo( (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name + "/" + StreamableToString(index)).c_str(), - GetPrefixUntilComma(test_names).c_str(), + StripTrailingSpaces(GetPrefixUntilComma(test_names)).c_str(), GetTypeName<Type>().c_str(), NULL, // No value parameter. GetTypeId<FixtureClass>(), diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index e7ddda5..9e0d6ef 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -2215,6 +2215,13 @@ inline char ToUpper(char ch) { return static_cast<char>(toupper(static_cast<unsigned char>(ch))); } +inline std::string StripTrailingSpaces(std::string str) { + std::string::iterator it = str.end(); + while (it != str.begin() && IsSpace(*--it)) + it = str.erase(it); + return str; +} + // The testing::internal::posix namespace holds wrappers for common // POSIX functions. These wrappers hide the differences between // Windows/MSVC and POSIX systems. Since some compilers define these |