Skip to content

Commit d84516d

Browse files
committed
refactor tests to be JVM only
1 parent 4137873 commit d84516d

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

hll/s3-transfer-manager/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ kotlin {
1515
implementation(libs.s3)
1616
}
1717
}
18-
commonTest {
18+
jvmTest {
1919
dependencies {
2020
implementation(libs.smithy.kotlin.test.jvm)
2121
implementation(libs.smithy.kotlin.testing.jvm)
22-
implementation(libs.s3)
2322
}
2423
}
2524
}

hll/s3-transfer-manager/common/test/aws/sdk/kotlin/hll/s3transfermanager/BusinessMetricInterceptorTest.kt renamed to hll/s3-transfer-manager/jvm/test/aws/sdk/kotlin/hll/s3transfermanager/BusinessMetricInterceptorTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class BusinessMetricInterceptorTest {
3636
interceptors += testInterceptor
3737
credentialsProvider = StaticCredentialsProvider(Credentials("akid", "secret"))
3838
}.use { s3Client ->
39-
S3TransferManager {
39+
S3TransferManager.Companion {
4040
client = s3Client
4141
}.uploadFile {
4242
bucket = "b"

hll/s3-transfer-manager/common/test/aws/sdk/kotlin/hll/s3transfermanager/TransferInterceptorTest.kt renamed to hll/s3-transfer-manager/jvm/test/aws/sdk/kotlin/hll/s3transfermanager/TransferInterceptorTest.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials.Companion.invok
1515
import aws.smithy.kotlin.runtime.content.ByteStream
1616
import aws.smithy.kotlin.runtime.httptest.TestEngine
1717
import kotlinx.coroutines.runBlocking
18+
import kotlin.collections.plusAssign
1819
import kotlin.test.Test
1920

2021
class TransferInterceptorTest {
@@ -27,14 +28,15 @@ class TransferInterceptorTest {
2728
httpClient = TestEngine()
2829
credentialsProvider = StaticCredentialsProvider(Credentials("akid", "secret"))
2930
}.use { s3Client ->
30-
S3TransferManager {
31+
S3TransferManager.Companion {
3132
client = s3Client
3233
interceptors += object : TransferInterceptor {
3334
// Test reads
3435
override fun readBeforeTransferInitiated(context: TransferContext) {
3536
assert(context.transferredBytes == 0L)
3637
assert(context.request is PutObjectRequest)
3738
}
39+
3840
override fun readBeforeTransferCompleted(context: TransferContext) {
3941
assert(context.transferredBytes == message.length.toLong())
4042
assert(context.response is PutObjectResponse)
@@ -47,6 +49,7 @@ class TransferInterceptorTest {
4749
newContext.transferredBytes = message.length.toLong() * 10
4850
return newContext
4951
}
52+
5053
override fun readAfterTransferCompleted(context: TransferContext) {
5154
assert(context.request is CompleteMultipartUploadRequest)
5255
assert(context.transferredBytes == message.length.toLong() * 10)

hll/s3-transfer-manager/common/test/aws/sdk/kotlin/hll/s3transfermanager/UploadFileTest.kt renamed to hll/s3-transfer-manager/jvm/test/aws/sdk/kotlin/hll/s3transfermanager/UploadFileTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class UploadFileTest {
2323
S3Client {
2424
region = "us-west-2"
2525
}.use { s3Client ->
26-
S3TransferManager {
26+
S3TransferManager.Companion {
2727
client = s3Client
2828
}.uploadFile {
2929
bucket = "aoperez"
@@ -43,7 +43,7 @@ class UploadFileTest {
4343
S3Client {
4444
region = "us-west-2"
4545
}.use { s3Client ->
46-
S3TransferManager {
46+
S3TransferManager.Companion {
4747
client = s3Client
4848
multipartUploadThreshold = 1
4949
targePartSize = 5L * 1024L * 1024L // 5 MB

0 commit comments

Comments
 (0)