From 1c90dc5fa7a1e1fac87e88ac2b4caec370517495 Mon Sep 17 00:00:00 2001 From: Russell Cohen Date: Tue, 15 Feb 2022 11:10:38 -0500 Subject: [PATCH] Autodump generated files (#1179) * Autodump generated files * Remove unecessary printlns * Sort the list of generated files --- .../EndpointConfigCustomizationTest.kt | 1 - .../smithy/rust/codegen/testutil/Rust.kt | 8 ++++- .../generators/StructureGeneratorTest.kt | 2 -- .../http/RequestBindingGeneratorTest.kt | 29 +++++++++---------- .../smithy/protocols/EventStreamTestTools.kt | 7 ----- .../parse/AwsQueryParserGeneratorTest.kt | 4 --- .../parse/Ec2QueryParserGeneratorTest.kt | 4 --- .../parse/JsonParserGeneratorTest.kt | 4 --- .../AwsQuerySerializerGeneratorTest.kt | 4 --- .../Ec2QuerySerializerGeneratorTest.kt | 4 --- .../serialize/JsonSerializerGeneratorTest.kt | 4 --- .../XmlBindingTraitSerializerGeneratorTest.kt | 1 - 12 files changed, 20 insertions(+), 52 deletions(-) diff --git a/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/EndpointConfigCustomizationTest.kt b/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/EndpointConfigCustomizationTest.kt index e6c3b5be5..cbc90a1a5 100644 --- a/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/EndpointConfigCustomizationTest.kt +++ b/aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/EndpointConfigCustomizationTest.kt @@ -167,7 +167,6 @@ internal class EndpointConfigCustomizationTest { """ ) } - println("file:///" + project.baseDir + "/src/aws_endpoint.rs") project.compileAndTest() } } diff --git a/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/testutil/Rust.kt b/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/testutil/Rust.kt index fc4c1a36f..bf24a684a 100644 --- a/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/testutil/Rust.kt +++ b/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/testutil/Rust.kt @@ -154,9 +154,11 @@ fun RustWriter.unitTest( } } -class TestWriterDelegator(fileManifest: FileManifest, symbolProvider: RustSymbolProvider) : +class TestWriterDelegator(private val fileManifest: FileManifest, symbolProvider: RustSymbolProvider) : RustCrate(fileManifest, symbolProvider, DefaultPublicModules) { val baseDir: Path = fileManifest.baseDir + + fun generatedFiles(): List = fileManifest.files.toList().sorted() } /** @@ -177,6 +179,10 @@ fun TestWriterDelegator.compileAndTest(runClippy: Boolean = false) { manifestCustomizations = emptyMap(), libRsCustomizations = listOf(), ) + println("Generated files:") + generatedFiles().forEach { path -> + println("file:///$path") + } try { "cargo fmt".runCommand(baseDir) } catch (e: Exception) { diff --git a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/generators/StructureGeneratorTest.kt b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/generators/StructureGeneratorTest.kt index 9f948470d..df5f22247 100644 --- a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/generators/StructureGeneratorTest.kt +++ b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/generators/StructureGeneratorTest.kt @@ -244,8 +244,6 @@ class StructureGeneratorTest { ) val provider = testSymbolProvider(testModel) val project = TestWorkspace.testProject(provider) - println("file:///" + project.baseDir + "/src/lib.rs") - println("file:///" + project.baseDir + "/src/model.rs") project.useShapeWriter(inner) { writer -> writer.withModule("model") { diff --git a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/generators/http/RequestBindingGeneratorTest.kt b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/generators/http/RequestBindingGeneratorTest.kt index c646e983c..1e70ea7d7 100644 --- a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/generators/http/RequestBindingGeneratorTest.kt +++ b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/generators/http/RequestBindingGeneratorTest.kt @@ -199,7 +199,7 @@ class RequestBindingGeneratorTest { let mut o = String::new(); inp.test_uri_query(&mut o); assert_eq!(o.as_str(), "?primitive=1&enabled=true") - """ + """ ) writer.unitTest( @@ -232,7 +232,7 @@ class RequestBindingGeneratorTest { let prefix_header = http_request.headers().get_all("X-Prefix-k").iter().map(|hv|std::str::from_utf8(hv.as_ref()).unwrap()).collect::>(); assert_eq!(prefix_header, vec!["😹"]) - """ + """ ) writer.unitTest( @@ -247,7 +247,7 @@ class RequestBindingGeneratorTest { .build().unwrap(); let err = inp.test_request_builder_base().expect_err("can't make a header out of a cat emoji"); assert_eq!(format!("{}", err), "Invalid field in input: prefix (Details: `😹` cannot be used as a header name: invalid HTTP header name)"); - """ + """ ) writer.unitTest( @@ -262,7 +262,7 @@ class RequestBindingGeneratorTest { .build().unwrap(); let err = inp.test_request_builder_base().expect_err("can't make a header with a newline"); assert_eq!(format!("{}", err), "Invalid field in input: prefix (Details: `\n can\'t put a newline in a header value` cannot be used as a header value: failed to parse header value)"); - """ + """ ) writer.unitTest( @@ -277,7 +277,7 @@ class RequestBindingGeneratorTest { let err = inp.test_request_builder_base().expect_err("can't make a header with a newline"); // make sure we obey the sensitive trait assert_eq!(format!("{}", err), "Invalid field in input: string_header (Details: `*** Sensitive Data Redacted ***` cannot be used as a header value: failed to parse header value)"); - """ + """ ) writer.unitTest( @@ -311,20 +311,17 @@ class RequestBindingGeneratorTest { writer.unitTest( name = "empty_uri_label_produces_an_error", test = """ - let ts = aws_smithy_types::DateTime::from_secs(10123125); - let inp = PutObjectInput::builder() - .bucket_name("") - .key(ts.clone()) - .build().unwrap(); - let err = inp.test_request_builder_base().expect_err("can't build request with bucket unset"); - assert!(matches!(err, ${writer.format(TestRuntimeConfig.operationBuildError())}::MissingField { .. })) - """ + let ts = aws_smithy_types::DateTime::from_secs(10123125); + let inp = PutObjectInput::builder() + .bucket_name("") + .key(ts.clone()) + .build().unwrap(); + let err = inp.test_request_builder_base().expect_err("can't build request with bucket unset"); + assert!(matches!(err, ${writer.format(TestRuntimeConfig.operationBuildError())}::MissingField { .. })) + """ ) } - println("file:///${project.baseDir}/src/lib.rs") - println("file:///${project.baseDir}/src/model.rs") - println("file:///${project.baseDir}/src/input.rs") project.compileAndTest() } } diff --git a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/EventStreamTestTools.kt b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/EventStreamTestTools.kt index 1946d6f8d..19f9b4979 100644 --- a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/EventStreamTestTools.kt +++ b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/EventStreamTestTools.kt @@ -355,13 +355,6 @@ object EventStreamTestTools { project.withModule(RustModule.public("output")) { operationShape.outputShape(model).renderWithModelBuilder(model, symbolProvider, it) } - println("file:///${project.baseDir}/src/error.rs") - println("file:///${project.baseDir}/src/event_stream.rs") - println("file:///${project.baseDir}/src/event_stream_serde.rs") - println("file:///${project.baseDir}/src/json_ser.rs") - println("file:///${project.baseDir}/src/lib.rs") - println("file:///${project.baseDir}/src/model.rs") - println("file:///${project.baseDir}/src/operation_ser.rs") return TestEventStreamProject(model, serviceShape, operationShape, unionShape, symbolProvider, project) } diff --git a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/AwsQueryParserGeneratorTest.kt b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/AwsQueryParserGeneratorTest.kt index fab4ca426..20007d270 100644 --- a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/AwsQueryParserGeneratorTest.kt +++ b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/AwsQueryParserGeneratorTest.kt @@ -77,10 +77,6 @@ class AwsQueryParserGeneratorTest { model.lookup("test#SomeOperation").outputShape(model) .renderWithModelBuilder(model, symbolProvider, it) } - println("file:///${project.baseDir}/src/lib.rs") - println("file:///${project.baseDir}/src/model.rs") - println("file:///${project.baseDir}/src/output.rs") - println("file:///${project.baseDir}/src/xml_deser.rs") project.compileAndTest() } } diff --git a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/Ec2QueryParserGeneratorTest.kt b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/Ec2QueryParserGeneratorTest.kt index a43cfaf54..e0c7c5e09 100644 --- a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/Ec2QueryParserGeneratorTest.kt +++ b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/Ec2QueryParserGeneratorTest.kt @@ -75,10 +75,6 @@ class Ec2QueryParserGeneratorTest { model.lookup("test#SomeOperation").outputShape(model) .renderWithModelBuilder(model, symbolProvider, it) } - println("file:///${project.baseDir}/src/lib.rs") - println("file:///${project.baseDir}/src/model.rs") - println("file:///${project.baseDir}/src/output.rs") - println("file:///${project.baseDir}/src/xml_deser.rs") project.compileAndTest() } } diff --git a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/JsonParserGeneratorTest.kt b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/JsonParserGeneratorTest.kt index 16adf7d43..d4c7602cc 100644 --- a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/JsonParserGeneratorTest.kt +++ b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/parse/JsonParserGeneratorTest.kt @@ -200,10 +200,6 @@ class JsonParserGeneratorTest { project.withModule(RustModule.public("error")) { model.lookup("test#Error").renderWithModelBuilder(model, symbolProvider, it) } - println("file:///${project.baseDir}/src/json_deser.rs") - println("file:///${project.baseDir}/src/lib.rs") - println("file:///${project.baseDir}/src/model.rs") - println("file:///${project.baseDir}/src/output.rs") project.compileAndTest() } } diff --git a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/AwsQuerySerializerGeneratorTest.kt b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/AwsQuerySerializerGeneratorTest.kt index 01aef3f96..8e7bcf75f 100644 --- a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/AwsQuerySerializerGeneratorTest.kt +++ b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/AwsQuerySerializerGeneratorTest.kt @@ -142,10 +142,6 @@ class AwsQuerySerializerGeneratorTest { project.withModule(RustModule.public("input")) { model.lookup("test#Op").inputShape(model).renderWithModelBuilder(model, symbolProvider, it) } - println("file:///${project.baseDir}/src/lib.rs") - println("file:///${project.baseDir}/src/model.rs") - println("file:///${project.baseDir}/src/operation_ser.rs") - println("file:///${project.baseDir}/src/query_ser.rs") project.compileAndTest() } } diff --git a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/Ec2QuerySerializerGeneratorTest.kt b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/Ec2QuerySerializerGeneratorTest.kt index 50c9dbb26..b0fe56b23 100644 --- a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/Ec2QuerySerializerGeneratorTest.kt +++ b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/Ec2QuerySerializerGeneratorTest.kt @@ -134,10 +134,6 @@ class Ec2QuerySerializerGeneratorTest { project.withModule(RustModule.public("input")) { model.lookup("test#Op").inputShape(model).renderWithModelBuilder(model, symbolProvider, it) } - println("file:///${project.baseDir}/src/lib.rs") - println("file:///${project.baseDir}/src/model.rs") - println("file:///${project.baseDir}/src/operation_ser.rs") - println("file:///${project.baseDir}/src/query_ser.rs") project.compileAndTest() } } diff --git a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/JsonSerializerGeneratorTest.kt b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/JsonSerializerGeneratorTest.kt index bd84733cd..d4ce6a4d3 100644 --- a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/JsonSerializerGeneratorTest.kt +++ b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/JsonSerializerGeneratorTest.kt @@ -150,10 +150,6 @@ class JsonSerializerGeneratorTest { project.withModule(RustModule.public("input")) { model.lookup("test#Op").inputShape(model).renderWithModelBuilder(model, symbolProvider, it) } - println("file:///${project.baseDir}/src/json_ser.rs") - println("file:///${project.baseDir}/src/lib.rs") - println("file:///${project.baseDir}/src/model.rs") - println("file:///${project.baseDir}/src/operation_ser.rs") project.compileAndTest() } } diff --git a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/XmlBindingTraitSerializerGeneratorTest.kt b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/XmlBindingTraitSerializerGeneratorTest.kt index 437dcc8d3..8b276dcad 100644 --- a/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/XmlBindingTraitSerializerGeneratorTest.kt +++ b/codegen/src/test/kotlin/software/amazon/smithy/rust/codegen/smithy/protocols/serialize/XmlBindingTraitSerializerGeneratorTest.kt @@ -153,7 +153,6 @@ internal class XmlBindingTraitSerializerGeneratorTest { project.withModule(RustModule.public("input")) { model.lookup("test#Op").inputShape(model).renderWithModelBuilder(model, symbolProvider, it) } - println("file:///${project.baseDir}/src/xml_ser.rs") project.compileAndTest() } } -- GitLab