Track prefixes for logging listeners

square · Dec 23, 2023 · c9f39e9 · c9f39e9
1 parent 7d3b0e0
commit c9f39e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/okhttp-logging-interceptor/src/test/java/okhttp3/logging/HttpLoggingInterceptorTest.kt b/okhttp-logging-interceptor/src/test/java/okhttp3/logging/HttpLoggingInterceptorTest.kt
@@ -977,7 +977,9 @@ class HttpLoggingInterceptorTest {
     return Request.Builder().url(url)
   }
 
-  internal class LogRecorder : HttpLoggingInterceptor.Logger {
+  internal class LogRecorder(
+    val prefix: Regex = Regex(""),
+  ) : HttpLoggingInterceptor.Logger {
     private val logs = mutableListOf<String>()
     private var index = 0
 
@@ -994,7 +996,7 @@ class HttpLoggingInterceptorTest {
         .overridingErrorMessage("No more messages found")
         .isLessThan(logs.size)
       assertThat(logs[index++])
-        .matches(Pattern.compile("\\[\\d+ ms] ${regex.pattern}", Pattern.DOTALL))
+        .matches(Pattern.compile(prefix.pattern + regex.pattern, Pattern.DOTALL))
     }
 
     fun assertNoMoreLogs() {

diff --git a/okhttp-logging-interceptor/src/test/java/okhttp3/logging/LoggingEventListenerTest.kt b/okhttp-logging-interceptor/src/test/java/okhttp3/logging/LoggingEventListenerTest.kt
@@ -48,7 +48,9 @@ class LoggingEventListenerTest {
   val clientTestRule = OkHttpClientTestRule()
   private lateinit var server: MockWebServer
   private val handshakeCertificates = platform.localhostHandshakeCertificates()
-  private val logRecorder = HttpLoggingInterceptorTest.LogRecorder()
+  private val logRecorder = HttpLoggingInterceptorTest.LogRecorder(
+    prefix = Regex("""\[\d+ ms] """)
+  )
   private val loggingEventListenerFactory = LoggingEventListener.Factory(logRecorder)
   private lateinit var client: OkHttpClient
   private lateinit var url: HttpUrl