3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-15 09:15:48 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix-clang-warnings

Browse Source
This commit is contained in:
Gennadiy Civil 2018-08-31 10:57:16 -04:00 committed by GitHub
commit d615eebd9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
googlemock/include/gmock/gmock-matchers.h
View File

@ -56,9 +56,10 @@
# include <initializer_list> // NOLINT -- must be after gtest.h # include <initializer_list> // NOLINT -- must be after gtest.h
#endif #endif
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 5046 \ GTEST_DISABLE_MSC_WARNINGS_PUSH_(
/* class A needs to have dll-interface to be used by clients of class B */ \ 4251 5046 /* class A needs to have dll-interface to be used by clients of
/* Symbol involving type with internal linkage not defined */) class B */
/* Symbol involving type with internal linkage not defined */)
namespace testing { namespace testing {

2
googletest/include/gtest/gtest-typed-test.h
View File

@ -96,7 +96,7 @@ TYPED_TEST(FooTest, HasPropertyA) { ... }
// static std::string GetName(int) { // static std::string GetName(int) {
// if (std::is_same<T, char>()) return "char"; // if (std::is_same<T, char>()) return "char";
// if (std::is_same<T, int>()) return "int"; // if (std::is_same<T, int>()) return "int";
// if (std::is_same<T, unsigned int>()) return "unsigned_int"; // if (std::is_same<T, unsigned int>()) return "unsignedInt";
// } // }
// }; // };
// TYPED_TEST_CASE(FooTest, MyTypes, MyTypeNames); // TYPED_TEST_CASE(FooTest, MyTypes, MyTypeNames);

48
googletest/test/googletest-output-test-golden-lin.txt
View File

@ -606,24 +606,24 @@ Expected failure
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] TypedTest/0.Failure, where TypeParam = int [ FAILED ] TypedTest/0.Failure, where TypeParam = int
[----------] 2 tests from TypedTestWithNames/char_0, where TypeParam = char [----------] 2 tests from TypedTestWithNames/char0, where TypeParam = char
[ RUN ] TypedTestWithNames/char_0.Success [ RUN ] TypedTestWithNames/char0.Success
[ OK ] TypedTestWithNames/char_0.Success [ OK ] TypedTestWithNames/char0.Success
[ RUN ] TypedTestWithNames/char_0.Failure [ RUN ] TypedTestWithNames/char0.Failure
googletest-output-test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] TypedTestWithNames/char_0.Failure, where TypeParam = char [ FAILED ] TypedTestWithNames/char0.Failure, where TypeParam = char
[----------] 2 tests from TypedTestWithNames/int_1, where TypeParam = int [----------] 2 tests from TypedTestWithNames/int1, where TypeParam = int
[ RUN ] TypedTestWithNames/int_1.Success [ RUN ] TypedTestWithNames/int1.Success
[ OK ] TypedTestWithNames/int_1.Success [ OK ] TypedTestWithNames/int1.Success
[ RUN ] TypedTestWithNames/int_1.Failure [ RUN ] TypedTestWithNames/int1.Failure
googletest-output-test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Failed Failed
Stack trace: (omitted) 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 [----------] 2 tests from Unsigned/TypedTestP/0, where TypeParam = unsigned char
[ RUN ] Unsigned/TypedTestP/0.Success [ RUN ] Unsigned/TypedTestP/0.Success
[ OK ] Unsigned/TypedTestP/0.Success [ OK ] Unsigned/TypedTestP/0.Success
@ -652,10 +652,10 @@ Expected failure
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int [ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int
[----------] 2 tests from UnsignedCustomName/TypedTestP/unsigned_char_0, where TypeParam = unsigned char [----------] 2 tests from UnsignedCustomName/TypedTestP/unsignedChar0, where TypeParam = unsigned char
[ RUN ] UnsignedCustomName/TypedTestP/unsigned_char_0.Success [ RUN ] UnsignedCustomName/TypedTestP/unsignedChar0.Success
[ OK ] UnsignedCustomName/TypedTestP/unsigned_char_0.Success [ OK ] UnsignedCustomName/TypedTestP/unsignedChar0.Success
[ RUN ] UnsignedCustomName/TypedTestP/unsigned_char_0.Failure [ RUN ] UnsignedCustomName/TypedTestP/unsignedChar0.Failure
googletest-output-test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1U 1U
@ -665,11 +665,11 @@ Expected equality of these values:
Expected failure Expected failure
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] UnsignedCustomName/TypedTestP/unsigned_char_0.Failure, where TypeParam = unsigned char [ FAILED ] UnsignedCustomName/TypedTestP/unsignedChar0.Failure, where TypeParam = unsigned char
[----------] 2 tests from UnsignedCustomName/TypedTestP/unsigned_int_1, where TypeParam = unsigned int [----------] 2 tests from UnsignedCustomName/TypedTestP/unsignedInt1, where TypeParam = unsigned int
[ RUN ] UnsignedCustomName/TypedTestP/unsigned_int_1.Success [ RUN ] UnsignedCustomName/TypedTestP/unsignedInt1.Success
[ OK ] UnsignedCustomName/TypedTestP/unsigned_int_1.Success [ OK ] UnsignedCustomName/TypedTestP/unsignedInt1.Success
[ RUN ] UnsignedCustomName/TypedTestP/unsigned_int_1.Failure [ RUN ] UnsignedCustomName/TypedTestP/unsignedInt1.Failure
googletest-output-test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Expected equality of these values: Expected equality of these values:
1U 1U
@ -679,7 +679,7 @@ Expected equality of these values:
Expected failure Expected failure
Stack trace: (omitted) 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 [----------] 4 tests from ExpectFailureTest
[ RUN ] ExpectFailureTest.ExpectFatalFailure [ RUN ] ExpectFailureTest.ExpectFatalFailure
(expecting 1 failure) (expecting 1 failure)
@ -944,12 +944,12 @@ Stack trace: (omitted)
[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementReturns [ FAILED ] ExpectFatalFailureTest.FailsWhenStatementReturns
[ FAILED ] ExpectFatalFailureTest.FailsWhenStatementThrows [ FAILED ] ExpectFatalFailureTest.FailsWhenStatementThrows
[ FAILED ] TypedTest/0.Failure, where TypeParam = int [ FAILED ] TypedTest/0.Failure, where TypeParam = int
[ FAILED ] TypedTestWithNames/char_0.Failure, where TypeParam = char [ FAILED ] TypedTestWithNames/char0.Failure, where TypeParam = char
[ FAILED ] TypedTestWithNames/int_1.Failure, where TypeParam = int [ FAILED ] TypedTestWithNames/int1.Failure, where TypeParam = int
[ FAILED ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char [ FAILED ] Unsigned/TypedTestP/0.Failure, where TypeParam = unsigned char
[ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int [ FAILED ] Unsigned/TypedTestP/1.Failure, where TypeParam = unsigned int
[ FAILED ] UnsignedCustomName/TypedTestP/unsigned_char_0.Failure, where TypeParam = unsigned char [ FAILED ] UnsignedCustomName/TypedTestP/unsignedChar0.Failure, where TypeParam = unsigned char
[ FAILED ] UnsignedCustomName/TypedTestP/unsigned_int_1.Failure, where TypeParam = unsigned int [ FAILED ] UnsignedCustomName/TypedTestP/unsignedInt1.Failure, where TypeParam = unsigned int
[ FAILED ] ExpectFailureTest.ExpectFatalFailure [ FAILED ] ExpectFailureTest.ExpectFatalFailure
[ FAILED ] ExpectFailureTest.ExpectNonFatalFailure [ FAILED ] ExpectFailureTest.ExpectNonFatalFailure
[ FAILED ] ExpectFailureTest.ExpectFatalFailureOnAllThreads [ FAILED ] ExpectFailureTest.ExpectFatalFailureOnAllThreads

16
googletest/test/googletest-output-test_.cc
View File

@ -40,8 +40,8 @@
#include <stdlib.h> #include <stdlib.h>
#if _MSC_VER #if _MSC_VER
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */) GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */)
#endif // . _MSC_VER #endif // _MSC_VER
#if GTEST_IS_THREADSAFE #if GTEST_IS_THREADSAFE
using testing::ScopedFakeTestPartResultReporter; using testing::ScopedFakeTestPartResultReporter;
@ -815,9 +815,9 @@ class TypedTestNames {
template <typename T> template <typename T>
static std::string GetName(int i) { static std::string GetName(int i) {
if (testing::internal::IsSame<T, char>::value) 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) if (testing::internal::IsSame<T, int>::value)
return std::string("int_") + ::testing::PrintToString(i); return std::string("int") + ::testing::PrintToString(i);
} }
}; };
@ -856,10 +856,10 @@ class TypedTestPNames {
template <typename T> template <typename T>
static std::string GetName(int i) { static std::string GetName(int i) {
if (testing::internal::IsSame<T, unsigned char>::value) { if (testing::internal::IsSame<T, unsigned char>::value) {
return std::string("unsigned_char_") + ::testing::PrintToString(i); return std::string("unsignedChar") + ::testing::PrintToString(i);
} }
if (testing::internal::IsSame<T, unsigned int>::value) { if (testing::internal::IsSame<T, unsigned int>::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 FooEnvironment);
testing::AddGlobalTestEnvironment(new BarEnvironment); testing::AddGlobalTestEnvironment(new BarEnvironment);
#if _MSC_VER #if _MSC_VER
GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127 GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127
#endif // . _MSC_VER #endif // _MSC_VER
return RunAllTests(); return RunAllTests();
} }

16
googletest/test/gtest-typed-test_test.cc
View File

@ -178,10 +178,10 @@ class TypedTestNames {
template <typename T> template <typename T>
static std::string GetName(int i) { static std::string GetName(int i) {
if (testing::internal::IsSame<T, char>::value) { 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) { if (testing::internal::IsSame<T, int>::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() EXPECT_STREQ(::testing::UnitTest::GetInstance()
->current_test_info() ->current_test_info()
->test_case_name(), ->test_case_name(),
"TypedTestWithNames/char_0"); "TypedTestWithNames/char0");
} }
if (testing::internal::IsSame<TypeParam, int>::value) { if (testing::internal::IsSame<TypeParam, int>::value) {
EXPECT_STREQ(::testing::UnitTest::GetInstance() EXPECT_STREQ(::testing::UnitTest::GetInstance()
->current_test_info() ->current_test_info()
->test_case_name(), ->test_case_name(),
"TypedTestWithNames/int_1"); "TypedTestWithNames/int1");
} }
} }
@ -315,13 +315,13 @@ TYPED_TEST_P(TypeParametrizedTestWithNames, TestCaseName) {
EXPECT_STREQ(::testing::UnitTest::GetInstance() EXPECT_STREQ(::testing::UnitTest::GetInstance()
->current_test_info() ->current_test_info()
->test_case_name(), ->test_case_name(),
"CustomName/TypeParametrizedTestWithNames/p_char_0"); "CustomName/TypeParametrizedTestWithNames/parChar0");
} }
if (testing::internal::IsSame<TypeParam, int>::value) { if (testing::internal::IsSame<TypeParam, int>::value) {
EXPECT_STREQ(::testing::UnitTest::GetInstance() EXPECT_STREQ(::testing::UnitTest::GetInstance()
->current_test_info() ->current_test_info()
->test_case_name(), ->test_case_name(),
"CustomName/TypeParametrizedTestWithNames/p_int_1"); "CustomName/TypeParametrizedTestWithNames/parInt1");
} }
} }
@ -332,10 +332,10 @@ class TypeParametrizedTestNames {
template <typename T> template <typename T>
static std::string GetName(int i) { static std::string GetName(int i) {
if (testing::internal::IsSame<T, char>::value) { 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) { if (testing::internal::IsSame<T, int>::value) {
return std::string("p_int_") + ::testing::PrintToString(i); return std::string("parInt") + ::testing::PrintToString(i);
} }
} }
}; };