From 238124abadd8995bb3de854071c8632adb019101 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Fri, 25 Oct 2024 14:19:39 -0400
Subject: [PATCH] Move tests to `jvm` source set

---
 .../sdk/kotlin/hll/dynamodbmapper/DynamoDbMapperTest.kt  | 6 +++---
 .../hll/dynamodbmapper/operations/DeleteItemTest.kt      | 0
 .../kotlin/hll/dynamodbmapper/operations/GetItemTest.kt  | 0
 .../kotlin/hll/dynamodbmapper/operations/PutItemTest.kt  | 0
 .../kotlin/hll/dynamodbmapper/operations/QueryTest.kt    | 6 +++---
 .../sdk/kotlin/hll/dynamodbmapper/operations/ScanTest.kt | 6 +++---
 .../hll/dynamodbmapper/testutils/DdbClientExtensions.kt  | 0
 .../kotlin/hll/dynamodbmapper/testutils/DdbLocalTest.kt  | 9 ++++-----
 8 files changed, 13 insertions(+), 14 deletions(-)
 rename hll/dynamodb-mapper/dynamodb-mapper/{common => jvm}/test/aws/sdk/kotlin/hll/dynamodbmapper/DynamoDbMapperTest.kt (97%)
 rename hll/dynamodb-mapper/dynamodb-mapper/{common => jvm}/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/DeleteItemTest.kt (100%)
 rename hll/dynamodb-mapper/dynamodb-mapper/{common => jvm}/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/GetItemTest.kt (100%)
 rename hll/dynamodb-mapper/dynamodb-mapper/{common => jvm}/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PutItemTest.kt (100%)
 rename hll/dynamodb-mapper/dynamodb-mapper/{common => jvm}/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/QueryTest.kt (98%)
 rename hll/dynamodb-mapper/dynamodb-mapper/{common => jvm}/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/ScanTest.kt (97%)
 rename hll/dynamodb-mapper/dynamodb-mapper/{common => jvm}/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbClientExtensions.kt (100%)
 rename hll/dynamodb-mapper/dynamodb-mapper/{common => jvm}/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbLocalTest.kt (98%)

diff --git a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/DynamoDbMapperTest.kt b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/DynamoDbMapperTest.kt
similarity index 97%
rename from hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/DynamoDbMapperTest.kt
rename to hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/DynamoDbMapperTest.kt
index 5b49c3ba0b2..f5846ac7eb3 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/DynamoDbMapperTest.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/DynamoDbMapperTest.kt
@@ -1,7 +1,7 @@
 /*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
 package aws.sdk.kotlin.hll.dynamodbmapper
 
 import aws.sdk.kotlin.hll.dynamodbmapper.items.AttributeDescriptor
diff --git a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/DeleteItemTest.kt b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/DeleteItemTest.kt
similarity index 100%
rename from hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/DeleteItemTest.kt
rename to hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/DeleteItemTest.kt
diff --git a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/GetItemTest.kt b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/GetItemTest.kt
similarity index 100%
rename from hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/GetItemTest.kt
rename to hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/GetItemTest.kt
diff --git a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PutItemTest.kt b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PutItemTest.kt
similarity index 100%
rename from hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PutItemTest.kt
rename to hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/PutItemTest.kt
diff --git a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/QueryTest.kt b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/QueryTest.kt
similarity index 98%
rename from hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/QueryTest.kt
rename to hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/QueryTest.kt
index fce2dedfdfd..ccb7bb66e5c 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/QueryTest.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/QueryTest.kt
@@ -1,7 +1,7 @@
 /*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
 package aws.sdk.kotlin.hll.dynamodbmapper.operations
 
 import aws.sdk.kotlin.hll.dynamodbmapper.expressions.KeyFilter
diff --git a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/ScanTest.kt b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/ScanTest.kt
similarity index 97%
rename from hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/ScanTest.kt
rename to hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/ScanTest.kt
index 8758d4f0b99..7e5366426ae 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/ScanTest.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/operations/ScanTest.kt
@@ -1,7 +1,7 @@
 /*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
 package aws.sdk.kotlin.hll.dynamodbmapper.operations
 
 import aws.sdk.kotlin.hll.dynamodbmapper.items.AttributeDescriptor
diff --git a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbClientExtensions.kt b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbClientExtensions.kt
similarity index 100%
rename from hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbClientExtensions.kt
rename to hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbClientExtensions.kt
diff --git a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbLocalTest.kt b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbLocalTest.kt
similarity index 98%
rename from hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbLocalTest.kt
rename to hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbLocalTest.kt
index 28c8883bc63..5e051200d95 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbLocalTest.kt
+++ b/hll/dynamodb-mapper/dynamodb-mapper/jvm/test/aws/sdk/kotlin/hll/dynamodbmapper/testutils/DdbLocalTest.kt
@@ -1,7 +1,7 @@
 /*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
 package aws.sdk.kotlin.hll.dynamodbmapper.testutils
 
 import aws.sdk.kotlin.hll.dynamodbmapper.DynamoDbMapper
@@ -24,8 +24,6 @@ import kotlin.test.assertContains
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 
-private const val DDB_LOCAL_PORT = 44212 // Keep in sync with build.gradle.kts
-
 /**
  * The base class for test classes which need DynamoDB Local running. This class provides a few convenience declarations
  * for subclasses:
@@ -185,3 +183,4 @@ private class RequestCapturingInterceptor(val requests: MutableList<HttpRequest>
         }
     }
 }
+private const val DDB_LOCAL_PORT = 44212 // Keep in sync with build.gradle.kts