android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-07-29 17:41:17 +03:00
Code Releases Activity

Decompose the request line into individual properties (#8860)

Browse Source 
* Decompose the request line into individual properties

Replace the 'path' property with the URL's encodedPath
property.

Rename the 'requestUrl' property to 'url'.

* Spotless

* Fix up DnsOverHttpsTest

* Fix some test failures
This commit is contained in:
Jesse Wilson
2025-06-16 20:47:36 -04:00
committed by GitHub
parent 33b093a86c
commit dfd1dffb3c
14 changed files with 230 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
okhttp-dnsoverhttps/src/test/java/okhttp3/dnsoverhttps/DnsOverHttpsTest.kt
View File

@ -85,8 +85,8 @@ class DnsOverHttpsTest {
assertThat(result).isEqualTo(listOf(address("157.240.1.18")))
val recordedRequest = server.takeRequest()
assertThat(recordedRequest.method).isEqualTo("GET")
assertThat(recordedRequest.path)
.isEqualTo("/lookup?ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ")
assertThat(recordedRequest.url.encodedQuery)
.isEqualTo("ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ")
}
@Test
@ -114,10 +114,10 @@ class DnsOverHttpsTest {
assertThat(request1.method).isEqualTo("GET")
val request2 = server.takeRequest()
assertThat(request2.method).isEqualTo("GET")
assertThat(listOf(request1.path, request2.path))
assertThat(listOf(request1.url.encodedQuery, request2.url.encodedQuery))
.containsExactlyInAnyOrder(
"/lookup?ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ",
"/lookup?ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AABwAAQ",
"ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ",
"ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AABwAAQ",
)
}
@ -138,8 +138,8 @@ class DnsOverHttpsTest {
}
val recordedRequest = server.takeRequest()
assertThat(recordedRequest.method).isEqualTo("GET")
assertThat(recordedRequest.path)
.isEqualTo("/lookup?ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ")
assertThat(recordedRequest.url.encodedQuery)
.isEqualTo("ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ")
}
@Test
@ -197,8 +197,8 @@ class DnsOverHttpsTest {
assertThat(result).containsExactly(address("157.240.1.18"))
var recordedRequest = server.takeRequest()
assertThat(recordedRequest.method).isEqualTo("GET")
assertThat(recordedRequest.path)
.isEqualTo("/lookup?ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ")
assertThat(recordedRequest.url.encodedQuery)
.isEqualTo("ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ")
assertThat(cacheEvents()).containsExactly("CacheMiss")
@ -212,8 +212,8 @@ class DnsOverHttpsTest {
assertThat(result).containsExactly(address("157.240.1.18"))
recordedRequest = server.takeRequest()
assertThat(recordedRequest.method).isEqualTo("GET")
assertThat(recordedRequest.path)
.isEqualTo("/lookup?ct&dns=AAABAAABAAAAAAAAA3d3dwZnb29nbGUDY29tAAABAAE")
assertThat(recordedRequest.url.encodedQuery)
.isEqualTo("ct&dns=AAABAAABAAAAAAAAA3d3dwZnb29nbGUDY29tAAABAAE")
assertThat(cacheEvents()).containsExactly("CacheMiss")
}
@ -239,8 +239,8 @@ class DnsOverHttpsTest {
assertThat(result).containsExactly(address("157.240.1.18"))
var recordedRequest = server.takeRequest()
assertThat(recordedRequest.method).isEqualTo("POST")
assertThat(recordedRequest.path)
.isEqualTo("/lookup?ct")
assertThat(recordedRequest.url.encodedQuery)
.isEqualTo("ct")
assertThat(cacheEvents()).containsExactly("CacheMiss")
@ -254,8 +254,8 @@ class DnsOverHttpsTest {
assertThat(result).containsExactly(address("157.240.1.18"))
recordedRequest = server.takeRequest(0, TimeUnit.MILLISECONDS)!!
assertThat(recordedRequest.method).isEqualTo("POST")
assertThat(recordedRequest.path)
.isEqualTo("/lookup?ct")
assertThat(recordedRequest.url.encodedQuery)
.isEqualTo("ct")
assertThat(cacheEvents()).containsExactly("CacheMiss")
}
@ -278,8 +278,8 @@ class DnsOverHttpsTest {
assertThat(result).containsExactly(address("157.240.1.18"))
var recordedRequest = server.takeRequest(0, TimeUnit.SECONDS)
assertThat(recordedRequest!!.method).isEqualTo("GET")
assertThat(recordedRequest.path).isEqualTo(
"/lookup?ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ",
assertThat(recordedRequest.url.encodedQuery).isEqualTo(
"ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ",
)
assertThat(cacheEvents()).containsExactly("CacheMiss")
@ -298,8 +298,8 @@ class DnsOverHttpsTest {
assertThat(result).isEqualTo(listOf(address("157.240.1.18")))
recordedRequest = server.takeRequest(0, TimeUnit.SECONDS)
assertThat(recordedRequest!!.method).isEqualTo("GET")
assertThat(recordedRequest.path)
.isEqualTo("/lookup?ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ")
assertThat(recordedRequest.url.encodedQuery)
.isEqualTo("ct&dns=AAABAAABAAAAAAAABmdvb2dsZQNjb20AAAEAAQ")
assertThat(cacheEvents()).containsExactly("CacheMiss")
}