Skip to content

Commit 03fa06b

Browse files
authored
30 extract the cdk test into its own lib (#42)
Imported `com.coffeebeans:cdk-fluent-assertions` Extracted the CDK assertions logic to `https://github.com/muhamadto/cdk-fluent-assertions` and imported the resulting library `com.coffeebeans:cdk-fluent-assertions:1.0.0` to this project to be used in testing Signed-off-by: muhamadto <muhamadto@gmail.com>
1 parent 17434e0 commit 03fa06b

24 files changed

+18
-1730
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
5757
ENV: ${{ env.ENV }}
5858
COST_CENTRE: ${{ env.COST_CENTRE }}
59-
run: ./mvnw -ntp -Pnative clean package -DskipTests
59+
run: ./mvnw -ntp -Pnative clean package -DskipTests=true
6060
- name: cdk diff
6161
uses: noverant/aws-cdk-github-actions@v1
6262
with:

pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,13 @@
163163
<!-- JACKSON ENDS -->
164164

165165
<!-- TEST -->
166+
<dependency>
167+
<groupId>cloud.pianola</groupId>
168+
<artifactId>cdk-fluent-assertions</artifactId>
169+
<version>1.0.1</version>
170+
<scope>test</scope>
171+
</dependency>
172+
166173
<dependency>
167174
<groupId>org.assertj</groupId>
168175
<artifactId>assertj-core</artifactId>

spring-native-aws-lambda-infra/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@
9696
<!-- JACKSON ENDS-->
9797

9898
<!-- TEST -->
99+
<dependency>
100+
<groupId>cloud.pianola</groupId>
101+
<artifactId>cdk-fluent-assertions</artifactId>
102+
<scope>test</scope>
103+
</dependency>
99104

100105
<dependency>
101106
<groupId>org.assertj</groupId>

spring-native-aws-lambda-infra/src/test/java/com/coffeebeans/springnativeawslambda/infra/LambdaTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818

1919
package com.coffeebeans.springnativeawslambda.infra;
2020

21+
import static cloud.pianola.cdk.fluent.assertion.CDKStackAssert.*;
2122
import static com.coffeebeans.springnativeawslambda.infra.TagUtils.TAG_VALUE_COST_CENTRE;
22-
import static com.coffeebeans.springnativeawslambda.infra.assertion.CDKStackAssert.assertThat;
2323
import static software.amazon.awscdk.assertions.Match.exact;
2424
import static software.amazon.awscdk.assertions.Match.stringLikeRegexp;
2525

26-
import com.coffeebeans.springnativeawslambda.infra.assertion.CDKStackAssert;
2726
import com.fasterxml.jackson.core.JsonProcessingException;
2827
import java.util.List;
2928
import java.util.Map;
@@ -36,7 +35,7 @@ class LambdaTest extends TemplateSupport {
3635
@Test
3736
void should_have_lambda_function() {
3837

39-
CDKStackAssert.assertThat(template)
38+
assertThat(template)
4039
.containsFunction("spring-native-aws-lambda-function")
4140
.hasHandler("org.springframework.cloud.function.adapter.aws.FunctionInvoker::handleRequest")
4241
.hasCode("test-cdk-bucket", "(.*).zip")

spring-native-aws-lambda-infra/src/test/java/com/coffeebeans/springnativeawslambda/infra/RestApiTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package com.coffeebeans.springnativeawslambda.infra;
2020

2121
import static com.coffeebeans.springnativeawslambda.infra.TagUtils.TAG_VALUE_COST_CENTRE;
22-
import static com.coffeebeans.springnativeawslambda.infra.assertion.CDKStackAssert.assertThat;
22+
import static cloud.pianola.cdk.fluent.assertion.CDKStackAssert.*;
2323

2424
import java.util.List;
2525
import java.util.Map;
@@ -55,7 +55,7 @@ void should_have_rest_api_account() {
5555
void should_have_rest_api_deployment() {
5656

5757
assertThat(template)
58-
.containsRestApiDeploymentWithRestApiId("springnativeawslambdafunctionrestapi(.*)")
58+
.containsRestApiDeployment("springnativeawslambdafunctionrestapi(.*)")
5959
.hasDependency("springnativeawslambdafunctionrestapiproxyANY(.*)")
6060
.hasDependency("springnativeawslambdafunctionrestapiproxy(.*)")
6161
.hasDependency("springnativeawslambdafunctionrestapiANY(.*)")

spring-native-aws-lambda-infra/src/test/java/com/coffeebeans/springnativeawslambda/infra/TopicTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package com.coffeebeans.springnativeawslambda.infra;
2020

2121
import static com.coffeebeans.springnativeawslambda.infra.TagUtils.TAG_VALUE_COST_CENTRE;
22-
import static com.coffeebeans.springnativeawslambda.infra.assertion.CDKStackAssert.assertThat;
22+
import static cloud.pianola.cdk.fluent.assertion.CDKStackAssert.*;
2323

2424
import org.junit.jupiter.api.Test;
2525

spring-native-aws-lambda-infra/src/test/java/com/coffeebeans/springnativeawslambda/infra/assertion/AbstractCDKResourcesAssert.java

Lines changed: 0 additions & 157 deletions
This file was deleted.

0 commit comments

Comments
 (0)