Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tests against MockServer and a SOCKS5 proxy #8057

Merged
merged 23 commits into from
Jan 20, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Run with extensions
yschimke committed Jan 14, 2024
commit d9bca5cb92f5299ccf0ac79e444ad226778c5fa4
2 changes: 1 addition & 1 deletion container-tests/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ dependencies {

testImplementation(projects.okhttpTestingSupport)
testImplementation(libs.junit)
testImplementation(libs.assertj.core)
testImplementation(libs.assertk)
testImplementation(libs.testcontainers)
testImplementation(libs.mockserver)
testImplementation(libs.mockserver.client)
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package okhttp3.containers

import assertk.assertThat
import assertk.assertions.contains
import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.OkHttpClient
import okhttp3.Request
import org.assertj.core.api.Assertions
import org.assertj.core.api.Assertions.assertThat
import org.junit.Rule
import org.junit.Test
import org.mockserver.client.MockServerClient
5 changes: 1 addition & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -6,16 +6,13 @@ com-squareup-okio = "3.7.0"
de-mannodermaus-junit5 = "1.4.0"
graalvm = "22.3.2"
kotlinx-serialization = "1.6.2"
kotlinx-serialization = "1.6.0"
mockserverClient = "5.15.0"
org-bouncycastle = "1.76"
org-conscrypt = "2.5.2"
org-jetbrains-coroutines = "1.7.3"
org-jetbrains-kotlin = "1.9.21"
org-junit-jupiter = "5.10.1"
org-jetbrains-kotlin = "1.9.0"
org-junit-jupiter = "5.10.0"
testcontainers = "1.19.1"
testcontainers = "1.19.3"

[libraries]
amazonCorretto = "software.amazon.cryptools:AmazonCorrettoCryptoProvider:2.3.1"