deps: update googletest to ec4fed9

PR-URL: #48538 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]>

Author: nodejs-github-bot

deps/googletest/include/gtest/gtest-assertion-result.h

@@ -181,7 +181,7 @@ class GTEST_API_ AssertionResult{
 // assertion's expectation). When nothing has been streamed into the
 // object, returns an empty string.
 constchar* message() const{
-return message_.get() != nullptr ? message_->c_str() : "";
+return message_ != nullptr ? message_->c_str() : "";
  }
 // Deprecated; please use message() instead.
 constchar* failure_message() const{returnmessage()}
@@ -204,7 +204,7 @@ class GTEST_API_ AssertionResult{
 private:
 // Appends the contents of message to message_.
 voidAppendMessage(const Message& a_message){
-if (message_.get() == nullptr) message_.reset(new::std::string);
+if (message_ == nullptr) message_ = ::std::make_unique<::std::string>();
  message_->append(a_message.GetString().c_str());
  }
 

deps/googletest/include/gtest/gtest-death-test.h

@@ -51,7 +51,7 @@ GTEST_DECLARE_string_(death_test_style);
 
 namespacetesting{
 
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 
 namespaceinternal{
 
@@ -203,7 +203,7 @@ class GTEST_API_ ExitedWithCode{
 constint exit_code_;
 };
 
-#if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
+#if !defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_FUCHSIA)
 // Tests that an exit code describes an exit due to termination by a
 // given signal.
 classGTEST_API_ KilledBySignal{
@@ -328,7 +328,7 @@ class GTEST_API_ KilledBySignal{
 // death tests are supported; otherwise they just issue a warning. This is
 // useful when you are combining death test assertions with normal test
 // assertions in one test.
-#if GTEST_HAS_DEATH_TEST
+#ifdef GTEST_HAS_DEATH_TEST
 #defineEXPECT_DEATH_IF_SUPPORTED(statement, regex) \
 EXPECT_DEATH(statement, regex)
 #defineASSERT_DEATH_IF_SUPPORTED(statement, regex) \

deps/googletest/include/gtest/gtest-matchers.h

@@ -40,6 +40,7 @@
 #defineGOOGLETEST_INCLUDE_GTEST_GTEST_MATCHERS_H_
 
 #include<atomic>
+#include<functional>
 #include<memory>
 #include<ostream>
 #include<string>
@@ -106,13 +107,13 @@ class MatchResultListener{
  MatchResultListener& operator=(const MatchResultListener&) = delete;
 };
 
-inlineMatchResultListener::~MatchResultListener() {}
+inlineMatchResultListener::~MatchResultListener() = default;
 
 // An instance of a subclass of this knows how to describe itself as a
 // matcher.
 classGTEST_API_ MatcherDescriberInterface{
 public:
-virtual~MatcherDescriberInterface() {}
+virtual~MatcherDescriberInterface() = default;
 
 // Describes this matcher to an ostream. The function should print
 // a verb phrase that describes the property a value matching this
@@ -178,43 +179,6 @@ class MatcherInterface : public MatcherDescriberInterface{
 
 namespaceinternal{
 
-structAnyEq{
-template <typename A, typename B>
-booloperator()(const A& a, const B& b) const{
-return a == b;
- }
-};
-structAnyNe{
-template <typename A, typename B>
-booloperator()(const A& a, const B& b) const{
-return a != b;
- }
-};
-structAnyLt{
-template <typename A, typename B>
-booloperator()(const A& a, const B& b) const{
-return a < b;
- }
-};
-structAnyGt{
-template <typename A, typename B>
-booloperator()(const A& a, const B& b) const{
-return a > b;
- }
-};
-structAnyLe{
-template <typename A, typename B>
-booloperator()(const A& a, const B& b) const{
-return a <= b;
- }
-};
-structAnyGe{
-template <typename A, typename B>
-booloperator()(const A& a, const B& b) const{
-return a >= b;
- }
-};
-
 // A match result listener that ignores the explanation.
 classDummyMatchResultListener : publicMatchResultListener{
 public:
@@ -530,7 +494,7 @@ template <>
 classGTEST_API_ Matcher<const std::string&>
  : public internal::MatcherBase<const std::string&>{
 public:
-Matcher() {}
+Matcher() = default;
 
 explicitMatcher(const MatcherInterface<const std::string&>* impl)
  : internal::MatcherBase<const std::string&>(impl){}
@@ -552,7 +516,7 @@ template <>
 classGTEST_API_ Matcher<std::string>
  : public internal::MatcherBase<std::string>{
 public:
-Matcher() {}
+Matcher() = default;
 
 explicitMatcher(const MatcherInterface<const std::string&>* impl)
  : internal::MatcherBase<std::string>(impl){}
@@ -580,7 +544,7 @@ template <>
 classGTEST_API_ Matcher<const internal::StringView&>
  : public internal::MatcherBase<const internal::StringView&>{
 public:
-Matcher() {}
+Matcher() = default;
 
 explicitMatcher(const MatcherInterface<const internal::StringView&>* impl)
  : internal::MatcherBase<const internal::StringView&>(impl){}
@@ -606,7 +570,7 @@ template <>
 classGTEST_API_ Matcher<internal::StringView>
  : public internal::MatcherBase<internal::StringView>{
 public:
-Matcher() {}
+Matcher() = default;
 
 explicitMatcher(const MatcherInterface<const internal::StringView&>* impl)
  : internal::MatcherBase<internal::StringView>(impl){}
@@ -758,50 +722,53 @@ class ComparisonBase{
 };
 
 template <typename Rhs>
-classEqMatcher : publicComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq>{
+classEqMatcher : publicComparisonBase<EqMatcher<Rhs>, Rhs, std::equal_to<>>{
 public:
 explicitEqMatcher(const Rhs& rhs)
- : ComparisonBase<EqMatcher<Rhs>, Rhs, AnyEq>(rhs){}
+ : ComparisonBase<EqMatcher<Rhs>, Rhs, std::equal_to<>>(rhs){}
 staticconstchar* Desc(){return"is equal to"}
 staticconstchar* NegatedDesc(){return"isn't equal to"}
 };
 template <typename Rhs>
-classNeMatcher : publicComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe>{
+classNeMatcher
+ : public ComparisonBase<NeMatcher<Rhs>, Rhs, std::not_equal_to<>>{
 public:
 explicitNeMatcher(const Rhs& rhs)
- : ComparisonBase<NeMatcher<Rhs>, Rhs, AnyNe>(rhs){}
+ : ComparisonBase<NeMatcher<Rhs>, Rhs, std::not_equal_to<>>(rhs){}
 staticconstchar* Desc(){return"isn't equal to"}
 staticconstchar* NegatedDesc(){return"is equal to"}
 };
 template <typename Rhs>
-classLtMatcher : publicComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt>{
+classLtMatcher : publicComparisonBase<LtMatcher<Rhs>, Rhs, std::less<>>{
 public:
 explicitLtMatcher(const Rhs& rhs)
- : ComparisonBase<LtMatcher<Rhs>, Rhs, AnyLt>(rhs){}
+ : ComparisonBase<LtMatcher<Rhs>, Rhs, std::less<>>(rhs){}
 staticconstchar* Desc(){return"is <"}
 staticconstchar* NegatedDesc(){return"isn't <"}
 };
 template <typename Rhs>
-classGtMatcher : publicComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt>{
+classGtMatcher : publicComparisonBase<GtMatcher<Rhs>, Rhs, std::greater<>>{
 public:
 explicitGtMatcher(const Rhs& rhs)
- : ComparisonBase<GtMatcher<Rhs>, Rhs, AnyGt>(rhs){}
+ : ComparisonBase<GtMatcher<Rhs>, Rhs, std::greater<>>(rhs){}
 staticconstchar* Desc(){return"is >"}
 staticconstchar* NegatedDesc(){return"isn't >"}
 };
 template <typename Rhs>
-classLeMatcher : publicComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe>{
+classLeMatcher
+ : public ComparisonBase<LeMatcher<Rhs>, Rhs, std::less_equal<>>{
 public:
 explicitLeMatcher(const Rhs& rhs)
- : ComparisonBase<LeMatcher<Rhs>, Rhs, AnyLe>(rhs){}
+ : ComparisonBase<LeMatcher<Rhs>, Rhs, std::less_equal<>>(rhs){}
 staticconstchar* Desc(){return"is <="}
 staticconstchar* NegatedDesc(){return"isn't <="}
 };
 template <typename Rhs>
-classGeMatcher : publicComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe>{
+classGeMatcher
+ : public ComparisonBase<GeMatcher<Rhs>, Rhs, std::greater_equal<>>{
 public:
 explicitGeMatcher(const Rhs& rhs)
- : ComparisonBase<GeMatcher<Rhs>, Rhs, AnyGe>(rhs){}
+ : ComparisonBase<GeMatcher<Rhs>, Rhs, std::greater_equal<>>(rhs){}
 staticconstchar* Desc(){return"is >="}
 staticconstchar* NegatedDesc(){return"isn't >="}
 };

deps/googletest/include/gtest/gtest-param-test.h

@@ -449,7 +449,8 @@ internal::ParamConverterGenerator<T> ConvertGenerator(
 
 #defineTEST_P(test_suite_name, test_name) \
 classGTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \
- : public test_suite_name, private ::testing::internal::GTestNonCopyable{\
+ : public test_suite_name, \
+ private ::testing::internal::GTestNonCopyable{\
 public: \
 GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)(){} \
 voidTestBody() override; \

deps/googletest/include/gtest/gtest-printers.h

@@ -206,12 +206,13 @@ struct StreamPrinter{
 // Don't accept member pointers here. We'd print them via implicit
 // conversion to bool, which isn't useful.
 typename = typename std::enable_if<
- !std::is_member_pointer<T>::value>::type,
-// Only accept types for which we can find a streaming operator via
-// ADL (possibly involving implicit conversions).
-typename = decltype(std::declval<std::ostream&>()
- << std::declval<const T&>())>
-staticvoidPrintValue(const T& value, ::std::ostream* os){
+ !std::is_member_pointer<T>::value>::type>
+// Only accept types for which we can find a streaming operator via
+// ADL (possibly involving implicit conversions).
+// (Use SFINAE via return type, because it seems GCC < 12 doesn't handle name
+// lookup properly when we do it in the template parameter list.)
+staticautoPrintValue(const T& value, ::std::ostream* os)
+ -> decltype((void)(*os << value)){
 // Call streaming operator found by ADL, possibly with implicit conversions
 // of the arguments.
  *os << value;
@@ -306,9 +307,10 @@ template <typename T>
 voidPrintWithFallback(const T& value, ::std::ostream* os){
 using Printer = typename FindFirstPrinter<
  T, void, ContainerPrinter, FunctionPointerPrinter, PointerPrinter,
+ ProtobufPrinter,
  internal_stream_operator_without_lexical_name_lookup::StreamPrinter,
-ProtobufPrinter, ConvertibleToIntegerPrinter,
-ConvertibleToStringViewPrinter, RawBytesPrinter, FallbackPrinter>::type;
+ConvertibleToIntegerPrinter, ConvertibleToStringViewPrinter,
+ RawBytesPrinter, FallbackPrinter>::type;
 Printer::PrintValue(value, os);
 }
 
@@ -529,7 +531,10 @@ int AppropriateResolution(FloatType val){
  } elseif (val >= 0.0001){
  mulfor6 = 1e9;
  }
-if (static_cast<int32_t>(val * mulfor6 + 0.5) / mulfor6 == val) return6;
+if (static_cast<float>(static_cast<int32_t>(val * mulfor6 + 0.5)) /
+ mulfor6 ==
+ val)
+return6;
  } elseif (val < 1e10){
  FloatType divfor6 = 1.0;
 if (val >= 1e9){// 1,000,000,000 to 9,999,999,999
@@ -541,7 +546,10 @@ int AppropriateResolution(FloatType val){
  } elseif (val >= 1e6){// 1,000,000 to 9,999,999
  divfor6 = 10;
  }
-if (static_cast<int32_t>(val / divfor6 + 0.5) * divfor6 == val) return6;
+if (static_cast<float>(static_cast<int32_t>(val / divfor6 + 0.5)) *
+ divfor6 ==
+ val)
+return6;
  }
 return full;
 }
@@ -850,7 +858,7 @@ class UniversalPrinter<Variant<T...>>{
 public:
 staticvoidPrint(const Variant<T...>& value, ::std::ostream* os){
  *os << '(';
-#if GTEST_HAS_ABSL
+#ifdef GTEST_HAS_ABSL
 absl::visit(Visitor{os, value.index()}, value);
 #else
 std::visit(Visitor{os, value.index()}, value);
@@ -996,7 +1004,7 @@ template <>
 classUniversalTersePrinter<char*> : public UniversalTersePrinter<constchar*>{
 };
 
-#ifdef__cpp_char8_t
+#ifdef__cpp_lib_char8_t
 template <>
 classUniversalTersePrinter<constchar8_t*>{
 public:

deps/googletest/include/gtest/gtest-test-part.h

@@ -133,7 +133,7 @@ std::ostream& operator<<(std::ostream& os, const TestPartResult& result);
 // virtual.
 classGTEST_API_ TestPartResultArray{
 public:
-TestPartResultArray() {}
+TestPartResultArray() = default;
 
 // Appends the given TestPartResult to the array.
 voidAppend(const TestPartResult& result);
@@ -154,7 +154,7 @@ class GTEST_API_ TestPartResultArray{
 // This interface knows how to report a test part result.
 classGTEST_API_ TestPartResultReporterInterface{
 public:
-virtual~TestPartResultReporterInterface() {}
+virtual~TestPartResultReporterInterface() = default;
 
 virtualvoidReportTestPartResult(const TestPartResult& result) = 0;
 };

deps/googletest/include/gtest/gtest-typed-test.h

@@ -267,28 +267,28 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
  TYPED_TEST_SUITE_P
 #endif// GTEST_REMOVE_LEGACY_TEST_CASEAPI_
 
-#defineTYPED_TEST_P(SuiteName, TestName) \
-namespaceGTEST_SUITE_NAMESPACE_(SuiteName){\
-template <typename gtest_TypeParam_> \
-classTestName : publicSuiteName<gtest_TypeParam_>{\
-private: \
-typedef SuiteName<gtest_TypeParam_> TestFixture; \
-typedef gtest_TypeParam_ TypeParam; \
-voidTestBody() override; \
-}; \
-staticbool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \
-GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).AddTestName( \
-__FILE__, __LINE__, GTEST_STRINGIFY_(SuiteName), \
-GTEST_STRINGIFY_(TestName)); \
- } \
-template <typename gtest_TypeParam_> \
-voidGTEST_SUITE_NAMESPACE_( \
+#defineTYPED_TEST_P(SuiteName, TestName) \
+namespaceGTEST_SUITE_NAMESPACE_(SuiteName){\
+template <typename gtest_TypeParam_> \
+classTestName : publicSuiteName<gtest_TypeParam_>{\
+private: \
+typedef SuiteName<gtest_TypeParam_> TestFixture; \
+typedef gtest_TypeParam_ TypeParam; \
+voidTestBody() override; \
+ }; \
+staticbool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \
+GTEST_TYPED_TEST_SUITE_P_STATE_(SuiteName).AddTestName( \
+ __FILE__, __LINE__, GTEST_STRINGIFY_(SuiteName), \
+GTEST_STRINGIFY_(TestName)); \
+ } \
+template <typename gtest_TypeParam_> \
+voidGTEST_SUITE_NAMESPACE_( \
  SuiteName)::TestName<gtest_TypeParam_>::TestBody()
 
 // Note: this won't work correctly if the trailing arguments are macros.
 #defineREGISTER_TYPED_TEST_SUITE_P(SuiteName, ...) \
 namespaceGTEST_SUITE_NAMESPACE_(SuiteName){\
-typedef ::testing::internal::Templates<__VA_ARGS__> gtest_AllTests_; \
+typedef ::testing::internal::Templates<__VA_ARGS__> gtest_AllTests_; \
  } \
 staticconstchar* constGTEST_REGISTERED_TEST_NAMES_( \
  SuiteName) GTEST_ATTRIBUTE_UNUSED_ = \