Skip to content

trace_events: add traced_value.cc/traced_value.h #21475

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

Closed
jasnell wants to merge 5 commits into from
Closed

trace_events: add traced_value.cc/traced_value.h #21475

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
509a715
trace_events: add traced_value.cc/traced_value.h
jasnell Jun 22, 2018
629f936
[Squash] add test, better escaping[Squash] add test, better escaping
jasnell Jul 11, 2018
239e870
[Squash] fix lint
jasnell Jul 11, 2018
8f25cc1
[Squash] hopefully avoid failure on windows
jasnell Jul 12, 2018
c62c810
[Squash] fix without-intl[Squash] fix without-intl
jasnell Jul 12, 2018
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
Prev Previous commit
Next Next commit
[Squash] hopefully avoid failure on windows
  • Loading branch information
@jasnell
jasnell committed Jul 12, 2018
commit 8f25cc1d41a5494a22c54f0dcab7c66b82543bf5
31 changes: 13 additions & 18 deletions test/cctest/test_traced_value.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,40 +62,35 @@ TEST(TracedValue, Array) {
EXPECT_EQ(check, string);
}

#define UTF8_SEQUENCE "1" "\xE2\x82\xAC" "23\"\x01\b\f\n\r\t\\"
#if defined(NODE_HAVE_I18N_SUPPORT)
# define UTF8_RESULT \
"\"1\\u20AC23\\\"\\u0001\\b\\f\\n\\r\\t\\\\\""
#else
# define UTF8_RESULT \
"\"1\\u00E2\\u0082\\u00AC23\\\"\\u0001\\b\\f\\n\\r\\t\\\\\""
#endif

TEST(TracedValue, EscapingObject) {
// Verify that special characters in the value are escaped properly
auto traced_value = TracedValue::Create();
traced_value->SetString("a", "1\u20ac23\"\u0001\b\f\n\r\t\\");
traced_value->SetString("a", UTF8_SEQUENCE);

std::string string;
traced_value->AppendAsTraceFormat(&string);

#if defined(NODE_HAVE_I18N_SUPPORT)
static const char* check =
"{\"a\":\"1\\u20AC23\\\"\\u0001\\b\\f\\n\\r\\t\\\\\"}";
#else
static const char* check =
"{\"a\":\"1\\u00E2\\u0082\\u00AC23\\\"\\u0001\\b\\f\\n\\r\\t\\\\\"}";
#endif
static const char* check = "{\"a\":" UTF8_RESULT "}";

EXPECT_EQ(check, string);
}

TEST(TracedValue, EscapingArray) {
// Verify that special characters in the value are escaped properly
auto traced_value = TracedValue::CreateArray();
traced_value->AppendString("1\u20ac23\"\u0001\b\f\n\r\t\\");
traced_value->AppendString(UTF8_SEQUENCE);

std::string string;
traced_value->AppendAsTraceFormat(&string);

#if defined(NODE_HAVE_I18N_SUPPORT)
static const char* check =
"[\"1\\u20AC23\\\"\\u0001\\b\\f\\n\\r\\t\\\\\"]";
#else
static const char* check =
"[\"1\\u00E2\\u0082\\u00AC23\\\"\\u0001\\b\\f\\n\\r\\t\\\\\"]";
#endif
static const char* check = "[" UTF8_RESULT "]";

EXPECT_EQ(check, string);
}