Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include type in streaming TestPartResult output (fixes #3994). #4126

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+57 −2
Open

Include type in streaming TestPartResult output (fixes #3994). #4126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion googletest/src/gtest-internal-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,7 +1199,8 @@ class StreamingListener : public EmptyTestEventListener {
void OnTestPartResult(const TestPartResult& test_part_result) override {
const char* file_name = test_part_result.file_name();
if (file_name == nullptr) file_name = "";
SendLn("event=TestPartResult&file=" + UrlEncode(file_name) +
SendLn("event=TestPartResult&type=" + FormatType(test_part_result.type()) +
"&file=" + UrlEncode(file_name) +
"&line=" + StreamableToString(test_part_result.line_number()) +
"&message=" + UrlEncode(test_part_result.message()));
}
Expand All @@ -1214,6 +1215,20 @@ class StreamingListener : public EmptyTestEventListener {

std::string FormatBool(bool value) { return value ? "1" : "0"; }

std::string FormatType(TestPartResult::Type value) {
switch (value) {
case TestPartResult::kSkip:
return "skip";
case TestPartResult::kSuccess:
return "success";
case TestPartResult::kNonFatalFailure:
case TestPartResult::kFatalFailure:
return "failure";
default:
return "unknown";
}
}

const std::unique_ptr<AbstractSocketWriter> socket_writer_;

StreamingListener(const StreamingListener&) = delete;
Expand Down
42 changes: 41 additions & 1 deletion googletest/test/gtest_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,47 @@ TEST_F(StreamingListenerTest, OnTestPartResult) {

// Meta characters in the failure message should be properly escaped.
EXPECT_EQ(
"event=TestPartResult&file=foo.cc&line=42&message=failed%3D%0A%26%25\n",
"event=TestPartResult&type=failure&file=foo.cc&line=42&message=failed%3D%0A%26%25\n",
*output());
}

TEST_F(StreamingListenerTest, OnTestPartResultSkip) {
*output() = "";
streamer_.OnTestPartResult(TestPartResult(TestPartResult::kSkip,
"foo.cc", 42, "Skipped"));

EXPECT_EQ(
"event=TestPartResult&type=skip&file=foo.cc&line=42&message=Skipped\n",
*output());
}

TEST_F(StreamingListenerTest, OnTestPartResultSuccess) {
*output() = "";
davidmatson marked this conversation as resolved.
Show resolved Hide resolved
streamer_.OnTestPartResult(TestPartResult(TestPartResult::kSuccess,
"foo.cc", 42, "Succeeded"));

EXPECT_EQ(
"event=TestPartResult&type=success&file=foo.cc&line=42&message=Succeeded\n",
*output());
}

TEST_F(StreamingListenerTest, OnTestPartResultNonFatalFailure) {
*output() = "";
streamer_.OnTestPartResult(TestPartResult(TestPartResult::kNonFatalFailure,
"foo.cc", 42, "Failed"));

EXPECT_EQ(
"event=TestPartResult&type=failure&file=foo.cc&line=42&message=Failed\n",
*output());
}

TEST_F(StreamingListenerTest, OnTestPartResultUnknown) {
*output() = "";
streamer_.OnTestPartResult(TestPartResult((TestPartResult::Type)-1,
"foo.cc", 42, "Other"));

EXPECT_EQ(
"event=TestPartResult&type=unknown&file=foo.cc&line=42&message=Other\n",
*output());
}

Expand Down