From b2960e4721867dc5623660a8c884cc9114143584 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 4 Jan 2018 17:34:15 -0500 Subject: [PATCH] test: use hex string literals Signed-off-by: Casey Bodley --- src/test/escape.cc | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/test/escape.cc b/src/test/escape.cc index 310897467f42..973dd19dfe3f 100644 --- a/src/test/escape.cc +++ b/src/test/escape.cc @@ -37,21 +37,16 @@ TEST(EscapeXml, EntityRefs1) { } TEST(EscapeXml, ControlChars) { - uint8_t cc1[] = { 0x01, 0x02, 0x03, 0x0 }; - ASSERT_EQ(escape_xml_attrs((char*)cc1), ""); + ASSERT_EQ(escape_xml_attrs("\x01\x02\x03"), ""); - uint8_t cc2[] = { 0x61, 0x62, 0x63, 0x7f, 0x0 }; - ASSERT_EQ(escape_xml_attrs((char*)cc2), "abc"); + ASSERT_EQ(escape_xml_attrs("abc\x7f"), "abc"); } TEST(EscapeXml, Utf8) { - uint8_t cc1[] = { 0xe6, 0xb1, 0x89, 0xe5, 0xad, 0x97, 0x0a, 0x0 }; - ASSERT_EQ(escape_xml_attrs((const char*)cc1), (const char*)cc1); + const char *cc1 = "\xe6\xb1\x89\xe5\xad\x97\n"; + ASSERT_EQ(escape_xml_attrs(cc1), cc1); - uint8_t cc2[] = { 0x3c, 0xe6, 0xb1, 0x89, 0xe5, 0xad, 0x97, 0x3e, 0x0a, 0x0 }; - uint8_t cc2_out[] = { 0x26, 0x6c, 0x74, 0x3b, 0xe6, 0xb1, 0x89, 0xe5, - 0xad, 0x97, 0x26, 0x67, 0x74, 0x3b, 0x0a, 0x0 }; - ASSERT_EQ(escape_xml_attrs((const char*)cc2), (const char*)cc2_out); + ASSERT_EQ(escape_xml_attrs("<\xe6\xb1\x89\xe5\xad\x97>\n"), "<\xe6\xb1\x89\xe5\xad\x97>\n"); } static std::string escape_json_attrs(const char *str) @@ -80,14 +75,11 @@ TEST(EscapeJson, Escapes1) { } TEST(EscapeJson, ControlChars) { - uint8_t cc1[] = { 0x01, 0x02, 0x03, 0x0 }; - ASSERT_EQ(escape_json_attrs((char*)cc1), "\\u0001\\u0002\\u0003"); + ASSERT_EQ(escape_json_attrs("\x01\x02\x03"), "\\u0001\\u0002\\u0003"); - uint8_t cc2[] = { 0x61, 0x62, 0x63, 0x7f, 0x0 }; - ASSERT_EQ(escape_json_attrs((char*)cc2), "abc\\u007f"); + ASSERT_EQ(escape_json_attrs("abc\x7f"), "abc\\u007f"); } TEST(EscapeJson, Utf8) { - uint8_t cc1[] = { 0xe6, 0xb1, 0x89, 0xe5, 0xad, 0x97, 0x0a, 0x0 }; - ASSERT_EQ(escape_xml_attrs((const char*)cc1), (const char*)cc1); + EXPECT_EQ(escape_xml_attrs("\xe6\xb1\x89\xe5\xad\x97\n"), "\xe6\xb1\x89\xe5\xad\x97\n"); } -- 2.47.3