Skip to content

Commit 436fd1b

Browse files
authored
chore: aws-sdk-swift package structuring (#503)
1 parent 8bf6a57 commit 436fd1b

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/PackageManifestGenerator.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ fun writePackageManifest(settings: SwiftSettings, fileManifest: FileManifest, de
5252
}
5353
if (generateTestTarget) {
5454
writer.openBlock(".testTarget(", ")") {
55-
writer.write("name: \"${settings.moduleName}Tests\",")
55+
writer.write("name: \"${settings.testModuleName}\",")
5656
writer.openBlock("dependencies: [", "],") {
5757
writer.write("\$S,", settings.moduleName)
5858
writer.write(".product(name: \"SmithyTestUtil\", package: \"smithy-swift\")")
5959
}
60-
writer.write("path: \"./${settings.moduleName}Tests\"")
60+
writer.write("path: \"./${settings.testModuleName}\"")
6161
}
6262
}
6363
}

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftSettings.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,3 +156,8 @@ class SwiftSettings(
156156
}
157157

158158
class UnresolvableProtocolException(message: String) : CodegenException(message)
159+
160+
val SwiftSettings.testModuleName: String
161+
get() {
162+
return "${this.moduleName}Tests"
163+
}

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftTypes.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ object SwiftTypes {
2121
val Float = builtInSymbol("Float")
2222
val Double = builtInSymbol("Double")
2323
val Bool = builtInSymbol("Bool")
24+
val TimeInterval = builtInSymbol("TimeInterval")
2425

2526
val List = builtInSymbol("List")
2627
val Set = builtInSymbol("Set")

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/integration/HttpProtocolTestGenerator.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import software.amazon.smithy.swift.codegen.middleware.MiddlewareStep
2222
import software.amazon.smithy.swift.codegen.middleware.OperationMiddleware
2323
import software.amazon.smithy.swift.codegen.model.hasTrait
2424
import software.amazon.smithy.swift.codegen.model.toUpperCamelCase
25+
import software.amazon.smithy.swift.codegen.testModuleName
2526
import java.util.TreeSet
2627
import java.util.logging.Logger
2728

@@ -97,7 +98,7 @@ class HttpProtocolTestGenerator(
9798
val requestTestCases = filterProtocolTestCases(tempTestCases)
9899
if (requestTestCases.isNotEmpty()) {
99100
val testClassName = "${operation.toUpperCamelCase()}RequestTest"
100-
val testFilename = "./${ctx.settings.moduleName}Tests/$testClassName.swift"
101+
val testFilename = "./${ctx.settings.testModuleName}/$testClassName.swift"
101102
ctx.delegator.useTestFileWriter(testFilename, ctx.settings.moduleName) { writer ->
102103
LOGGER.fine("Generating request protocol test cases for ${operation.id}")
103104
for (import in imports) {
@@ -134,7 +135,7 @@ class HttpProtocolTestGenerator(
134135
val responseTestCases = filterProtocolTestCases(tempResponseTests)
135136
if (responseTestCases.isNotEmpty()) {
136137
val testClassName = "${operation.id.name.capitalize()}ResponseTest"
137-
val testFilename = "./${ctx.settings.moduleName}Tests/$testClassName.swift"
138+
val testFilename = "./${ctx.settings.testModuleName}/$testClassName.swift"
138139
ctx.delegator.useTestFileWriter(testFilename, ctx.settings.moduleName) { writer ->
139140
LOGGER.fine("Generating response protocol test cases for ${operation.id}")
140141

@@ -176,7 +177,7 @@ class HttpProtocolTestGenerator(
176177
// use the operation name + error name as the class name
177178
val opName = operation.id.name.capitalize()
178179
val testClassName = "${opName}${error.toUpperCamelCase()}Test"
179-
val testFilename = "./${ctx.settings.moduleName}Tests/${opName}ErrorTest.swift"
180+
val testFilename = "./${ctx.settings.testModuleName}/${opName}ErrorTest.swift"
180181
ctx.delegator.useTestFileWriter(testFilename, ctx.settings.moduleName) { writer ->
181182
LOGGER.fine("Generating error protocol test cases for ${operation.id}")
182183

0 commit comments

Comments
 (0)