eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/google/googletest

Browse Source
This commit is contained in:
Jerry Turcios 2018-10-04 18:31:27 -04:00
commit 7caf5ffd1d
3 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
googletest/test/googletest-catch-exceptions-test_.cc
View File

@ -137,25 +137,6 @@ TEST_F(CxxExceptionInConstructorTest, ThrowsExceptionInConstructor) {
<< "called unexpectedly."; << "called unexpectedly.";
} }
// Exceptions in destructors are not supported in C++11.
#if !GTEST_LANG_CXX11
class CxxExceptionInDestructorTest : public Test {
public:
static void TearDownTestCase() {
printf("%s",
"CxxExceptionInDestructorTest::TearDownTestCase() "
"called as expected.\n");
}
protected:
~CxxExceptionInDestructorTest() {
GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(
throw std::runtime_error("Standard C++ exception"));
}
};
TEST_F(CxxExceptionInDestructorTest, ThrowsExceptionInDestructor) {}
#endif // C++11 mode
class CxxExceptionInSetUpTestCaseTest : public Test { class CxxExceptionInSetUpTestCaseTest : public Test {
public: public:

9
googletest/test/googletest-param-test-test.cc
View File

@ -535,8 +535,6 @@ TEST(CombineTest, CombineWithMaxNumberOfParameters) {
VerifyGenerator(gen, expected_values); VerifyGenerator(gen, expected_values);
} }
#if GTEST_LANG_CXX11
class NonDefaultConstructAssignString { class NonDefaultConstructAssignString {
public: public:
NonDefaultConstructAssignString(const std::string& s) : str_(s) {} NonDefaultConstructAssignString(const std::string& s) : str_(s) {}
@ -579,7 +577,6 @@ TEST(CombineTest, NonDefaultConstructAssign) {
EXPECT_TRUE(it == gen.end()); EXPECT_TRUE(it == gen.end());
} }
#endif // GTEST_LANG_CXX11
# endif // GTEST_HAS_COMBINE # endif // GTEST_HAS_COMBINE
// Tests that an generator produces correct sequence after being // Tests that an generator produces correct sequence after being
@ -913,8 +910,6 @@ INSTANTIATE_TEST_CASE_P(CustomParamNameFunction,
Values(std::string("FunctionName")), Values(std::string("FunctionName")),
CustomParamNameFunction); CustomParamNameFunction);
#if GTEST_LANG_CXX11
// Test custom naming with a lambda // Test custom naming with a lambda
class CustomLambdaNamingTest : public TestWithParam<std::string> {}; class CustomLambdaNamingTest : public TestWithParam<std::string> {};
@ -926,8 +921,6 @@ INSTANTIATE_TEST_CASE_P(CustomParamNameLambda, CustomLambdaNamingTest,
return inf.param; return inf.param;
}); });
#endif // GTEST_LANG_CXX11
TEST(CustomNamingTest, CheckNameRegistry) { TEST(CustomNamingTest, CheckNameRegistry) {
::testing::UnitTest* unit_test = ::testing::UnitTest::GetInstance(); ::testing::UnitTest* unit_test = ::testing::UnitTest::GetInstance();
std::set<std::string> test_names; std::set<std::string> test_names;
@ -944,9 +937,7 @@ TEST(CustomNamingTest, CheckNameRegistry) {
} }
EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctorName")); EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctorName"));
EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctionName")); EXPECT_EQ(1u, test_names.count("CustomTestNames/FunctionName"));
#if GTEST_LANG_CXX11
EXPECT_EQ(1u, test_names.count("CustomTestNames/LambdaName")); EXPECT_EQ(1u, test_names.count("CustomTestNames/LambdaName"));
#endif // GTEST_LANG_CXX11
} }
// Test a numeric name to ensure PrintToStringParamName works correctly. // Test a numeric name to ensure PrintToStringParamName works correctly.

6
googletest/test/googletest-printers-test.cc
View File

@ -1109,9 +1109,7 @@ TEST(PrintStdTupleTest, NestedTuple) {
EXPECT_EQ("((5, true), 'a' (97, 0x61))", Print(nested)); EXPECT_EQ("((5, true), 'a' (97, 0x61))", Print(nested));
} }
#endif // GTEST_LANG_CXX11 #endif // GTEST_HAS_TR1_TUPLE
#if GTEST_LANG_CXX11
TEST(PrintNullptrT, Basic) { TEST(PrintNullptrT, Basic) {
EXPECT_EQ("(nullptr)", Print(nullptr)); EXPECT_EQ("(nullptr)", Print(nullptr));
@ -1131,8 +1129,6 @@ TEST(PrintReferenceWrapper, Unprintable) {
Print(std::cref(up))); Print(std::cref(up)));
} }
#endif // GTEST_LANG_CXX11
// Tests printing user-defined unprintable types. // Tests printing user-defined unprintable types.
// Unprintable types in the global namespace. // Unprintable types in the global namespace.