Fix test failures

Author: ikhoon

core/src/test/java/com/linecorp/armeria/common/logging/JsonLogFormatterTest.java

@@ -25,6 +25,8 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
+import com.fasterxml.jackson.databind.JsonNode;
+
 import com.linecorp.armeria.common.HttpHeaderNames;
 import com.linecorp.armeria.common.HttpMethod;
 import com.linecorp.armeria.common.HttpRequest;
@@ -160,13 +162,14 @@ void maskResponseHeaders() {
     @Test
     void maskRequestHeadersWithDuplicateHeaderName() {
         final HeaderMaskingFunction maskingFunction = (name, value) -> "****armeria****";
+        final HeadersSanitizer<JsonNode> headersSanitizer =
+                HeadersSanitizer.builderForJson()
+                                .sensitiveHeaders("accept-encoding")
+                                .sensitiveHeaders("content-type")
+                                .maskingFunction(maskingFunction)
+                                .build();
         final LogFormatter logFormatter = LogFormatter.builderForJson()
-                                                      .requestHeadersSanitizer(
-                                                              HeadersSanitizer.builderForJson()
-                                                                              .sensitiveHeaders("accept-encoding")
-                                                                              .sensitiveHeaders("content-type")
-                                                                              .maskingFunction(maskingFunction)
-                                                                              .build())
+                                                      .requestHeadersSanitizer(headersSanitizer)
                                                       .build();
         final HttpRequest req = HttpRequest.of(RequestHeaders.of(HttpMethod.GET, "/hello",
                                                                  "Accept-Encoding", "gzip",

core/src/test/java/com/linecorp/armeria/common/logging/TextLogFormatterTest.java

@@ -184,13 +184,14 @@ void maskResponseHeaders() {
     @Test
     void maskRequestHeadersWithDuplicateHeaderName() {
         final HeaderMaskingFunction maskingFunction = (name, value) -> "****armeria****";
+        final HeadersSanitizer<String> headersSanitizer =
+                HeadersSanitizer.builderForText()
+                                .sensitiveHeaders("accept-encoding")
+                                .sensitiveHeaders("content-type")
+                                .maskingFunction(maskingFunction)
+                                .build();
         final LogFormatter logFormatter = LogFormatter.builderForText()
-                                                      .requestHeadersSanitizer(
-                                                              HeadersSanitizer.builderForText()
-                                                                              .sensitiveHeaders("accept-encoding")
-                                                                              .sensitiveHeaders("content-type")
-                                                                              .maskingFunction(maskingFunction)
-                                                                              .build())
+                                                      .requestHeadersSanitizer(headersSanitizer)
                                                       .build();
         final HttpRequest req = HttpRequest.of(RequestHeaders.of(HttpMethod.GET, "/hello",
                                                                  "Accept-Encoding", "gzip",
@@ -226,11 +227,11 @@ void removeSensitiveHeaders() {
         log.endResponse();
 
         final String responseLog = logFormatter.formatResponse(log);
-        final Matcher matcher1 = Pattern.compile("\"set-cookie\"=\"(.*?)\"").matcher(responseLog);
+        final Matcher matcher1 = Pattern.compile("set-cookie=(.*?)[,\\]]").matcher(responseLog);
         assertThat(matcher1.find()).isFalse();
-        final Matcher matcher2 = Pattern.compile("\"multiple-header\"=\"(.*?)\"").matcher(responseLog);
+        final Matcher matcher2 = Pattern.compile("multiple-header=(.*?)[,\\]]").matcher(responseLog);
         assertThat(matcher2.find()).isFalse();
-        final Matcher matcher3 = Pattern.compile("\"cache-control\"=\"(.*?)\"").matcher(responseLog);
+        final Matcher matcher3 = Pattern.compile("cache-control=(.*?)[,\\]]").matcher(responseLog);
         assertThat(matcher3.find()).isTrue();
         assertThat(matcher3.group(1)).isEqualTo("no-cache");
     }