Skip to content

Commit 19430cb

Browse files
kggilmerkggilmer
authored
chore: Replace junit imports with kotlin.test imports where possible (#321)
1 parent 19b735b commit 19430cb

File tree

10 files changed

+28
-27
lines changed

10 files changed

+28
-27
lines changed

‎aws-runtime/http-client-engine-crt/jvm/test/aws/sdk/kotlin/runtime/http/engine/crt/BufferedReadChannelByteBufferTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import aws.sdk.kotlin.runtime.testing.ManualDispatchTestBase
99
import kotlinx.coroutines.CancellationException
1010
import kotlinx.coroutines.launch
1111
import kotlinx.coroutines.yield
12-
import org.junit.jupiter.api.Test
1312
import java.nio.ByteBuffer
1413
import kotlin.test.AfterTest
14+
import kotlin.test.Test
1515
import kotlin.test.assertEquals
1616

1717
class BufferedReadChannelByteBufferTest : ManualDispatchTestBase() {

‎aws-runtime/regions/jvm/test/aws/sdk/kotlin/runtime/regions/providers/JvmSystemPropRegionProviderTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package aws.sdk.kotlin.runtime.regions.providers
77

88
import aws.sdk.kotlin.runtime.AwsSdkSetting
99
import aws.sdk.kotlin.runtime.testing.runSuspendTest
10-
import org.junit.jupiter.api.Test
10+
import kotlin.test.Test
1111
import kotlin.test.assertEquals
1212
import kotlin.test.assertNull
1313

‎codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/PresignerGeneratorTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package aws.sdk.kotlin.codegen
22

33
import aws.sdk.kotlin.codegen.model.traits.Presignable
4-
import org.junit.jupiter.api.Test
54
import software.amazon.smithy.build.MockManifest
65
import software.amazon.smithy.codegen.core.SymbolProvider
76
import software.amazon.smithy.kotlin.codegen.KotlinSettings
@@ -14,6 +13,7 @@ import software.amazon.smithy.kotlin.codegen.test.shouldContainOnlyOnceWithDiff
1413
import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
1514
import software.amazon.smithy.model.Model
1615
import software.amazon.smithy.model.shapes.OperationShape
16+
import kotlin.test.Test
1717
import kotlin.test.assertTrue
1818

1919
class PresignerGeneratorTest {

‎codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/customization/BoxServicesTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package aws.sdk.kotlin.codegen.customization
77

8-
import org.junit.jupiter.api.Test
98
import software.amazon.smithy.kotlin.codegen.model.expectShape
109
import software.amazon.smithy.kotlin.codegen.model.hasTrait
1110
import software.amazon.smithy.kotlin.codegen.model.isNumberShape
@@ -14,6 +13,7 @@ import software.amazon.smithy.kotlin.codegen.test.prependNamespaceAndService
1413
import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
1514
import software.amazon.smithy.model.shapes.StructureShape
1615
import software.amazon.smithy.model.traits.BoxTrait
16+
import kotlin.test.Test
1717
import kotlin.test.assertFalse
1818
import kotlin.test.assertTrue
1919

‎codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/customization/PresignableModelIntegrationTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package aws.sdk.kotlin.codegen.customization
22

33
import aws.sdk.kotlin.codegen.model.traits.Presignable
4-
import org.junit.jupiter.api.Test
54
import software.amazon.smithy.kotlin.codegen.model.expectShape
65
import software.amazon.smithy.kotlin.codegen.test.newTestContext
76
import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
87
import software.amazon.smithy.model.shapes.OperationShape
8+
import kotlin.test.Test
99
import kotlin.test.assertFalse
1010
import kotlin.test.assertTrue
1111

‎codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/customization/RemoveEventStreamOperationsTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
package aws.sdk.kotlin.codegen.customization
77

88
import io.kotest.matchers.shouldBe
9-
import org.junit.jupiter.api.Test
109
import software.amazon.smithy.kotlin.codegen.test.newTestContext
1110
import software.amazon.smithy.kotlin.codegen.test.prependNamespaceAndService
1211
import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
1312
import software.amazon.smithy.model.shapes.ShapeId
13+
import kotlin.test.Test
1414

1515
class RemoveEventStreamOperationsTest {
1616
@Test

‎codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/protocols/core/EndpointResolverGeneratorTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
package aws.sdk.kotlin.codegen.protocols.core
77

88
import io.kotest.matchers.string.shouldContainOnlyOnce
9-
import org.junit.jupiter.api.Test
109
import software.amazon.smithy.build.MockManifest
1110
import software.amazon.smithy.kotlin.codegen.test.newTestContext
1211
import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
1312
import software.amazon.smithy.model.node.Node
13+
import kotlin.test.Test
1414

1515
class EndpointResolverGeneratorTest {
1616

‎codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/protocols/json/AwsJsonHttpBindingResolverTest.kt‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55

66
package aws.sdk.kotlin.codegen.protocols.json
77

8-
import org.junit.jupiter.api.Assertions
9-
import org.junit.jupiter.api.Test
108
import software.amazon.smithy.kotlin.codegen.model.expectShape
119
import software.amazon.smithy.kotlin.codegen.test.newTestContext
1210
import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
1311
import software.amazon.smithy.model.knowledge.HttpBinding
1412
import software.amazon.smithy.model.shapes.OperationShape
1513
import software.amazon.smithy.model.shapes.StructureShape
14+
import kotlin.test.Test
15+
import kotlin.test.assertEquals
16+
import kotlin.test.assertTrue
1617

1718
class AwsJsonHttpBindingResolverTest {
1819
private val testModel = """
@@ -54,7 +55,7 @@ class AwsJsonHttpBindingResolverTest {
5455
val expectedOperations = listOf("GetEmptyFoo", "GetFoo")
5556
val actualOperations = unit.bindingOperations().map { operationShape -> operationShape.id.name }.sorted()
5657

57-
Assertions.assertEquals(expectedOperations, actualOperations)
58+
assertEquals(expectedOperations, actualOperations)
5859
}
5960

6061
@Test
@@ -65,7 +66,7 @@ class AwsJsonHttpBindingResolverTest {
6566

6667
val actualRequestBindings = unit.requestBindings(operation)
6768

68-
Assertions.assertTrue(actualRequestBindings.isEmpty())
69+
assertTrue(actualRequestBindings.isEmpty())
6970
}
7071

7172
@Test
@@ -76,13 +77,13 @@ class AwsJsonHttpBindingResolverTest {
7677

7778
val actualRequestBindings = unit.requestBindings(operation)
7879

79-
Assertions.assertTrue(actualRequestBindings.size == 1)
80+
assertTrue(actualRequestBindings.size == 1)
8081
val binding = actualRequestBindings.first()
8182

82-
Assertions.assertEquals(binding.member.id.toString(), "smithy.example#GetFooInput\$bigInt")
83-
Assertions.assertEquals(binding.location, HttpBinding.Location.DOCUMENT)
83+
assertEquals(binding.member.id.toString(), "smithy.example#GetFooInput\$bigInt")
84+
assertEquals(binding.location, HttpBinding.Location.DOCUMENT)
8485
// Location name is unused by awsJson
85-
Assertions.assertEquals(binding.locationName, null)
86+
assertEquals(binding.locationName, null)
8687
}
8788

8889
@Test
@@ -93,7 +94,7 @@ class AwsJsonHttpBindingResolverTest {
9394

9495
val actualResponseBindings = unit.responseBindings(operation)
9596

96-
Assertions.assertTrue(actualResponseBindings.isEmpty())
97+
assertTrue(actualResponseBindings.isEmpty())
9798
}
9899

99100
@Test
@@ -104,13 +105,13 @@ class AwsJsonHttpBindingResolverTest {
104105

105106
val actualResponseBindings = unit.responseBindings(operation)
106107

107-
Assertions.assertTrue(actualResponseBindings.size == 1)
108+
assertTrue(actualResponseBindings.size == 1)
108109
val binding = actualResponseBindings.first()
109110

110-
Assertions.assertEquals(binding.member.id.toString(), "smithy.example#GetFooOutput\$bigInt")
111-
Assertions.assertEquals(binding.location, HttpBinding.Location.DOCUMENT)
111+
assertEquals(binding.member.id.toString(), "smithy.example#GetFooOutput\$bigInt")
112+
assertEquals(binding.location, HttpBinding.Location.DOCUMENT)
112113
// Location name is unused by awsJson
113-
Assertions.assertEquals(binding.locationName, null)
114+
assertEquals(binding.locationName, null)
114115
}
115116

116117
@Test
@@ -121,7 +122,7 @@ class AwsJsonHttpBindingResolverTest {
121122

122123
val actualResponseBindings = unit.responseBindings(structure)
123124

124-
Assertions.assertTrue(actualResponseBindings.isEmpty())
125+
assertTrue(actualResponseBindings.isEmpty())
125126
}
126127

127128
@Test
@@ -132,12 +133,12 @@ class AwsJsonHttpBindingResolverTest {
132133

133134
val actualResponseBindings = unit.responseBindings(structure)
134135

135-
Assertions.assertTrue(actualResponseBindings.size == 1)
136+
assertTrue(actualResponseBindings.size == 1)
136137
val binding = actualResponseBindings.first()
137138

138-
Assertions.assertEquals(binding.member.id.toString(), "smithy.example#GetFooOutput\$bigInt")
139-
Assertions.assertEquals(binding.location, HttpBinding.Location.DOCUMENT)
139+
assertEquals(binding.member.id.toString(), "smithy.example#GetFooOutput\$bigInt")
140+
assertEquals(binding.location, HttpBinding.Location.DOCUMENT)
140141
// Location name is unused by awsJson
141-
Assertions.assertEquals(binding.locationName, null)
142+
assertEquals(binding.locationName, null)
142143
}
143144
}

‎codegen/smithy-aws-kotlin-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/protocols/xml/RestXmlSerdeDescriptorGeneratorTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package aws.sdk.kotlin.codegen.protocols.xml
77

8-
import org.junit.jupiter.api.Test
98
import software.amazon.smithy.kotlin.codegen.test.*
109
import software.amazon.smithy.model.shapes.ShapeId
10+
import kotlin.test.Test
1111

1212
class RestXmlSerdeDescriptorGeneratorTest {
1313
private fun render(modelSnippet: String): String {

‎services/polly/common/test/aws/sdk/kotlin/services/polly/PollyTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import aws.sdk.kotlin.services.polly.model.OutputFormat
66
import aws.sdk.kotlin.services.polly.model.SynthesizeSpeechRequest
77
import aws.sdk.kotlin.services.polly.model.VoiceId
88
import aws.smithy.kotlin.runtime.http.HttpMethod
9-
import org.junit.jupiter.api.Test
9+
import kotlin.test.Test
1010
import kotlin.test.assertEquals
1111
import kotlin.test.assertTrue
1212

0 commit comments

Comments
 (0)