Skip to content

Commit b2c3836

Browse files
afrankenafranken
committed
All Java tests are V2 now.
1 parent 83967ce commit b2c3836

17 files changed

+22
-21
lines changed

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/AclITV2.kt renamed to integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/AclIT.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import software.amazon.awssdk.services.s3.model.ObjectOwnership
2727
import software.amazon.awssdk.services.s3.model.Permission.FULL_CONTROL
2828
import software.amazon.awssdk.services.s3.model.Type.CANONICAL_USER
2929

30-
internal class AclITV2 : S3TestBase() {
30+
internal class AclIT : S3TestBase() {
3131
private val s3Client: S3Client = createS3Client()
3232

3333
@Test

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/AwsChunkedEndcodingITV2.kt renamed to integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/AwsChunkedEndcodingIT.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import java.io.InputStream
3030
/**
3131
* Chunked encoding with signing is only active in AWS SDK v2 when endpoint is http
3232
*/
33-
internal class AwsChunkedEndcodingITV2 : S3TestBase() {
33+
internal class AwsChunkedEndcodingIT : S3TestBase() {
3434

3535
private val s3Client = createS3Client(serviceEndpointHttp)
3636

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketV2IT.kt renamed to integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketIT.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit
4343
/**
4444
* Test the application using the AmazonS3 SDK V2.
4545
*/
46-
internal class BucketV2IT : S3TestBase() {
46+
internal class BucketIT : S3TestBase() {
4747

4848
private val s3Client: S3Client = createS3Client()
4949

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CopyObjectV2IT.kt renamed to integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CopyObjectIT.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import java.util.concurrent.Executors
3939
/**
4040
* Test the application using the AmazonS3 SDK V2.
4141
*/
42-
internal class CopyObjectV2IT : S3TestBase() {
42+
internal class CopyObjectIT : S3TestBase() {
4343

4444
private val s3Client: S3Client = createS3Client()
4545
private val transferManager = createTransferManager()

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CorsV2IT.kt renamed to integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CorsIT.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import java.util.UUID
3232
/**
3333
* Test the application using the AmazonS3 SDK V2.
3434
*/
35-
internal class CorsV2IT : S3TestBase() {
35+
internal class CorsIT : S3TestBase() {
3636
private val httpClient: CloseableHttpClient = createHttpClient()
3737

3838
@Test

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CrtAsyncV2IT.kt renamed to integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CrtAsyncIT.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import java.io.FileInputStream
3333
import java.io.InputStream
3434
import java.nio.charset.StandardCharsets
3535

36-
internal class CrtAsyncV2IT : S3TestBase() {
36+
internal class CrtAsyncIT : S3TestBase() {
3737

3838
private val autoS3CrtAsyncClient: S3AsyncClient = createAutoS3CrtAsyncClient()
3939
private val transferManager: S3TransferManager = createTransferManager()

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ErrorResponsesV2IT.kt renamed to integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ErrorResponsesIT.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import software.amazon.awssdk.services.s3.model.ServerSideEncryption
2929
import java.io.File
3030
import java.util.concurrent.CompletionException
3131

32-
internal class ErrorResponsesV2IT : S3TestBase() {
32+
internal class ErrorResponsesIT : S3TestBase() {
3333

3434
private val s3Client: S3Client = createS3Client()
3535
private val transferManager = createTransferManager()

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/GetPutDeleteObjectV2IT.kt renamed to integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/GetPutDeleteObjectIT.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import java.time.temporal.ChronoUnit
4646
import java.util.concurrent.TimeUnit
4747
import kotlin.math.min
4848

49-
internal class GetPutDeleteObjectV2IT : S3TestBase() {
49+
internal class GetPutDeleteObjectIT : S3TestBase() {
5050

5151
private val s3Client: S3Client = createS3Client()
5252
private val s3ClientHttp: S3Client = createS3Client(serviceEndpointHttp)
@@ -232,7 +232,7 @@ internal class GetPutDeleteObjectV2IT : S3TestBase() {
232232
testEtagCreation(testFileName, s3ClientHttp, testInfo)
233233
}
234234

235-
private fun GetPutDeleteObjectV2IT.testEtagCreation(
235+
private fun GetPutDeleteObjectIT.testEtagCreation(
236236
testFileName: String,
237237
s3Client: S3Client,
238238
testInfo: TestInfo
@@ -265,7 +265,7 @@ internal class GetPutDeleteObjectV2IT : S3TestBase() {
265265
testEtagCreation(testFileName, autoS3CrtAsyncClientHttp)
266266
}
267267

268-
private fun GetPutDeleteObjectV2IT.testEtagCreation(
268+
private fun GetPutDeleteObjectIT.testEtagCreation(
269269
testFileName: String,
270270
s3Client: S3AsyncClient
271271
) {
@@ -365,7 +365,7 @@ internal class GetPutDeleteObjectV2IT : S3TestBase() {
365365
testChecksumAlgorithm(TEST_IMAGE_LARGE, checksumAlgorithm, s3Client)
366366
}
367367

368-
private fun GetPutDeleteObjectV2IT.testChecksumAlgorithm(
368+
private fun GetPutDeleteObjectIT.testChecksumAlgorithm(
369369
testFileName: String,
370370
checksumAlgorithm: ChecksumAlgorithm,
371371
s3Client: S3Client,
@@ -447,7 +447,7 @@ internal class GetPutDeleteObjectV2IT : S3TestBase() {
447447
testChecksumAlgorithm_async(TEST_IMAGE_LARGE, checksumAlgorithm, autoS3CrtAsyncClient)
448448
}
449449

450-
private fun GetPutDeleteObjectV2IT.testChecksumAlgorithm_async(
450+
private fun GetPutDeleteObjectIT.testChecksumAlgorithm_async(
451451
testFileName: String,
452452
checksumAlgorithm: ChecksumAlgorithm,
453453
s3Client: S3AsyncClient,
@@ -1038,7 +1038,7 @@ internal class GetPutDeleteObjectV2IT : S3TestBase() {
10381038
val uploadFile = File(UPLOAD_FILE_NAME)
10391039
val bucketName = givenBucket(testInfo)
10401040

1041-
val s3Client = this@GetPutDeleteObjectV2IT.createS3Client(chunkedEncodingEnabled = uploadChunked)
1041+
val s3Client = this@GetPutDeleteObjectIT.createS3Client(chunkedEncodingEnabled = uploadChunked)
10421042

10431043
s3Client.putObject({
10441044
it.bucket(bucketName)

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/LegalHoldV2IT.kt renamed to integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/LegalHoldIT.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import software.amazon.awssdk.services.s3.model.ObjectLockLegalHoldStatus
2626
import software.amazon.awssdk.services.s3.model.S3Exception
2727
import java.io.File
2828

29-
internal class LegalHoldV2IT : S3TestBase() {
29+
internal class LegalHoldIT : S3TestBase() {
3030

3131
private val s3Client: S3Client = createS3Client()
3232

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV2IT.kt renamed to integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectIT.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import software.amazon.awssdk.utils.http.SdkHttpUtils
3232
import java.io.File
3333
import java.util.stream.Collectors
3434

35-
internal class ListObjectV2IT : S3TestBase() {
35+
internal class ListObjectIT : S3TestBase() {
3636
private val s3Client: S3Client = createS3Client()
3737

3838
@Test

0 commit comments

Comments
 (0)