coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-06 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 9d0754ba6b6de882d55bdfb9439a84c9aa85dd3e into 1b96fa13f549387b7549cc89e1a785cf143a1a50

Browse Source
This commit is contained in:
Thorsten Klein 2025-11-12 14:15:49 -05:00 committed by GitHub
commit 9c6476c6c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5785,7 +5785,7 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
} \
template <typename arg_type> \
bool name##Matcher::gmock_Impl<arg_type>::MatchAndExplain( \
const arg_type& arg, \
[[maybe_unused]] const arg_type& arg, \
[[maybe_unused]] ::testing::MatchResultListener* result_listener) const
#define MATCHER_P(name, p0, description) \
@ -5870,7 +5870,7 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
template <typename arg_type> \
bool full_name<GMOCK_INTERNAL_MATCHER_TYPE_PARAMS(args)>:: \
gmock_Impl<arg_type>::MatchAndExplain( \
const arg_type& arg, \
[[maybe_unused]] const arg_type& arg, \
[[maybe_unused]] ::testing::MatchResultListener* result_listener) \
const

4
googlemock/src/gmock-matchers.cc
View File

@ -301,6 +301,8 @@ void UnorderedElementsAreMatcherImplBase::DescribeToImpl(
case UnorderedMatcherRequire::Subset:
*os << "an injection from elements to requirements exists such that:\n";
break;
default:
break;
}
const char* sep = "";
@ -343,6 +345,8 @@ void UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl(
case UnorderedMatcherRequire::Subset:
*os << "no injection from elements to requirements exists such that:\n";
break;
default:
break;
}
const char* sep = "";
for (size_t i = 0; i != matcher_describers_.size(); ++i) {

1
googlemock/src/gmock-spec-builders.cc
View File

@ -301,6 +301,7 @@ void ReportUninterestingCall(CallReaction reaction, const std::string& msg) {
"knowing-when-to-expect-useoncall for details.\n",
stack_frames_to_skip);
break;
case kFail:
default: // FAIL
Expect(false, nullptr, -1, msg);
}

2
googlemock/test/gmock-function-mocker_test.cc
View File

@ -73,7 +73,7 @@ class TemplatedCopyable {
TemplatedCopyable() = default;
template <typename U>
TemplatedCopyable(const U& other) {} // NOLINT
TemplatedCopyable(const U&) {} // NOLINT
};
class FooInterface {

2
googlemock/test/gmock-matchers-containers_test.cc
View File

@ -2829,6 +2829,8 @@ class PredicateFormatterFromMatcherTest : public ::testing::Test {
// an "interested" listener; so this will return |true|, thus
// simulating a flaky matcher.
return listener->IsInterested();
default:
break;
}
GTEST_LOG_(FATAL) << "This should never be reached";

12
googletest/cmake/internal_utils.cmake
View File

@ -91,7 +91,17 @@ macro(config_compiler_and_linker)
endif()
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
set(cxx_base_flags "-Wall -Wshadow -Wconversion -Wundef")
set(cxx_base_flags "-Wall \
-Wshadow \
-Wconversion \
-Wundef \
-Wswitch-default \
-Wswitch-enum \
-Wextra \
-Wcast-align \
-Wunused \
-Wunreachable-code \
")
set(cxx_exception_flags "-fexceptions")
set(cxx_no_exception_flags "-fno-exceptions")
set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Winline -Wredundant-decls")

2
googletest/include/gtest/internal/gtest-death-test-internal.h
View File

@ -243,6 +243,8 @@ GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE); \
break; \
} \
default: \
break; \
} \
} \
} else \

9
googletest/src/gtest.cc
View File

@ -1471,6 +1471,8 @@ class Hunk {
++adds_;
hunk_adds_.push_back(std::make_pair('+', line));
break;
default:
break;
}
}
@ -3281,6 +3283,7 @@ static const char* GetAnsiColorCode(GTestColor color) {
return "2";
case GTestColor::kYellow:
return "3";
case GTestColor::kDefault:
default:
assert(false);
return "9";
@ -3537,6 +3540,9 @@ void PrettyUnitTestResultPrinter::OnTestPartResult(
// If the test part succeeded, we don't need to do anything.
case TestPartResult::kSuccess:
return;
case TestPartResult::kNonFatalFailure:
case TestPartResult::kFatalFailure:
case TestPartResult::kSkip:
default:
// Print failure message from the assertion
// (e.g. expected this and got that).
@ -3755,6 +3761,9 @@ void BriefUnitTestResultPrinter::OnTestPartResult(
// If the test part succeeded, we don't need to do anything.
case TestPartResult::kSuccess:
return;
case TestPartResult::kNonFatalFailure:
case TestPartResult::kFatalFailure:
case TestPartResult::kSkip:
default:
// Print failure message from the assertion
// (e.g. expected this and got that).

4
googletest/test/googletest-death-test-test.cc
View File

@ -346,7 +346,7 @@ TEST_F(TestForDeathTest, SwitchStatement) {
ASSERT_DEATH(_Exit(1), "") << "exit in default switch handler";
switch (0)
case 0:
default:
EXPECT_DEATH(_Exit(1), "") << "exit in switch case";
GTEST_DISABLE_MSC_WARNINGS_POP_()
@ -1499,7 +1499,7 @@ TEST(ConditionalDeathMacrosSyntaxDeathTest, SwitchStatement) {
ASSERT_DEATH_IF_SUPPORTED(_Exit(1), "") << "exit in default switch handler";
switch (0)
case 0:
default:
EXPECT_DEATH_IF_SUPPORTED(_Exit(1), "") << "exit in switch case";
GTEST_DISABLE_MSC_WARNINGS_POP_()

2
googletest/test/googletest-port-test.cc
View File

@ -239,7 +239,7 @@ TEST(GtestCheckSyntaxTest, WorksWithSwitch) {
}
switch (0)
case 0:
default:
GTEST_CHECK_(true) << "Check failed in switch case";
}

1
googletest/test/gtest_environment_test.cc
View File

@ -63,6 +63,7 @@ class MyEnvironment : public testing::Environment {
case FATAL_FAILURE:
FAIL() << "Expected fatal failure in global set-up.";
break;
case NO_FAILURE:
default:
break;
}

4
googletest/test/gtest_unittest.cc
View File

@ -4253,7 +4253,7 @@ TEST(AssertionSyntaxTest, WorksWithSwitch) {
}
switch (0)
case 0:
default:
EXPECT_FALSE(false) << "EXPECT_FALSE failed in switch case";
// Binary assertions are implemented using a different code path
@ -4265,7 +4265,7 @@ TEST(AssertionSyntaxTest, WorksWithSwitch) {
}
switch (0)
case 0:
default:
EXPECT_NE(1, 2);
}