Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 29 additions & 15 deletions codegen-core/common-test-models/rpcv2Cbor-extras.smithy
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,37 @@ service RpcV2CborService {
ComplexStructOperation
EmptyStructOperation
SingleMemberStructOperation
RecursiveUnionOperation
RecursiveUnionOperation,
StreamingOperation
]
}

operation StreamingOperation {
input: StreamingOperationInput,
output: StreamingOperationOutput,
errors: [ValidationException]
}

structure StreamingOperationOutput {
events: Events
}

structure StreamingOperationInput {
events: Events
}


@streaming
union Events {
A: Event,
B: Event,
C: Event,
}

structure Event {
}


// TODO(https://github.com/smithy-lang/smithy/issues/2326): Smithy should not
// allow HTTP binding traits in this protocol.
@http(uri: "/simple-struct-operation", method: "POST")
Expand Down Expand Up @@ -84,7 +111,6 @@ apply EmptyStructOperation @httpMalformedRequestTests([
}
}
}

}
])

Expand Down Expand Up @@ -303,35 +329,26 @@ structure ErrorSerializationOperationOutput {
structure SimpleStruct {
blob: Blob
boolean: Boolean

string: String

byte: Byte
short: Short
integer: Integer
long: Long

float: Float
double: Double

timestamp: Timestamp
enum: Suit

// With `@required`.

@required requiredBlob: Blob
@required requiredBoolean: Boolean

@required requiredString: String

@required requiredByte: Byte
@required requiredShort: Short
@required requiredInteger: Integer
@required requiredLong: Long

@required requiredFloat: Float
@required requiredDouble: Double

@required requiredTimestamp: Timestamp
// @required requiredDocument: MyDocument
@required requiredEnum: Suit
Expand All @@ -344,16 +361,14 @@ structure ComplexStruct {
map: SimpleMap
union: SimpleUnion
unitUnion: UnitUnion

structureList: StructList

// `@required` for good measure here.
@required complexList: ComplexList
@required complexMap: ComplexMap
@required complexUnion: ComplexUnion
}

structure EmptyStruct { }
structure EmptyStruct {}

structure SingleMemberStruct {
message: String
Expand Down Expand Up @@ -399,7 +414,6 @@ map ComplexMap {
union ComplexUnion {
// Recursive path here.
complexStruct: ComplexStruct

structure: SimpleStruct
list: SimpleList
map: SimpleMap
Expand Down
22 changes: 18 additions & 4 deletions codegen-server-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,16 @@ smithy {

val allCodegenTests = "../codegen-core/common-test-models".let { commonModels ->
listOf(
CodegenTest("crate#Config", "naming_test_ops", imports = listOf("$commonModels/naming-obstacle-course-ops.smithy")),
CodegenTest("casing#ACRONYMInside_Service", "naming_test_casing", imports = listOf("$commonModels/naming-obstacle-course-casing.smithy")),
CodegenTest(
"crate#Config",
"naming_test_ops",
imports = listOf("$commonModels/naming-obstacle-course-ops.smithy"),
),
CodegenTest(
"casing#ACRONYMInside_Service",
"naming_test_casing",
imports = listOf("$commonModels/naming-obstacle-course-casing.smithy"),
),
CodegenTest(
"naming_obs_structs#NamingObstacleCourseStructs",
"naming_test_structs",
Expand All @@ -47,7 +55,7 @@ val allCodegenTests = "../codegen-core/common-test-models".let { commonModels ->
CodegenTest(
"smithy.protocoltests.rpcv2Cbor#RpcV2CborService",
"rpcv2Cbor_extras",
imports = listOf("$commonModels/rpcv2Cbor-extras.smithy")
imports = listOf("$commonModels/rpcv2Cbor-extras.smithy"),
),
CodegenTest(
"com.amazonaws.constraints#ConstraintsService",
Expand Down Expand Up @@ -110,6 +118,12 @@ tasks["assemble"].finalizedBy("generateCargoWorkspace", "generateCargoConfigToml
project.registerModifyMtimeTask()
project.registerCargoCommandsTasks(layout.buildDirectory.dir(workingDirUnderBuildDir).get().asFile)

tasks["test"].finalizedBy(cargoCommands(properties).map { it.toString })
tasks.register<Exec>("cargoTestIntegration") {
dependsOn("assemble")
workingDir(projectDir.resolve("integration-tests"))
commandLine("cargo", "test")
}

tasks["test"].finalizedBy(cargoCommands(properties).map { it.toString }, "cargoTestIntegration")

tasks["clean"].doFirst { delete("smithy-build.json") }
1 change: 1 addition & 0 deletions codegen-server-test/integration-tests/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Cargo.lock
Loading
Loading