deps: update googletest to a35bc7693c117a048152beeb34f6aac354b9423f by nodejs-github-bot · Pull Request #61927 · nodejs/node · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions deps/googletest/include/gtest/gtest-test-part.h
11 changes: 7 additions & 4 deletions deps/googletest/include/gtest/gtest.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
#include <set>
#include <sstream>
#include <string>
#include <string_view>
#include <type_traits>
#include <vector>

Expand Down Expand Up @@ -1246,7 +1247,7 @@ class GTEST_API_ [[nodiscard]] UnitTest {
// eventually call this to report their results. The user code
// should use the assertion macros instead of calling this directly.
void AddTestPartResult(TestPartResult::Type result_type,
const char* file_name, int line_number,
std::string_view file_name, int line_number,
const std::string& message,
const std::string& os_stack_trace)
GTEST_LOCK_EXCLUDED_(mutex_);
Expand Down Expand Up @@ -1619,6 +1620,8 @@ class GTEST_API_ [[nodiscard]] AssertHelper {
// Constructor.
AssertHelper(TestPartResult::Type type, const char* file, int line,
const char* message);
AssertHelper(TestPartResult::Type type, std::string_view file, int line,
std::string_view message);
~AssertHelper();

// Message assignment is a semantic trick to enable assertion
Expand All @@ -1632,12 +1635,12 @@ class GTEST_API_ [[nodiscard]] AssertHelper {
// re-using stack space even for temporary variables, so every EXPECT_EQ
// reserves stack space for another AssertHelper.
struct AssertHelperData {
AssertHelperData(TestPartResult::Type t, const char* srcfile, int line_num,
const char* msg)
AssertHelperData(TestPartResult::Type t, std::string_view srcfile,
int line_num, std::string_view msg)
: type(t), file(srcfile), line(line_num), message(msg) {}

TestPartResult::Type const type;
const char* const file;
const std::string_view file;
int const line;
std::string const message;

Expand Down
3 changes: 1 addition & 2 deletions deps/googletest/include/gtest/internal/gtest-internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -1452,8 +1452,7 @@ class [[nodiscard]] NeverThrown {
; \
else \
fail(::testing::internal::GetBoolAssertionFailureMessage( \
gtest_ar_, text, #actual, #expected) \
.c_str())
gtest_ar_, text, #actual, #expected))

#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \
GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
Expand Down
8 changes: 5 additions & 3 deletions deps/googletest/src/gtest-test-part.cc
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,19 @@

#include <ostream>
#include <string>
#include <string_view>

#include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-port.h"
#include "src/gtest-internal-inl.h"

namespace testing {

// Gets the summary of the failure message by omitting the stack trace
// in it.
std::string TestPartResult::ExtractSummary(const char* message) {
const char* const stack_trace = strstr(message, internal::kStackTraceMarker);
return stack_trace == nullptr ? message : std::string(message, stack_trace);
std::string TestPartResult::ExtractSummary(const std::string_view message) {
auto stack_trace = message.find(internal::kStackTraceMarker);
return std::string(message.substr(0, stack_trace));
}

// Prints a TestPartResult object.
Expand Down
23 changes: 19 additions & 4 deletions deps/googletest/src/gtest.cc
Loading