Merging upstream version 1.60.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 428 insertions, 349 deletions

diff --git a/src/http2_test.cc b/src/http2_test.cc
index f8be9f4..3cb0b71 100644
--- a/src/http2_test.cc
+++ b/src/http2_test.cc
@@ -28,7 +28,7 @@
 #include <cstring>
 #include <iostream>
 
-#include <CUnit/CUnit.h>
+#include "munitxx.h"
 
 #include "url-parser/url_parser.h"
 
@@ -46,11 +46,38 @@ using namespace nghttp2;
 namespace shrpx {
 
 namespace {
+const MunitTest tests[]{
+    munit_void_test(test_http2_add_header),
+    munit_void_test(test_http2_get_header),
+    munit_void_test(test_http2_copy_headers_to_nva),
+    munit_void_test(test_http2_build_http1_headers_from_headers),
+    munit_void_test(test_http2_lws),
+    munit_void_test(test_http2_rewrite_location_uri),
+    munit_void_test(test_http2_parse_http_status_code),
+    munit_void_test(test_http2_index_header),
+    munit_void_test(test_http2_lookup_token),
+    munit_void_test(test_http2_parse_link_header),
+    munit_void_test(test_http2_path_join),
+    munit_void_test(test_http2_normalize_path),
+    munit_void_test(test_http2_rewrite_clean_path),
+    munit_void_test(test_http2_get_pure_path_component),
+    munit_void_test(test_http2_construct_push_component),
+    munit_void_test(test_http2_contains_trailers),
+    munit_void_test(test_http2_check_transfer_encoding),
+    munit_test_end(),
+};
+} // namespace
+
+const MunitSuite http2_suite{
+    "/http2", tests, NULL, 1, MUNIT_SUITE_OPTION_NONE,
+};
+
+namespace {
 void check_nv(const HeaderRef &a, const nghttp2_nv *b) {
-  CU_ASSERT(a.name.size() == b->namelen);
-  CU_ASSERT(a.value.size() == b->valuelen);
-  CU_ASSERT(memcmp(a.name.c_str(), b->name, b->namelen) == 0);
-  CU_ASSERT(memcmp(a.value.c_str(), b->value, b->valuelen) == 0);
+  assert_size(a.name.size(), ==, b->namelen);
+  assert_size(a.value.size(), ==, b->valuelen);
+  assert_memory_equal(b->namelen, a.name.c_str(), b->name);
+  assert_memory_equal(b->valuelen, a.value.c_str(), b->value);
 }
 } // namespace
 
@@ -59,51 +86,51 @@ void test_http2_add_header(void) {
 
   http2::add_header(nva, (const uint8_t *)"alpha", 5, (const uint8_t *)"123", 3,
                     false, -1);
-  CU_ASSERT(Headers::value_type("alpha", "123") == nva[0]);
-  CU_ASSERT(!nva[0].no_index);
+  assert_true(Headers::value_type("alpha", "123") == nva[0]);
+  assert_false(nva[0].no_index);
 
   nva.clear();
 
   http2::add_header(nva, (const uint8_t *)"alpha", 5, (const uint8_t *)"", 0,
                     true, -1);
-  CU_ASSERT(Headers::value_type("alpha", "") == nva[0]);
-  CU_ASSERT(nva[0].no_index);
+  assert_true(Headers::value_type("alpha", "") == nva[0]);
+  assert_true(nva[0].no_index);
 
   nva.clear();
 
   http2::add_header(nva, (const uint8_t *)"a", 1, (const uint8_t *)" b", 2,
                     false, -1);
-  CU_ASSERT(Headers::value_type("a", "b") == nva[0]);
+  assert_true(Headers::value_type("a", "b") == nva[0]);
 
   nva.clear();
 
   http2::add_header(nva, (const uint8_t *)"a", 1, (const uint8_t *)"b ", 2,
                     false, -1);
-  CU_ASSERT(Headers::value_type("a", "b") == nva[0]);
+  assert_true(Headers::value_type("a", "b") == nva[0]);
 
   nva.clear();
 
   http2::add_header(nva, (const uint8_t *)"a", 1, (const uint8_t *)"  b  ", 5,
                     false, -1);
-  CU_ASSERT(Headers::value_type("a", "b") == nva[0]);
+  assert_true(Headers::value_type("a", "b") == nva[0]);
 
   nva.clear();
 
   http2::add_header(nva, (const uint8_t *)"a", 1, (const uint8_t *)"  bravo  ",
                     9, false, -1);
-  CU_ASSERT(Headers::value_type("a", "bravo") == nva[0]);
+  assert_true(Headers::value_type("a", "bravo") == nva[0]);
 
   nva.clear();
 
   http2::add_header(nva, (const uint8_t *)"a", 1, (const uint8_t *)"    ", 4,
                     false, -1);
-  CU_ASSERT(Headers::value_type("a", "") == nva[0]);
+  assert_true(Headers::value_type("a", "") == nva[0]);
 
   nva.clear();
 
   http2::add_header(nva, (const uint8_t *)"te", 2, (const uint8_t *)"trailers",
                     8, false, http2::HD_TE);
-  CU_ASSERT(http2::HD_TE == nva[0].token);
+  assert_int32(http2::HD_TE, ==, nva[0].token);
 }
 
 void test_http2_get_header(void) {
@@ -112,21 +139,21 @@ void test_http2_get_header(void) {
                      {"content-length", "7"}};
   const Headers::value_type *rv;
   rv = http2::get_header(nva, "delta");
-  CU_ASSERT(rv != nullptr);
-  CU_ASSERT("delta" == rv->name);
+  assert_not_null(rv);
+  assert_stdstring_equal("delta", rv->name);
 
   rv = http2::get_header(nva, "bravo");
-  CU_ASSERT(rv != nullptr);
-  CU_ASSERT("bravo" == rv->name);
+  assert_not_null(rv);
+  assert_stdstring_equal("bravo", rv->name);
 
   rv = http2::get_header(nva, "foxtrot");
-  CU_ASSERT(rv == nullptr);
+  assert_null(rv);
 
   http2::HeaderIndex hdidx;
   http2::init_hdidx(hdidx);
   hdidx[http2::HD_CONTENT_LENGTH] = 6;
   rv = http2::get_header(hdidx, http2::HD_CONTENT_LENGTH, nva);
-  CU_ASSERT("content-length" == rv->name);
+  assert_stdstring_equal("content-length", rv->name);
 }
 
 namespace {
@@ -177,29 +204,31 @@ void test_http2_copy_headers_to_nva(void) {
 
   http2::copy_headers_to_nva_nocopy(nva, headers,
                                     http2::HDOP_STRIP_X_FORWARDED_FOR);
-  CU_ASSERT(7 == nva.size());
+  assert_size(7, ==, nva.size());
   for (size_t i = 0; i < ans.size(); ++i) {
     check_nv(headers[ans[i]], &nva[i]);
 
     if (ans[i] == 0) {
-      CU_ASSERT((NGHTTP2_NV_FLAG_NO_COPY_NAME | NGHTTP2_NV_FLAG_NO_COPY_VALUE |
-                 NGHTTP2_NV_FLAG_NO_INDEX) == nva[i].flags);
+      assert_uint8((NGHTTP2_NV_FLAG_NO_COPY_NAME |
+                    NGHTTP2_NV_FLAG_NO_COPY_VALUE | NGHTTP2_NV_FLAG_NO_INDEX),
+                   ==, nva[i].flags);
     } else {
-      CU_ASSERT((NGHTTP2_NV_FLAG_NO_COPY_NAME |
-                 NGHTTP2_NV_FLAG_NO_COPY_VALUE) == nva[i].flags);
+      assert_uint8(
+          (NGHTTP2_NV_FLAG_NO_COPY_NAME | NGHTTP2_NV_FLAG_NO_COPY_VALUE), ==,
+          nva[i].flags);
     }
   }
 
   nva.clear();
   http2::copy_headers_to_nva(nva, headers, http2::HDOP_STRIP_X_FORWARDED_FOR);
-  CU_ASSERT(7 == nva.size());
+  assert_size(7, ==, nva.size());
   for (size_t i = 0; i < ans.size(); ++i) {
     check_nv(headers[ans[i]], &nva[i]);
 
     if (ans[i] == 0) {
-      CU_ASSERT(nva[i].flags & NGHTTP2_NV_FLAG_NO_INDEX);
+      assert_true(nva[i].flags & NGHTTP2_NV_FLAG_NO_INDEX);
     } else {
-      CU_ASSERT(NGHTTP2_NV_FLAG_NONE == nva[i].flags);
+      assert_false(nva[i].flags);
     }
   }
 
@@ -207,7 +236,7 @@ void test_http2_copy_headers_to_nva(void) {
 
   auto ans2 = std::vector<int>{0, 2, 4, 6};
   http2::copy_headers_to_nva(nva, headers2, http2::HDOP_NONE);
-  CU_ASSERT(ans2.size() == nva.size());
+  assert_size(ans2.size(), ==, nva.size());
   for (size_t i = 0; i < ans2.size(); ++i) {
     check_nv(headers2[ans2[i]], &nva[i]);
   }
@@ -215,7 +244,7 @@ void test_http2_copy_headers_to_nva(void) {
   nva.clear();
 
   http2::copy_headers_to_nva(nva, headers2, http2::HDOP_STRIP_ALL);
-  CU_ASSERT(nva.empty());
+  assert_true(nva.empty());
 }
 
 void test_http2_build_http1_headers_from_headers(void) {
@@ -224,36 +253,38 @@ void test_http2_build_http1_headers_from_headers(void) {
   http2::build_http1_headers_from_headers(&buf, headers,
                                           http2::HDOP_STRIP_X_FORWARDED_FOR);
   auto hdrs = std::string(buf.head->pos, buf.head->last);
-  CU_ASSERT("Alpha: 0\r\n"
-            "Bravo: 1\r\n"
-            "Delta: 4\r\n"
-            "Expect: 5\r\n"
-            "Foxtrot: 6\r\n"
-            "Tango: 7\r\n"
-            "Te: 8\r\n"
-            "Te: 9\r\n"
-            "Zulu: 12\r\n" == hdrs);
+  assert_stdstring_equal("Alpha: 0\r\n"
+                         "Bravo: 1\r\n"
+                         "Delta: 4\r\n"
+                         "Expect: 5\r\n"
+                         "Foxtrot: 6\r\n"
+                         "Tango: 7\r\n"
+                         "Te: 8\r\n"
+                         "Te: 9\r\n"
+                         "Zulu: 12\r\n",
+                         hdrs);
 
   buf.reset();
 
   http2::build_http1_headers_from_headers(&buf, headers2, http2::HDOP_NONE);
   hdrs = std::string(buf.head->pos, buf.head->last);
-  CU_ASSERT("X-Forwarded-For: xff1\r\n"
-            "X-Forwarded-Proto: xfp1\r\n"
-            "Forwarded: fwd1\r\n"
-            "Via: via1\r\n" == hdrs);
+  assert_stdstring_equal("X-Forwarded-For: xff1\r\n"
+                         "X-Forwarded-Proto: xfp1\r\n"
+                         "Forwarded: fwd1\r\n"
+                         "Via: via1\r\n",
+                         hdrs);
 
   buf.reset();
 
   http2::build_http1_headers_from_headers(&buf, headers2,
                                           http2::HDOP_STRIP_ALL);
-  CU_ASSERT(0 == buf.rleft());
+  assert_size(0, ==, buf.rleft());
 }
 
 void test_http2_lws(void) {
-  CU_ASSERT(!http2::lws("alpha"));
-  CU_ASSERT(http2::lws(" "));
-  CU_ASSERT(http2::lws(""));
+  assert_false(http2::lws("alpha"));
+  assert_true(http2::lws(" "));
+  assert_true(http2::lws(""));
 }
 
 namespace {
@@ -263,11 +294,11 @@ void check_rewrite_location_uri(const std::string &want, const std::string &uri,
                                 const std::string &upstream_scheme) {
   BlockAllocator balloc(4096, 4096);
   http_parser_url u{};
-  CU_ASSERT(0 == http_parser_parse_url(uri.c_str(), uri.size(), 0, &u));
+  assert_int(0, ==, http_parser_parse_url(uri.c_str(), uri.size(), 0, &u));
   auto got = http2::rewrite_location_uri(
       balloc, StringRef{uri}, u, StringRef{match_host},
       StringRef{req_authority}, StringRef{upstream_scheme});
-  CU_ASSERT(want == got);
+  assert_stdstring_equal(want, got.str());
 }
 } // namespace
 
@@ -299,13 +330,15 @@ void test_http2_rewrite_location_uri(void) {
 }
 
 void test_http2_parse_http_status_code(void) {
-  CU_ASSERT(200 == http2::parse_http_status_code(StringRef::from_lit("200")));
-  CU_ASSERT(102 == http2::parse_http_status_code(StringRef::from_lit("102")));
-  CU_ASSERT(-1 == http2::parse_http_status_code(StringRef::from_lit("099")));
-  CU_ASSERT(-1 == http2::parse_http_status_code(StringRef::from_lit("99")));
-  CU_ASSERT(-1 == http2::parse_http_status_code(StringRef::from_lit("-1")));
-  CU_ASSERT(-1 == http2::parse_http_status_code(StringRef::from_lit("20a")));
-  CU_ASSERT(-1 == http2::parse_http_status_code(StringRef{}));
+  assert_int(200, ==,
+             http2::parse_http_status_code(StringRef::from_lit("200")));
+  assert_int(102, ==,
+             http2::parse_http_status_code(StringRef::from_lit("102")));
+  assert_int(-1, ==, http2::parse_http_status_code(StringRef::from_lit("099")));
+  assert_int(-1, ==, http2::parse_http_status_code(StringRef::from_lit("99")));
+  assert_int(-1, ==, http2::parse_http_status_code(StringRef::from_lit("-1")));
+  assert_int(-1, ==, http2::parse_http_status_code(StringRef::from_lit("20a")));
+  assert_int(-1, ==, http2::parse_http_status_code(StringRef{}));
 }
 
 void test_http2_index_header(void) {
@@ -315,402 +348,402 @@ void test_http2_index_header(void) {
   http2::index_header(hdidx, http2::HD__AUTHORITY, 0);
   http2::index_header(hdidx, -1, 1);
 
-  CU_ASSERT(0 == hdidx[http2::HD__AUTHORITY]);
+  assert_uint16(0, ==, hdidx[http2::HD__AUTHORITY]);
 }
 
 void test_http2_lookup_token(void) {
-  CU_ASSERT(http2::HD__AUTHORITY ==
-            http2::lookup_token(StringRef::from_lit(":authority")));
-  CU_ASSERT(-1 == http2::lookup_token(StringRef::from_lit(":authorit")));
-  CU_ASSERT(-1 == http2::lookup_token(StringRef::from_lit(":Authority")));
-  CU_ASSERT(http2::HD_EXPECT ==
-            http2::lookup_token(StringRef::from_lit("expect")));
+  assert_int(http2::HD__AUTHORITY, ==,
+             http2::lookup_token(StringRef::from_lit(":authority")));
+  assert_int(-1, ==, http2::lookup_token(StringRef::from_lit(":authorit")));
+  assert_int(-1, ==, http2::lookup_token(StringRef::from_lit(":Authority")));
+  assert_int(http2::HD_EXPECT, ==,
+             http2::lookup_token(StringRef::from_lit("expect")));
 }
 
 void test_http2_parse_link_header(void) {
   {
     // only URI appears; we don't extract URI unless it bears rel=preload
     auto res = http2::parse_link_header(StringRef::from_lit("<url>"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // URI url should be extracted
     auto res =
         http2::parse_link_header(StringRef::from_lit("<url>; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // With extra link-param.  URI url should be extracted
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; rel=preload; as=file"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // With extra link-param.  URI url should be extracted
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; as=file; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // With extra link-param and quote-string.  URI url should be
     // extracted
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel=preload; title="foo,bar")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // With extra link-param and quote-string.  URI url should be
     // extracted
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; title="foo,bar"; rel=preload)"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // ',' after quote-string
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; title="foo,bar", <url2>; rel=preload)"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url2", res[0].uri.str());
   }
   {
     // Only first URI should be extracted.
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; rel=preload, <url2>"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // Both have rel=preload, so both urls should be extracted
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; rel=preload, <url2>; rel=preload"));
-    CU_ASSERT(2 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-    CU_ASSERT("url2" == res[1].uri);
+    assert_size(2, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
+    assert_stdstring_equal("url2", res[1].uri.str());
   }
   {
     // Second URI uri should be extracted.
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>, <url2>;rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url2", res[0].uri.str());
   }
   {
     // Error if input ends with ';'
     auto res =
         http2::parse_link_header(StringRef::from_lit("<url>;rel=preload;"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // Error if link header ends with ';'
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>;rel=preload;, <url>"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // OK if input ends with ','
     auto res =
         http2::parse_link_header(StringRef::from_lit("<url>;rel=preload,"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // Multiple repeated ','s between fields is OK
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>,,,<url2>;rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url2", res[0].uri.str());
   }
   {
     // Error if url is not enclosed by <>
     auto res =
         http2::parse_link_header(StringRef::from_lit("url>;rel=preload"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // Error if url is not enclosed by <>
     auto res =
         http2::parse_link_header(StringRef::from_lit("<url;rel=preload"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // Empty parameter value is not allowed
     auto res =
         http2::parse_link_header(StringRef::from_lit("<url>;rel=preload; as="));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // Empty parameter value is not allowed
     auto res =
         http2::parse_link_header(StringRef::from_lit("<url>;as=;rel=preload"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // Empty parameter value is not allowed
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>;as=, <url>;rel=preload"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // Empty parameter name is not allowed
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; =file; rel=preload"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // Without whitespaces
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>;as=file;rel=preload,<url2>;rel=preload"));
-    CU_ASSERT(2 == res.size());
-    CU_ASSERT("url" == res[0].uri);
-    CU_ASSERT("url2" == res[1].uri);
+    assert_size(2, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
+    assert_stdstring_equal("url2", res[1].uri.str());
   }
   {
     // link-extension may have no value
     auto res =
         http2::parse_link_header(StringRef::from_lit("<url>; as; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // ext-name-star
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; foo*=bar; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // '*' is not allowed expect for trailing one
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; *=bar; rel=preload"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // '*' is not allowed expect for trailing one
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; foo*bar=buzz; rel=preload"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // ext-name-star must be followed by '='
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; foo*; rel=preload"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // '>' is not followed by ';'
     auto res =
         http2::parse_link_header(StringRef::from_lit("<url> rel=preload"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // Starting with whitespace is no problem.
     auto res =
         http2::parse_link_header(StringRef::from_lit("  <url>; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // preload is a prefix of bogus rel parameter value
     auto res =
         http2::parse_link_header(StringRef::from_lit("<url>; rel=preloadx"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // preload in relation-types list
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="preload")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // preload in relation-types list followed by another parameter
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="preload foo")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // preload in relation-types list following another parameter
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="foo preload")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // preload in relation-types list between other parameters
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="foo preload bar")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // preload in relation-types list between other parameters
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="foo   preload   bar")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // no preload in relation-types list
     auto res =
         http2::parse_link_header(StringRef::from_lit(R"(<url>; rel="foo")"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // no preload in relation-types list, multiple unrelated elements.
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="foo bar")"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // preload in relation-types list, followed by another link-value.
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="preload", <url2>)"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // preload in relation-types list, following another link-value.
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>, <url2>; rel="preload")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url2", res[0].uri.str());
   }
   {
     // preload in relation-types list, followed by another link-param.
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="preload"; as="font")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // preload in relation-types list, followed by character other
     // than ';' or ','
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="preload".)"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // preload in relation-types list, followed by ';' but it
     // terminates input
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="preload";)"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // preload in relation-types list, followed by ',' but it
     // terminates input
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="preload",)"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // preload in relation-types list but there is preceding white
     // space.
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel=" preload")"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // preload in relation-types list but there is trailing white
     // space.
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel="preload ")"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // backslash escaped characters in quoted-string
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel=preload; title="foo\"baz\"bar")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // anchor="" is acceptable
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel=preload; anchor="")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // With anchor="#foo", url should be ignored
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel=preload; anchor="#foo")"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // With anchor=f, url should be ignored
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; rel=preload; anchor=f"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // First url is ignored With anchor="#foo", but url should be
     // accepted.
     auto res = http2::parse_link_header(StringRef::from_lit(
         R"(<url>; rel=preload; anchor="#foo", <url2>; rel=preload)"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url2", res[0].uri.str());
   }
   {
     // With loadpolicy="next", url should be ignored
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel=preload; loadpolicy="next")"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // url should be picked up if empty loadpolicy is specified
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel=preload; loadpolicy="")"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // case-insensitive match
     auto res = http2::parse_link_header(
         StringRef::from_lit(R"(<url>; rel=preload; ANCHOR="#foo", <url2>; )"
                             R"(REL=PRELOAD, <url3>; REL="foo PRELOAD bar")"));
-    CU_ASSERT(2 == res.size());
-    CU_ASSERT("url2" == res[0].uri);
-    CU_ASSERT("url3" == res[1].uri);
+    assert_size(2, ==, res.size());
+    assert_stdstring_equal("url2", res[0].uri.str());
+    assert_stdstring_equal("url3", res[1].uri.str());
   }
   {
     // nopush at the end of input
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; rel=preload; nopush"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // nopush followed by ';'
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; rel=preload; nopush; foo"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // nopush followed by ','
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; nopush; rel=preload"));
-    CU_ASSERT(0 == res.size());
+    assert_size(0, ==, res.size());
   }
   {
     // string whose prefix is nopush
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; nopushyes; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
   {
     // rel=preload twice
     auto res = http2::parse_link_header(
         StringRef::from_lit("<url>; rel=preload; rel=preload"));
-    CU_ASSERT(1 == res.size());
-    CU_ASSERT("url" == res[0].uri);
+    assert_size(1, ==, res.size());
+    assert_stdstring_equal("url", res[0].uri.str());
   }
 }
 
@@ -718,124 +751,132 @@ void test_http2_path_join(void) {
   {
     auto base = StringRef::from_lit("/");
     auto rel = StringRef::from_lit("/");
-    CU_ASSERT("/" == http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     auto base = StringRef::from_lit("/");
     auto rel = StringRef::from_lit("/alpha");
-    CU_ASSERT("/alpha" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/alpha", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // rel ends with trailing '/'
     auto base = StringRef::from_lit("/");
     auto rel = StringRef::from_lit("/alpha/");
-    CU_ASSERT("/alpha/" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/alpha/", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // rel contains multiple components
     auto base = StringRef::from_lit("/");
     auto rel = StringRef::from_lit("/alpha/bravo");
-    CU_ASSERT("/alpha/bravo" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/alpha/bravo", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // rel is relative
     auto base = StringRef::from_lit("/");
     auto rel = StringRef::from_lit("alpha/bravo");
-    CU_ASSERT("/alpha/bravo" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/alpha/bravo", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // rel is relative and base ends without /, which means it refers
     // to file.
     auto base = StringRef::from_lit("/alpha");
     auto rel = StringRef::from_lit("bravo/charlie");
-    CU_ASSERT("/bravo/charlie" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/bravo/charlie",
+        http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // rel contains repeated '/'s
     auto base = StringRef::from_lit("/");
     auto rel = StringRef::from_lit("/alpha/////bravo/////");
-    CU_ASSERT("/alpha/bravo/" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/alpha/bravo/", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // base ends with '/', so '..' eats 'bravo'
     auto base = StringRef::from_lit("/alpha/bravo/");
     auto rel = StringRef::from_lit("../charlie/delta");
-    CU_ASSERT("/alpha/charlie/delta" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/alpha/charlie/delta",
+        http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // base does not end with '/', so '..' eats 'alpha/bravo'
     auto base = StringRef::from_lit("/alpha/bravo");
     auto rel = StringRef::from_lit("../charlie");
-    CU_ASSERT("/charlie" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/charlie", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // 'charlie' is eaten by following '..'
     auto base = StringRef::from_lit("/alpha/bravo/");
     auto rel = StringRef::from_lit("../charlie/../delta");
-    CU_ASSERT("/alpha/delta" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/alpha/delta", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // excessive '..' results in '/'
     auto base = StringRef::from_lit("/alpha/bravo/");
     auto rel = StringRef::from_lit("../../../");
-    CU_ASSERT("/" == http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // excessive '..'  and  path component
     auto base = StringRef::from_lit("/alpha/bravo/");
     auto rel = StringRef::from_lit("../../../charlie");
-    CU_ASSERT("/charlie" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/charlie", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // rel ends with '..'
     auto base = StringRef::from_lit("/alpha/bravo/");
     auto rel = StringRef::from_lit("charlie/..");
-    CU_ASSERT("/alpha/bravo/" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/alpha/bravo/", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // base empty and rel contains '..'
     auto base = StringRef{};
     auto rel = StringRef::from_lit("charlie/..");
-    CU_ASSERT("/" == http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // '.' is ignored
     auto base = StringRef::from_lit("/");
     auto rel = StringRef::from_lit("charlie/././././delta");
-    CU_ASSERT("/charlie/delta" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/charlie/delta",
+        http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // trailing '.' is ignored
     auto base = StringRef::from_lit("/");
     auto rel = StringRef::from_lit("charlie/.");
-    CU_ASSERT("/charlie/" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/charlie/", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // query
     auto base = StringRef::from_lit("/");
     auto rel = StringRef::from_lit("/");
     auto relq = StringRef::from_lit("q");
-    CU_ASSERT("/?q" == http2::path_join(base, StringRef{}, rel, relq));
+    assert_stdstring_equal("/?q",
+                           http2::path_join(base, StringRef{}, rel, relq));
   }
   {
     // empty rel and query
     auto base = StringRef::from_lit("/alpha");
     auto rel = StringRef{};
     auto relq = StringRef::from_lit("q");
-    CU_ASSERT("/alpha?q" == http2::path_join(base, StringRef{}, rel, relq));
+    assert_stdstring_equal("/alpha?q",
+                           http2::path_join(base, StringRef{}, rel, relq));
   }
   {
     // both rel and query are empty
@@ -843,26 +884,28 @@ void test_http2_path_join(void) {
     auto baseq = StringRef::from_lit("r");
     auto rel = StringRef{};
     auto relq = StringRef{};
-    CU_ASSERT("/alpha?r" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/alpha?r",
+                           http2::path_join(base, baseq, rel, relq));
   }
   {
     // empty base
     auto base = StringRef{};
     auto rel = StringRef::from_lit("/alpha");
-    CU_ASSERT("/alpha" ==
-              http2::path_join(base, StringRef{}, rel, StringRef{}));
+    assert_stdstring_equal(
+        "/alpha", http2::path_join(base, StringRef{}, rel, StringRef{}));
   }
   {
     // everything is empty
-    CU_ASSERT("/" == http2::path_join(StringRef{}, StringRef{}, StringRef{},
-                                      StringRef{}));
+    assert_stdstring_equal("/", http2::path_join(StringRef{}, StringRef{},
+                                                 StringRef{}, StringRef{}));
   }
   {
     // only baseq is not empty
     auto base = StringRef{};
     auto baseq = StringRef::from_lit("r");
     auto rel = StringRef{};
-    CU_ASSERT("/?r" == http2::path_join(base, baseq, rel, StringRef{}));
+    assert_stdstring_equal("/?r",
+                           http2::path_join(base, baseq, rel, StringRef{}));
   }
   {
     // path starts with multiple '/'s.
@@ -870,8 +913,8 @@ void test_http2_path_join(void) {
     auto baseq = StringRef{};
     auto rel = StringRef::from_lit("//alpha//bravo");
     auto relq = StringRef::from_lit("charlie");
-    CU_ASSERT("/alpha/bravo?charlie" ==
-              http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/alpha/bravo?charlie",
+                           http2::path_join(base, baseq, rel, relq));
   }
   // Test cases from RFC 3986, section 5.4.
   constexpr auto base = StringRef::from_lit("/b/c/d;p");
@@ -879,239 +922,266 @@ void test_http2_path_join(void) {
   {
     auto rel = StringRef::from_lit("g");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/g", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("./g");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/g", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("g/");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/g/" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/g/", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("/g");
     auto relq = StringRef{};
-    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/g", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef{};
     auto relq = StringRef::from_lit("y");
-    CU_ASSERT("/b/c/d;p?y" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/d;p?y",
+                           http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("g");
     auto relq = StringRef::from_lit("y");
-    CU_ASSERT("/b/c/g?y" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/g?y",
+                           http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit(";x");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/;x" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/;x", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("g;x");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/g;x" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/g;x",
+                           http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("g;x");
     auto relq = StringRef::from_lit("y");
-    CU_ASSERT("/b/c/g;x?y" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/g;x?y",
+                           http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef{};
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/d;p?q" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/d;p?q",
+                           http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit(".");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("./");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("..");
     auto relq = StringRef{};
-    CU_ASSERT("/b/" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("../");
     auto relq = StringRef{};
-    CU_ASSERT("/b/" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("../g");
     auto relq = StringRef{};
-    CU_ASSERT("/b/g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/g", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("../..");
     auto relq = StringRef{};
-    CU_ASSERT("/" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("../../");
     auto relq = StringRef{};
-    CU_ASSERT("/" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("../../g");
     auto relq = StringRef{};
-    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/g", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("../../../g");
     auto relq = StringRef{};
-    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/g", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("../../../../g");
     auto relq = StringRef{};
-    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/g", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("/./g");
     auto relq = StringRef{};
-    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/g", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("/../g");
     auto relq = StringRef{};
-    CU_ASSERT("/g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/g", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("g.");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/g." == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/g.", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit(".g");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/.g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/.g", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("g..");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/g.." == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/g..",
+                           http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("..g");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/..g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/..g",
+                           http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("./../g");
     auto relq = StringRef{};
-    CU_ASSERT("/b/g" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/g", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("./g/.");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/g/" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/g/", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("g/./h");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/g/h" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/g/h",
+                           http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("g/../h");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/h" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/h", http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("g;x=1/./y");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/g;x=1/y" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/g;x=1/y",
+                           http2::path_join(base, baseq, rel, relq));
   }
   {
     auto rel = StringRef::from_lit("g;x=1/../y");
     auto relq = StringRef{};
-    CU_ASSERT("/b/c/y" == http2::path_join(base, baseq, rel, relq));
+    assert_stdstring_equal("/b/c/y", http2::path_join(base, baseq, rel, relq));
   }
 }
 
 void test_http2_normalize_path(void) {
-  CU_ASSERT("/alpha/charlie" ==
-            http2::normalize_path(
-                StringRef::from_lit("/alpha/bravo/../charlie"), StringRef{}));
+  assert_stdstring_equal(
+      "/alpha/charlie",
+      http2::normalize_path(StringRef::from_lit("/alpha/bravo/../charlie"),
+                            StringRef{}));
 
-  CU_ASSERT("/alpha" ==
-            http2::normalize_path(StringRef::from_lit("/a%6c%70%68%61"),
-                                  StringRef{}));
+  assert_stdstring_equal(
+      "/alpha", http2::normalize_path(StringRef::from_lit("/a%6c%70%68%61"),
+                                      StringRef{}));
 
-  CU_ASSERT(
-      "/alpha%2F%3A" ==
+  assert_stdstring_equal(
+      "/alpha%2F%3A",
       http2::normalize_path(StringRef::from_lit("/alpha%2f%3a"), StringRef{}));
 
-  CU_ASSERT("/%2F" ==
-            http2::normalize_path(StringRef::from_lit("%2f"), StringRef{}));
+  assert_stdstring_equal(
+      "/%2F", http2::normalize_path(StringRef::from_lit("%2f"), StringRef{}));
 
-  CU_ASSERT("/%f" ==
-            http2::normalize_path(StringRef::from_lit("%f"), StringRef{}));
+  assert_stdstring_equal(
+      "/%f", http2::normalize_path(StringRef::from_lit("%f"), StringRef{}));
 
-  CU_ASSERT("/%" ==
-            http2::normalize_path(StringRef::from_lit("%"), StringRef{}));
+  assert_stdstring_equal(
+      "/%", http2::normalize_path(StringRef::from_lit("%"), StringRef{}));
 
-  CU_ASSERT("/" == http2::normalize_path(StringRef{}, StringRef{}));
+  assert_stdstring_equal("/", http2::normalize_path(StringRef{}, StringRef{}));
 
-  CU_ASSERT("/alpha?bravo" ==
-            http2::normalize_path(StringRef::from_lit("/alpha"),
-                                  StringRef::from_lit("bravo")));
+  assert_stdstring_equal("/alpha?bravo",
+                         http2::normalize_path(StringRef::from_lit("/alpha"),
+                                               StringRef::from_lit("bravo")));
 }
 
 void test_http2_rewrite_clean_path(void) {
   BlockAllocator balloc(4096, 4096);
 
   // unreserved characters
-  CU_ASSERT("/alpha/bravo/" ==
-            http2::rewrite_clean_path(balloc,
-                                      StringRef::from_lit("/alpha/%62ravo/")));
+  assert_stdstring_equal(
+      "/alpha/bravo/",
+      http2::rewrite_clean_path(balloc, StringRef::from_lit("/alpha/%62ravo/"))
+          .str());
 
   // percent-encoding is converted to upper case.
-  CU_ASSERT("/delta%3A" == http2::rewrite_clean_path(
-                               balloc, StringRef::from_lit("/delta%3a")));
+  assert_stdstring_equal(
+      "/delta%3A",
+      http2::rewrite_clean_path(balloc, StringRef::from_lit("/delta%3a"))
+          .str());
 
   // path component is normalized before matching
-  CU_ASSERT(
-      "/alpha/bravo/" ==
+  assert_stdstring_equal(
+      "/alpha/bravo/",
       http2::rewrite_clean_path(
-          balloc, StringRef::from_lit("/alpha/charlie/%2e././bravo/delta/..")));
+          balloc, StringRef::from_lit("/alpha/charlie/%2e././bravo/delta/.."))
+          .str());
 
-  CU_ASSERT("alpha%3a" ==
-            http2::rewrite_clean_path(balloc, StringRef::from_lit("alpha%3a")));
+  assert_stdstring_equal(
+      "alpha%3a",
+      http2::rewrite_clean_path(balloc, StringRef::from_lit("alpha%3a")).str());
 
-  CU_ASSERT("" == http2::rewrite_clean_path(balloc, StringRef{}));
+  assert_stdstring_equal("",
+                         http2::rewrite_clean_path(balloc, StringRef{}).str());
 
-  CU_ASSERT(
-      "/alpha?bravo" ==
-      http2::rewrite_clean_path(balloc, StringRef::from_lit("//alpha?bravo")));
+  assert_stdstring_equal(
+      "/alpha?bravo",
+      http2::rewrite_clean_path(balloc, StringRef::from_lit("//alpha?bravo"))
+          .str());
 }
 
 void test_http2_get_pure_path_component(void) {
-  CU_ASSERT("/" == http2::get_pure_path_component(StringRef::from_lit("/")));
-
-  CU_ASSERT("/foo" ==
-            http2::get_pure_path_component(StringRef::from_lit("/foo")));
-
-  CU_ASSERT("/bar" == http2::get_pure_path_component(
-                          StringRef::from_lit("https://example.org/bar")));
-
-  CU_ASSERT("/alpha" == http2::get_pure_path_component(StringRef::from_lit(
-                            "https://example.org/alpha?q=a")));
-
-  CU_ASSERT("/bravo" == http2::get_pure_path_component(StringRef::from_lit(
-                            "https://example.org/bravo?q=a#fragment")));
-
-  CU_ASSERT("" ==
-            http2::get_pure_path_component(StringRef::from_lit("\x01\x02")));
+  assert_stdstring_equal(
+      "/", http2::get_pure_path_component(StringRef::from_lit("/")).str());
+
+  assert_stdstring_equal(
+      "/foo",
+      http2::get_pure_path_component(StringRef::from_lit("/foo")).str());
+
+  assert_stdstring_equal("/bar",
+                         http2::get_pure_path_component(
+                             StringRef::from_lit("https://example.org/bar"))
+                             .str());
+
+  assert_stdstring_equal(
+      "/alpha", http2::get_pure_path_component(
+                    StringRef::from_lit("https://example.org/alpha?q=a"))
+                    .str());
+
+  assert_stdstring_equal(
+      "/bravo",
+      http2::get_pure_path_component(
+          StringRef::from_lit("https://example.org/bravo?q=a#fragment"))
+          .str());
+
+  assert_stdstring_equal(
+      "",
+      http2::get_pure_path_component(StringRef::from_lit("\x01\x02")).str());
 }
 
 void test_http2_construct_push_component(void) {
@@ -1122,11 +1192,12 @@ void test_http2_construct_push_component(void) {
   base = StringRef::from_lit("/b/");
   uri = StringRef::from_lit("https://example.org/foo");
 
-  CU_ASSERT(0 == http2::construct_push_component(balloc, scheme, authority,
-                                                 path, base, uri));
-  CU_ASSERT("https" == scheme);
-  CU_ASSERT("example.org" == authority);
-  CU_ASSERT("/foo" == path);
+  assert_int(0, ==,
+             http2::construct_push_component(balloc, scheme, authority, path,
+                                             base, uri));
+  assert_stdstring_equal("https", scheme.str());
+  assert_stdstring_equal("example.org", authority.str());
+  assert_stdstring_equal("/foo", path.str());
 
   scheme = StringRef{};
   authority = StringRef{};
@@ -1134,11 +1205,12 @@ void test_http2_construct_push_component(void) {
 
   uri = StringRef::from_lit("/foo/bar?q=a");
 
-  CU_ASSERT(0 == http2::construct_push_component(balloc, scheme, authority,
-                                                 path, base, uri));
-  CU_ASSERT("" == scheme);
-  CU_ASSERT("" == authority);
-  CU_ASSERT("/foo/bar?q=a" == path);
+  assert_int(0, ==,
+             http2::construct_push_component(balloc, scheme, authority, path,
+                                             base, uri));
+  assert_stdstring_equal("", scheme.str());
+  assert_stdstring_equal("", authority.str());
+  assert_stdstring_equal("/foo/bar?q=a", path.str());
 
   scheme = StringRef{};
   authority = StringRef{};
@@ -1146,11 +1218,12 @@ void test_http2_construct_push_component(void) {
 
   uri = StringRef::from_lit("foo/../bar?q=a");
 
-  CU_ASSERT(0 == http2::construct_push_component(balloc, scheme, authority,
-                                                 path, base, uri));
-  CU_ASSERT("" == scheme);
-  CU_ASSERT("" == authority);
-  CU_ASSERT("/b/bar?q=a" == path);
+  assert_int(0, ==,
+             http2::construct_push_component(balloc, scheme, authority, path,
+                                             base, uri));
+  assert_stdstring_equal("", scheme.str());
+  assert_stdstring_equal("", authority.str());
+  assert_stdstring_equal("/b/bar?q=a", path.str());
 
   scheme = StringRef{};
   authority = StringRef{};
@@ -1158,91 +1231,97 @@ void test_http2_construct_push_component(void) {
 
   uri = StringRef{};
 
-  CU_ASSERT(-1 == http2::construct_push_component(balloc, scheme, authority,
-                                                  path, base, uri));
+  assert_int(-1, ==,
+             http2::construct_push_component(balloc, scheme, authority, path,
+                                             base, uri));
   scheme = StringRef{};
   authority = StringRef{};
   path = StringRef{};
 
   uri = StringRef::from_lit("?q=a");
 
-  CU_ASSERT(0 == http2::construct_push_component(balloc, scheme, authority,
-                                                 path, base, uri));
-  CU_ASSERT("" == scheme);
-  CU_ASSERT("" == authority);
-  CU_ASSERT("/b/?q=a" == path);
+  assert_int(0, ==,
+             http2::construct_push_component(balloc, scheme, authority, path,
+                                             base, uri));
+  assert_stdstring_equal("", scheme.str());
+  assert_stdstring_equal("", authority.str());
+  assert_stdstring_equal("/b/?q=a", path.str());
 }
 
 void test_http2_contains_trailers(void) {
-  CU_ASSERT(!http2::contains_trailers(StringRef::from_lit("")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("trailers")));
+  assert_false(http2::contains_trailers(StringRef::from_lit("")));
+  assert_true(http2::contains_trailers(StringRef::from_lit("trailers")));
   // Match must be case-insensitive.
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("TRAILERS")));
-  CU_ASSERT(!http2::contains_trailers(StringRef::from_lit("trailer")));
-  CU_ASSERT(!http2::contains_trailers(StringRef::from_lit("trailers  3")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("trailers,")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("trailers,foo")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("foo,trailers")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit("foo,trailers,bar")));
-  CU_ASSERT(
+  assert_true(http2::contains_trailers(StringRef::from_lit("TRAILERS")));
+  assert_false(http2::contains_trailers(StringRef::from_lit("trailer")));
+  assert_false(http2::contains_trailers(StringRef::from_lit("trailers  3")));
+  assert_true(http2::contains_trailers(StringRef::from_lit("trailers,")));
+  assert_true(http2::contains_trailers(StringRef::from_lit("trailers,foo")));
+  assert_true(http2::contains_trailers(StringRef::from_lit("foo,trailers")));
+  assert_true(
+      http2::contains_trailers(StringRef::from_lit("foo,trailers,bar")));
+  assert_true(
       http2::contains_trailers(StringRef::from_lit("foo, trailers ,bar")));
-  CU_ASSERT(http2::contains_trailers(StringRef::from_lit(",trailers")));
+  assert_true(http2::contains_trailers(StringRef::from_lit(",trailers")));
 }
 
 void test_http2_check_transfer_encoding(void) {
-  CU_ASSERT(http2::check_transfer_encoding(StringRef::from_lit("chunked")));
-  CU_ASSERT(http2::check_transfer_encoding(StringRef::from_lit("foo,chunked")));
-  CU_ASSERT(
+  assert_true(http2::check_transfer_encoding(StringRef::from_lit("chunked")));
+  assert_true(
+      http2::check_transfer_encoding(StringRef::from_lit("foo,chunked")));
+  assert_true(
       http2::check_transfer_encoding(StringRef::from_lit("foo,  chunked")));
-  CU_ASSERT(
+  assert_true(
       http2::check_transfer_encoding(StringRef::from_lit("foo   ,  chunked")));
-  CU_ASSERT(
+  assert_true(
       http2::check_transfer_encoding(StringRef::from_lit("chunked;foo=bar")));
-  CU_ASSERT(
+  assert_true(
       http2::check_transfer_encoding(StringRef::from_lit("chunked ; foo=bar")));
-  CU_ASSERT(http2::check_transfer_encoding(
+  assert_true(http2::check_transfer_encoding(
       StringRef::from_lit(R"(chunked;foo="bar")")));
-  CU_ASSERT(http2::check_transfer_encoding(
+  assert_true(http2::check_transfer_encoding(
       StringRef::from_lit(R"(chunked;foo="\bar\"";FOO=BAR)")));
-  CU_ASSERT(
+  assert_true(
       http2::check_transfer_encoding(StringRef::from_lit(R"(chunked;foo="")")));
-  CU_ASSERT(http2::check_transfer_encoding(
+  assert_true(http2::check_transfer_encoding(
       StringRef::from_lit(R"(chunked;foo="bar" , gzip)")));
 
-  CU_ASSERT(!http2::check_transfer_encoding(StringRef{}));
-  CU_ASSERT(!http2::check_transfer_encoding(StringRef::from_lit(",chunked")));
-  CU_ASSERT(!http2::check_transfer_encoding(StringRef::from_lit("chunked,")));
-  CU_ASSERT(!http2::check_transfer_encoding(StringRef::from_lit("chunked, ")));
-  CU_ASSERT(
-      !http2::check_transfer_encoding(StringRef::from_lit("foo,,chunked")));
-  CU_ASSERT(
-      !http2::check_transfer_encoding(StringRef::from_lit("chunked;foo")));
-  CU_ASSERT(!http2::check_transfer_encoding(StringRef::from_lit("chunked;")));
-  CU_ASSERT(
-      !http2::check_transfer_encoding(StringRef::from_lit("chunked;foo=bar;")));
-  CU_ASSERT(
-      !http2::check_transfer_encoding(StringRef::from_lit("chunked;?=bar")));
-  CU_ASSERT(
-      !http2::check_transfer_encoding(StringRef::from_lit("chunked;=bar")));
-  CU_ASSERT(!http2::check_transfer_encoding(StringRef::from_lit("chunked;;")));
-  CU_ASSERT(!http2::check_transfer_encoding(StringRef::from_lit("chunked?")));
-  CU_ASSERT(!http2::check_transfer_encoding(StringRef::from_lit(",")));
-  CU_ASSERT(!http2::check_transfer_encoding(StringRef::from_lit(" ")));
-  CU_ASSERT(!http2::check_transfer_encoding(StringRef::from_lit(";")));
-  CU_ASSERT(!http2::check_transfer_encoding(StringRef::from_lit("\"")));
-  CU_ASSERT(!http2::check_transfer_encoding(
+  assert_false(http2::check_transfer_encoding(StringRef{}));
+  assert_false(http2::check_transfer_encoding(StringRef::from_lit(",chunked")));
+  assert_false(http2::check_transfer_encoding(StringRef::from_lit("chunked,")));
+  assert_false(
+      http2::check_transfer_encoding(StringRef::from_lit("chunked, ")));
+  assert_false(
+      http2::check_transfer_encoding(StringRef::from_lit("foo,,chunked")));
+  assert_false(
+      http2::check_transfer_encoding(StringRef::from_lit("chunked;foo")));
+  assert_false(http2::check_transfer_encoding(StringRef::from_lit("chunked;")));
+  assert_false(
+      http2::check_transfer_encoding(StringRef::from_lit("chunked;foo=bar;")));
+  assert_false(
+      http2::check_transfer_encoding(StringRef::from_lit("chunked;?=bar")));
+  assert_false(
+      http2::check_transfer_encoding(StringRef::from_lit("chunked;=bar")));
+  assert_false(
+      http2::check_transfer_encoding(StringRef::from_lit("chunked;;")));
+  assert_false(http2::check_transfer_encoding(StringRef::from_lit("chunked?")));
+  assert_false(http2::check_transfer_encoding(StringRef::from_lit(",")));
+  assert_false(http2::check_transfer_encoding(StringRef::from_lit(" ")));
+  assert_false(http2::check_transfer_encoding(StringRef::from_lit(";")));
+  assert_false(http2::check_transfer_encoding(StringRef::from_lit("\"")));
+  assert_false(http2::check_transfer_encoding(
       StringRef::from_lit(R"(chunked;foo="bar)")));
-  CU_ASSERT(!http2::check_transfer_encoding(
+  assert_false(http2::check_transfer_encoding(
       StringRef::from_lit(R"(chunked;foo="bar\)")));
-  CU_ASSERT(
-      !http2::check_transfer_encoding(StringRef::from_lit(R"(chunked;foo="bar\)"
-                                                          "\x0a"
-                                                          R"(")")));
-  CU_ASSERT(
-      !http2::check_transfer_encoding(StringRef::from_lit(R"(chunked;foo=")"
-                                                          "\x0a"
-                                                          R"(")")));
-  CU_ASSERT(!http2::check_transfer_encoding(
+  assert_false(
+      http2::check_transfer_encoding(StringRef::from_lit(R"(chunked;foo="bar\)"
+                                                         "\x0a"
+                                                         R"(")")));
+  assert_false(
+      http2::check_transfer_encoding(StringRef::from_lit(R"(chunked;foo=")"
+                                                         "\x0a"
+                                                         R"(")")));
+  assert_false(http2::check_transfer_encoding(
       StringRef::from_lit(R"(chunked;foo="bar",,gzip)")));
 }