summaryrefslogtreecommitdiffstats
path: root/googletest/test/gtest-typed-test_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'googletest/test/gtest-typed-test_test.cc')
-rw-r--r--googletest/test/gtest-typed-test_test.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/googletest/test/gtest-typed-test_test.cc b/googletest/test/gtest-typed-test_test.cc
index e9eed63..b245730 100644
--- a/googletest/test/gtest-typed-test_test.cc
+++ b/googletest/test/gtest-typed-test_test.cc
@@ -174,10 +174,10 @@ class TypedTestNames {
template <typename T>
static std::string GetName(int i) {
if (testing::internal::IsSame<T, char>::value) {
- return std::string("char_") + ::testing::PrintToString(i);
+ return std::string("char") + ::testing::PrintToString(i);
}
if (testing::internal::IsSame<T, int>::value) {
- return std::string("int_") + ::testing::PrintToString(i);
+ return std::string("int") + ::testing::PrintToString(i);
}
}
};
@@ -189,13 +189,13 @@ TYPED_TEST(TypedTestWithNames, TestCaseName) {
EXPECT_STREQ(::testing::UnitTest::GetInstance()
->current_test_info()
->test_case_name(),
- "TypedTestWithNames/char_0");
+ "TypedTestWithNames/char0");
}
if (testing::internal::IsSame<TypeParam, int>::value) {
EXPECT_STREQ(::testing::UnitTest::GetInstance()
->current_test_info()
->test_case_name(),
- "TypedTestWithNames/int_1");
+ "TypedTestWithNames/int1");
}
}
@@ -311,13 +311,13 @@ TYPED_TEST_P(TypeParametrizedTestWithNames, TestCaseName) {
EXPECT_STREQ(::testing::UnitTest::GetInstance()
->current_test_info()
->test_case_name(),
- "CustomName/TypeParametrizedTestWithNames/p_char_0");
+ "CustomName/TypeParametrizedTestWithNames/parChar0");
}
if (testing::internal::IsSame<TypeParam, int>::value) {
EXPECT_STREQ(::testing::UnitTest::GetInstance()
->current_test_info()
->test_case_name(),
- "CustomName/TypeParametrizedTestWithNames/p_int_1");
+ "CustomName/TypeParametrizedTestWithNames/parInt1");
}
}
@@ -328,10 +328,10 @@ class TypeParametrizedTestNames {
template <typename T>
static std::string GetName(int i) {
if (testing::internal::IsSame<T, char>::value) {
- return std::string("p_char_") + ::testing::PrintToString(i);
+ return std::string("parChar") + ::testing::PrintToString(i);
}
if (testing::internal::IsSame<T, int>::value) {
- return std::string("p_int_") + ::testing::PrintToString(i);
+ return std::string("parInt") + ::testing::PrintToString(i);
}
}
};