diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5af7da4ecc25a..dca9ebdce5f06 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -978,3 +978,4 @@ $ node --inspect-brk /path/to/aws-cdk/node_modules/.bin/jest -i -t 'TESTNAME' * [Workshop](https://github.com/aws-samples/aws-cdk-intro-workshop): source for https://cdkworkshop.com * [Developer Guide](https://github.com/awsdocs/aws-cdk-guide): markdown source for developer guide * [jsii](https://github.com/aws/jsii): the technology we use for multi-language support. If you are looking to help us support new languages, start there. + diff --git a/packages/aws-cdk/lib/init-templates/v1/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java b/packages/aws-cdk/lib/init-templates/v1/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java index f96ca04987f31..e095565be7920 100644 --- a/packages/aws-cdk/lib/init-templates/v1/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java +++ b/packages/aws-cdk/lib/init-templates/v1/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java @@ -4,7 +4,7 @@ // import software.amazon.awscdk.assertions.Template; // import java.io.IOException; -// import java.util.Map; +// import java.util.HashMap; // import org.junit.jupiter.api.Test; @@ -19,8 +19,8 @@ // Template template = Template.fromStack(stack); -// template.hasResourceProperties("AWS::SQS::Queue", Map.of( -// "VisibilityTimeout", 300 -// )); +// template.hasResourceProperties("AWS::SQS::Queue", new HashMap() {{ +// put("VisibilityTimeout", 300); +// }}); // } // } diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/requirements.template.txt b/packages/aws-cdk/lib/init-templates/v1/app/python/requirements.template.txt index e14ce6e77e499..87cbb00cfac55 100644 --- a/packages/aws-cdk/lib/init-templates/v1/app/python/requirements.template.txt +++ b/packages/aws-cdk/lib/init-templates/v1/app/python/requirements.template.txt @@ -1,2 +1,2 @@ -aws-cdk.core>=%cdk-version%, -aws-cdk.assertions>=%cdk-version%, +aws-cdk.core>=%cdk-version% +aws-cdk.assertions>=%cdk-version% diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/tests/unit/test_%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/v1/app/python/tests/unit/test_%name.PythonModule%_stack.template.py index 94f2234e02aa6..1b0e4b66e9aaa 100644 --- a/packages/aws-cdk/lib/init-templates/v1/app/python/tests/unit/test_%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/v1/app/python/tests/unit/test_%name.PythonModule%_stack.template.py @@ -8,7 +8,7 @@ # example tests. To run these tests, uncomment this file along with the example # resource in %name.PythonModule%/%name.PythonModule%_stack.py -# def test_sqs_queue_created(): +def test_sqs_queue_created(): # app = core.App() # stack = %name.PascalCased%Stack(app, "%name.StackName%") # template = assertions.Template.from_stack(stack) @@ -16,3 +16,4 @@ # template.has_resource_properties("AWS::SQS::Queue", { # "VisibilityTimeout": 300 # }) + pass diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java b/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java index b648a3a72dc46..5cbbe8a127e4f 100644 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java +++ b/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java @@ -5,7 +5,7 @@ import software.amazon.awscdk.assertions.Match; import java.io.IOException; -import java.util.Map; +import java.util.HashMap; import org.junit.jupiter.api.Test; @@ -18,9 +18,9 @@ public void testStack() throws IOException { Template template = Template.fromStack(stack); - template.hasResourceProperties("AWS::SQS::Queue", Map.of( - "VisibilityTimeout", 300 - )); + template.hasResourceProperties("AWS::SQS::Queue", new HashMap() {{ + put("VisibilityTimeout", 300); + }}); template.resourceCountIs("AWS::SNS::Topic", 1); } } diff --git a/packages/aws-cdk/lib/init-templates/v2/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java b/packages/aws-cdk/lib/init-templates/v2/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java index 5e9d7806654d0..564b1682848ca 100644 --- a/packages/aws-cdk/lib/init-templates/v2/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java +++ b/packages/aws-cdk/lib/init-templates/v2/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java @@ -4,7 +4,7 @@ // import software.amazon.awscdk.assertions.alpha.Template; // import java.io.IOException; -// import java.util.Map; +// import java.util.HashMap; // import org.junit.jupiter.api.Test; @@ -19,8 +19,8 @@ // Template template = Template.fromStack(stack); -// template.hasResourceProperties("AWS::SQS::Queue", Map.of( -// "VisibilityTimeout", 300 -// )); +// template.hasResourceProperties("AWS::SQS::Queue", new HashMap() {{ +// put("VisibilityTimeout", 300); +// }}); // } // } diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java b/packages/aws-cdk/lib/init-templates/v2/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java index c728c6eb6323c..1cd39ad8da3bb 100644 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java +++ b/packages/aws-cdk/lib/init-templates/v2/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java @@ -5,7 +5,7 @@ import software.amazon.awscdk.assertions.alpha.Match; import java.io.IOException; -import java.util.Map; +import java.util.HashMap; import org.junit.jupiter.api.Test; @@ -18,9 +18,9 @@ public void testStack() throws IOException { Template template = Template.fromStack(stack); - template.hasResourceProperties("AWS::SQS::Queue", Map.of( - "VisibilityTimeout", 300 - )); + template.hasResourceProperties("AWS::SQS::Queue", new HashMap() {{ + put("VisibilityTimeout", 300); + }}); template.resourceCountIs("AWS::SNS::Topic", 1); }