Fix universal header validation case.

When universal header validation is enabled, HTTP_PARSER_STRICT is defined to be 0, and http-parser gives different error messages. Signed-off-by: Bence Béky <bnc@google.com>
envoyproxy · Jan 18, 2023 · dc62dec · dc62dec
1 parent 657eb01
commit dc62dec
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/test/common/http/http1/codec_impl_test.cc b/test/common/http/http1/codec_impl_test.cc
@@ -908,20 +908,25 @@ TEST_P(Http1ServerConnectionImplTest, Http10MultipleResponses) {
   }
 }
 
+// SPELLCHECKER(off)
 struct {
   const absl::string_view http_version;
   const absl::optional<absl::string_view> balsa_parser_expected_error;
   const absl::optional<absl::string_view> http_parser_expected_error;
 } kRequestHTTPStringTestCases[] = {{"", {}, {}}, // HTTP/0.9 has no HTTP-version.
                                    {"HTTP/9.1", {}, {}},
                                    {"aHTTP/1.1", "HPE_INVALID_VERSION", "HPE_INVALID_CONSTANT"},
-                                   // SPELLCHECKER(off)
+#ifdef ENVOY_ENABLE_UHV
+                                   {"HHTTP/1.1", "HPE_INVALID_VERSION", "HPE_INVALID_VERSION"},
+                                   {"HTTPS/1.1", "HPE_INVALID_VERSION", "HPE_INVALID_VERSION"},
+#else
                                    {"HHTTP/1.1", "HPE_INVALID_VERSION", "HPE_STRICT"},
-                                   // SPELLCHECKER(on)
                                    {"HTTPS/1.1", "HPE_INVALID_VERSION", "HPE_STRICT"},
+#endif
                                    {"FTP/1.1", "HPE_INVALID_VERSION", "HPE_INVALID_CONSTANT"},
                                    {"HTTP/1.01", "HPE_INVALID_VERSION", "HPE_INVALID_VERSION"},
                                    {"HTTP/A.0", "HPE_INVALID_VERSION", "HPE_INVALID_VERSION"}};
+// SPELLCHECKER(on)
 
 TEST_P(Http1ServerConnectionImplTest, HttpVersion) {
   for (const auto& test_case : kRequestHTTPStringTestCases) {
@@ -3837,19 +3842,24 @@ TEST_P(Http1ClientConnectionImplTest, ResponseHttpVersion) {
   }
 }
 
+// SPELLCHECKER(off)
 struct {
   const absl::string_view http_version;
   const absl::optional<absl::string_view> balsa_parser_expected_error;
   const absl::optional<absl::string_view> http_parser_expected_error;
 } kResponseHTTPStringTestCases[] = {{"HTTP/9.1", {}, {}},
                                     {"aHTTP/1.1", "HPE_INVALID_CONSTANT", "HPE_INVALID_CONSTANT"},
-                                    // SPELLCHECKER(off)
+#ifdef ENVOY_ENABLE_UHV
+                                    {"HHTTP/1.1", "HPE_INVALID_VERSION", "HPE_INVALID_VERSION"},
+                                    {"HTTPS/1.1", "HPE_INVALID_VERSION", "HPE_INVALID_VERSION"},
+#else
                                     {"HHTTP/1.1", "HPE_INVALID_VERSION", "HPE_STRICT"},
-                                    // SPELLCHECKER(on)
                                     {"HTTPS/1.1", "HPE_INVALID_VERSION", "HPE_STRICT"},
+#endif
                                     {"FTP/1.1", "HPE_INVALID_CONSTANT", "HPE_INVALID_CONSTANT"},
                                     {"HTTP/1.01", "HPE_INVALID_VERSION", "HPE_INVALID_VERSION"},
                                     {"HTTP/A.0", "HPE_INVALID_VERSION", "HPE_INVALID_VERSION"}};
+// SPELLCHECKER(on)
 
 TEST_P(Http1ClientConnectionImplTest, HttpVersion) {
   for (const auto& test_case : kResponseHTTPStringTestCases) {