Skip to content

Commit 40e3a24

Browse files
author
Lambros Petrou
committed
Update the tests to assert the arguments to the API call
1 parent 0dc4e67 commit 40e3a24

File tree

6 files changed

+48
-12
lines changed

6 files changed

+48
-12
lines changed

‎aws-codeguruprofiler-profilinggroup/sample-template.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,22 @@
88
"ProfilingGroupName": "MySampleProfilingGroup"
99
}
1010
}
11+
},
12+
"Outputs": {
13+
"Ref": {
14+
"Description": "The Ref",
15+
"Value": {
16+
"Ref": "MyProfilingGroup"
17+
}
18+
},
19+
"GetAttArn": {
20+
"Description": "The GetAtt",
21+
"Value": {
22+
"Fn::GetAtt": [
23+
"MyProfilingGroup",
24+
"Arn"
25+
]
26+
}
27+
}
1128
}
1229
}

‎aws-codeguruprofiler-profilinggroup/src/test/java/software/amazon/codeguruprofiler/profilinggroup/CreateHandlerTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
import org.junit.jupiter.api.BeforeEach;
44
import org.junit.jupiter.api.Test;
55
import org.junit.jupiter.api.extension.ExtendWith;
6+
import org.mockito.ArgumentMatchers;
67
import org.mockito.Mock;
78
import org.mockito.junit.jupiter.MockitoExtension;
89
import software.amazon.awssdk.services.codeguruprofiler.model.ConflictException;
10+
import software.amazon.awssdk.services.codeguruprofiler.model.CreateProfilingGroupRequest;
911
import software.amazon.awssdk.services.codeguruprofiler.model.CreateProfilingGroupResponse;
1012
import software.amazon.awssdk.services.codeguruprofiler.model.InternalServerException;
1113
import software.amazon.awssdk.services.codeguruprofiler.model.ProfilingGroupDescription;
@@ -55,10 +57,14 @@ public void setup() {
5557
public void testSuccessState() {
5658
doReturn(CreateProfilingGroupResponse.builder()
5759
.profilingGroup(ProfilingGroupDescription.builder()
58-
.name("IronMan-Suite-34")
60+
.name("IronMan-Suit-34")
5961
.build())
6062
.build())
61-
.when(proxy).injectCredentialsAndInvokeV2(any(), any());
63+
.when(proxy).injectCredentialsAndInvokeV2(
64+
ArgumentMatchers.eq(CreateProfilingGroupRequest
65+
.builder()
66+
.profilingGroupName("IronMan-Suit-34")
67+
.build()), any());
6268

6369
final ProgressEvent<ResourceModel, CallbackContext> response
6470
= new CreateHandler().handleRequest(proxy, request, null, logger);

‎aws-codeguruprofiler-profilinggroup/src/test/java/software/amazon/codeguruprofiler/profilinggroup/DeleteHandlerTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import org.junit.jupiter.api.BeforeEach;
44
import org.junit.jupiter.api.Test;
55
import org.junit.jupiter.api.extension.ExtendWith;
6+
import org.mockito.ArgumentMatchers;
67
import org.mockito.Mock;
78
import org.mockito.junit.jupiter.MockitoExtension;
9+
import software.amazon.awssdk.services.codeguruprofiler.model.DeleteProfilingGroupRequest;
810
import software.amazon.awssdk.services.codeguruprofiler.model.DeleteProfilingGroupResponse;
911
import software.amazon.awssdk.services.codeguruprofiler.model.InternalServerException;
1012
import software.amazon.awssdk.services.codeguruprofiler.model.ResourceNotFoundException;
@@ -51,7 +53,11 @@ public void setup() {
5153
@Test
5254
public void testSuccessState() {
5355
doReturn(DeleteProfilingGroupResponse.builder().build())
54-
.when(proxy).injectCredentialsAndInvokeV2(any(), any());
56+
.when(proxy).injectCredentialsAndInvokeV2(
57+
ArgumentMatchers.eq(DeleteProfilingGroupRequest
58+
.builder()
59+
.profilingGroupName("IronMan-Suit-34")
60+
.build()), any());
5561

5662
final ProgressEvent<ResourceModel, CallbackContext> response
5763
= new DeleteHandler().handleRequest(proxy, request, null, logger);

‎aws-codeguruprofiler-profilinggroup/src/test/java/software/amazon/codeguruprofiler/profilinggroup/ListHandlerTest.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,26 @@ public void setup() {
4848

4949
@Test
5050
public void testSuccessState() {
51-
final String arn = "arn:aws:codeguru-profiler:us-east-1:000000000000:profilingGroup/IronMan-Suite-34";
51+
final String arn = "arn:aws:codeguru-profiler:us-east-1:000000000000:profilingGroup/IronMan-Suit-34";
5252
final ProfilingGroupDescription profilingGroupDescription = ProfilingGroupDescription.builder()
53-
.name("IronMan-Suite-34")
53+
.name("IronMan-Suit-34")
5454
.arn(arn)
5555
.build();
5656

5757
doReturn(ListProfilingGroupsResponse.builder()
5858
.profilingGroups(profilingGroupDescription)
59-
.nextToken("test-token")
59+
.nextToken("page3")
6060
.build())
6161
.when(proxy).injectCredentialsAndInvokeV2(
6262
ArgumentMatchers.eq(ListProfilingGroupsRequest
6363
.builder()
64-
.nextToken(null)
64+
.nextToken("page2")
6565
.maxResults(100)
6666
.includeDescription(true)
6767
.build()),
6868
any());
6969

70+
request.setNextToken("page2");
7071
final ProgressEvent<ResourceModel, CallbackContext> response
7172
= new ListHandler().handleRequest(proxy, request, null, logger);
7273

@@ -81,7 +82,7 @@ public void testSuccessState() {
8182
assertThat(response.getCallbackDelaySeconds()).isEqualTo(0);
8283
assertThat(response.getResourceModel()).isNull();
8384
assertThat(response.getResourceModels()).containsExactly(expectedModel);
84-
assertThat(response.getNextToken()).isEqualTo("test-token");
85+
assertThat(response.getNextToken()).isEqualTo("page3");
8586
assertThat(response.getMessage()).isNull();
8687
assertThat(response.getErrorCode()).isNull();
8788
}

‎aws-codeguruprofiler-profilinggroup/src/test/java/software/amazon/codeguruprofiler/profilinggroup/ReadHandlerTest.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import org.junit.jupiter.api.BeforeEach;
44
import org.junit.jupiter.api.Test;
55
import org.junit.jupiter.api.extension.ExtendWith;
6+
import org.mockito.ArgumentMatchers;
67
import org.mockito.Mock;
78
import org.mockito.junit.jupiter.MockitoExtension;
9+
import software.amazon.awssdk.services.codeguruprofiler.model.DescribeProfilingGroupRequest;
810
import software.amazon.awssdk.services.codeguruprofiler.model.DescribeProfilingGroupResponse;
911
import software.amazon.awssdk.services.codeguruprofiler.model.InternalServerException;
1012
import software.amazon.awssdk.services.codeguruprofiler.model.ProfilingGroupDescription;
@@ -51,15 +53,19 @@ public void setup() {
5153

5254
@Test
5355
public void testSuccessState() {
54-
final String arn = "arn:aws:codeguru-profiler:us-east-1:000000000000:profilingGroup/IronMan-Suite-34";
56+
final String arn = "arn:aws:codeguru-profiler:us-east-1:000000000000:profilingGroup/IronMan-Suit-34";
5557

5658
doReturn(DescribeProfilingGroupResponse.builder()
5759
.profilingGroup(ProfilingGroupDescription.builder()
58-
.name("IronMan-Suite-34")
60+
.name("IronMan-Suit-34")
5961
.arn(arn)
6062
.build())
6163
.build())
62-
.when(proxy).injectCredentialsAndInvokeV2(any(), any());
64+
.when(proxy).injectCredentialsAndInvokeV2(
65+
ArgumentMatchers.eq(DescribeProfilingGroupRequest
66+
.builder()
67+
.profilingGroupName("IronMan-Suit-34")
68+
.build()), any());
6369

6470
final ProgressEvent<ResourceModel, CallbackContext> response
6571
= new ReadHandler().handleRequest(proxy, request, null, logger);

‎aws-codeguruprofiler-profilinggroup/src/test/java/software/amazon/codeguruprofiler/profilinggroup/RequestBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public class RequestBuilder {
66
static ResourceHandlerRequest<ResourceModel> makeValidRequest() {
7-
return makeRequest(ResourceModel.builder().profilingGroupName("IronMan-Suite-34").build());
7+
return makeRequest(ResourceModel.builder().profilingGroupName("IronMan-Suit-34").build());
88
}
99

1010
static ResourceHandlerRequest<ResourceModel> makeInvalidRequest() {

0 commit comments

Comments
 (0)