diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 9cd1a065..a7bcfc83 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -56,9 +56,10 @@ # include // NOLINT -- must be after gtest.h #endif -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 5046 \ -/* class A needs to have dll-interface to be used by clients of class B */ \ -/* Symbol involving type with internal linkage not defined */) +GTEST_DISABLE_MSC_WARNINGS_PUSH_( + 4251 5046 /* class A needs to have dll-interface to be used by clients of + class B */ + /* Symbol involving type with internal linkage not defined */) namespace testing { diff --git a/googletest/include/gtest/gtest-typed-test.h b/googletest/include/gtest/gtest-typed-test.h index 29b08599..65be6998 100644 --- a/googletest/include/gtest/gtest-typed-test.h +++ b/googletest/include/gtest/gtest-typed-test.h @@ -96,7 +96,7 @@ TYPED_TEST(FooTest, HasPropertyA) { ... } // static std::string GetName(int) { // if (std::is_same()) return "char"; // if (std::is_same()) return "int"; -// if (std::is_same()) return "unsigned_int"; +// if (std::is_same()) return "unsignedInt"; // } // }; // TYPED_TEST_CASE(FooTest, MyTypes, MyTypeNames); diff --git a/googletest/test/googletest-output-test-golden-lin.txt b/googletest/test/googletest-output-test-golden-lin.txt index 7711cdc6..86da845b 100644 --- a/googletest/test/googletest-output-test-golden-lin.txt +++ b/googletest/test/googletest-output-test-golden-lin.txt @@ -606,24 +606,24 @@ Expected failure Stack trace: (omitted) [ FAILED ] TypedTest/0.Failure, where TypeParam = int -[----------] 2 tests from TypedTestWithNames/char_0, where TypeParam = char -[ RUN ] TypedTestWithNames/char_0.Success -[ OK ] TypedTestWithNames/char_0.Success -[ RUN ] TypedTestWithNames/char_0.Failure +[----------] 2 tests from TypedTestWithNames/char0, where TypeParam = char +[ RUN ] TypedTestWithNames/char0.Success +[ OK ] TypedTestWithNames/char0.Success +[ RUN ] TypedTestWithNames/char0.Failure googletest-output-test_.cc:#: Failure Failed Stack trace: (omitted) -[ FAILED ] TypedTestWithNames/char_0.Failure, where TypeParam = char -[----------] 2 tests from TypedTestWithNames/int_1, where TypeParam = int -[ RUN ] TypedTestWithNames/int_1.Success -[ OK ] TypedTestWithNames/int_1.Success -[ RUN ] TypedTestWithNames/int_1.Failure +[ FAILED ] TypedTestWithNames/char0.Failure, where TypeParam = char +[----------] 2 tests from TypedTestWithNames/int1, where TypeParam = int +[ RUN ] TypedTestWithNames/int1.Success +[ OK ] TypedTestWithNames/int1.Success +[ RUN ] TypedTestWithNames/int1.Failure googletest-output-test_.cc:#: Failure Failed Stack trace: (omitted) -[ FAILED ] TypedTestWithNames/int_1.Failure, where TypeParam = int +[ FAILED ] TypedTestWithNames/int1.Failure, where TypeParam = int [----------] 2 tests from Unsigned/TypedTestP/0, where TypeParam = unsigned char [ RUN ] Unsigned/TypedTestP/0.Success [ OK ] Unsigned/TypedTestP/0.Success @@ -652,10 +652,10 @@ Expected failure Stack trace: (omitted) [ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int -[----------] 2 tests from UnsignedCustomName/TypedTestP/unsigned_char_0, where TypeParam = unsigned char -[ RUN ] UnsignedCustomName/TypedTestP/unsigned_char_0.Success -[ OK ] UnsignedCustomName/TypedTestP/unsigned_char_0.Success -[ RUN ] UnsignedCustomName/TypedTestP/unsigned_char_0.Failure +[----------] 2 tests from UnsignedCustomName/TypedTestP/unsignedChar0, where TypeParam = unsigned char +[ RUN ] UnsignedCustomName/TypedTestP/unsignedChar0.Success +[ OK ] UnsignedCustomName/TypedTestP/unsignedChar0.Success +[ RUN ] UnsignedCustomName/TypedTestP/unsignedChar0.Failure googletest-output-test_.cc:#: Failure Expected equality of these values: 1U @@ -665,11 +665,11 @@ Expected equality of these values: Expected failure Stack trace: (omitted) -[ FAILED ] UnsignedCustomName/TypedTestP/unsigned_char_0.Failure, where TypeParam = unsigned char -[----------] 2 tests from UnsignedCustomName/TypedTestP/unsigned_int_1, where TypeParam = unsigned int -[ RUN ] UnsignedCustomName/TypedTestP/unsigned_int_1.Success -[ OK ] UnsignedCustomName/TypedTestP/unsigned_int_1.Success -[ RUN ] UnsignedCustomName/TypedTestP/unsigned_int_1.Failure +[ FAILED ] UnsignedCustomName/TypedTestP/unsignedChar0.Failure, where TypeParam = unsigned char +[----------] 2 tests from UnsignedCustomName/TypedTestP/unsignedInt1, where TypeParam = unsigned int +[ RUN ] UnsignedCustomName/TypedTestP/unsignedInt1.Success +[ OK ] UnsignedCustomName/TypedTestP/unsignedInt1.Success +[ RUN ] UnsignedCustomName/TypedTestP/unsignedInt1.Failure googletest-output-test_.cc:#: Failure Expected equality of these values: 1U @@ -679,7 +679,7 @@ Expected equality of these values: Expected failure Stack trace: (omitted) -[ FAILED ] UnsignedCustomName/TypedTestP/unsigned_int_1.Failure, where TypeParam = unsigned int +[ FAILED ] UnsignedCustomName/TypedTestP/unsignedInt1.Failure, where TypeParam = unsigned int [----------] 4 tests from ExpectFailureTest [ RUN ] ExpectFailureTest.ExpectFatalFailure (expecting 1 failure) @@ -944,12 +944,12 @@ Stack trace: (omitted) [ FAILED ] ExpectFatalFailureTest.FailsWhenStatementReturns [ FAILED ] ExpectFatalFailureTest.FailsWhenStatementThrows [ FAILED ] TypedTest/0.Failure, where TypeParam = int -[ FAILED ] TypedTestWithNames/char_0.Failure, where TypeParam = char -[ FAILED ] TypedTestWithNames/int_1.Failure, where TypeParam = int +[ FAILED ] TypedTestWithNames/char0.Failure, where TypeParam = char +[ FAILED ] TypedTestWithNames/int1.Failure, where TypeParam = int [ FAILED ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char [ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int -[ FAILED ] UnsignedCustomName/TypedTestP/unsigned_char_0.Failure, where TypeParam = unsigned char -[ FAILED ] UnsignedCustomName/TypedTestP/unsigned_int_1.Failure, where TypeParam = unsigned int +[ FAILED ] UnsignedCustomName/TypedTestP/unsignedChar0.Failure, where TypeParam = unsigned char +[ FAILED ] UnsignedCustomName/TypedTestP/unsignedInt1.Failure, where TypeParam = unsigned int [ FAILED ] ExpectFailureTest.ExpectFatalFailure [ FAILED ] ExpectFailureTest.ExpectNonFatalFailure [ FAILED ] ExpectFailureTest.ExpectFatalFailureOnAllThreads diff --git a/googletest/test/googletest-output-test_.cc b/googletest/test/googletest-output-test_.cc index 180630e2..f6525ec9 100644 --- a/googletest/test/googletest-output-test_.cc +++ b/googletest/test/googletest-output-test_.cc @@ -40,8 +40,8 @@ #include #if _MSC_VER - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */) -#endif // . _MSC_VER +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */) +#endif // _MSC_VER #if GTEST_IS_THREADSAFE using testing::ScopedFakeTestPartResultReporter; @@ -815,9 +815,9 @@ class TypedTestNames { template static std::string GetName(int i) { if (testing::internal::IsSame::value) - return std::string("char_") + ::testing::PrintToString(i); + return std::string("char") + ::testing::PrintToString(i); if (testing::internal::IsSame::value) - return std::string("int_") + ::testing::PrintToString(i); + return std::string("int") + ::testing::PrintToString(i); } }; @@ -856,10 +856,10 @@ class TypedTestPNames { template static std::string GetName(int i) { if (testing::internal::IsSame::value) { - return std::string("unsigned_char_") + ::testing::PrintToString(i); + return std::string("unsignedChar") + ::testing::PrintToString(i); } if (testing::internal::IsSame::value) { - return std::string("unsigned_int_") + ::testing::PrintToString(i); + return std::string("unsignedInt") + ::testing::PrintToString(i); } } }; @@ -1103,7 +1103,7 @@ int main(int argc, char **argv) { testing::AddGlobalTestEnvironment(new FooEnvironment); testing::AddGlobalTestEnvironment(new BarEnvironment); #if _MSC_VER - GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127 -#endif // . _MSC_VER +GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127 +#endif // _MSC_VER return RunAllTests(); } diff --git a/googletest/test/gtest-typed-test_test.cc b/googletest/test/gtest-typed-test_test.cc index c38bb94a..4e398697 100644 --- a/googletest/test/gtest-typed-test_test.cc +++ b/googletest/test/gtest-typed-test_test.cc @@ -178,10 +178,10 @@ class TypedTestNames { template static std::string GetName(int i) { if (testing::internal::IsSame::value) { - return std::string("char_") + ::testing::PrintToString(i); + return std::string("char") + ::testing::PrintToString(i); } if (testing::internal::IsSame::value) { - return std::string("int_") + ::testing::PrintToString(i); + return std::string("int") + ::testing::PrintToString(i); } } }; @@ -193,13 +193,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::value) { EXPECT_STREQ(::testing::UnitTest::GetInstance() ->current_test_info() ->test_case_name(), - "TypedTestWithNames/int_1"); + "TypedTestWithNames/int1"); } } @@ -315,13 +315,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::value) { EXPECT_STREQ(::testing::UnitTest::GetInstance() ->current_test_info() ->test_case_name(), - "CustomName/TypeParametrizedTestWithNames/p_int_1"); + "CustomName/TypeParametrizedTestWithNames/parInt1"); } } @@ -332,10 +332,10 @@ class TypeParametrizedTestNames { template static std::string GetName(int i) { if (testing::internal::IsSame::value) { - return std::string("p_char_") + ::testing::PrintToString(i); + return std::string("parChar") + ::testing::PrintToString(i); } if (testing::internal::IsSame::value) { - return std::string("p_int_") + ::testing::PrintToString(i); + return std::string("parInt") + ::testing::PrintToString(i); } } };