Skip to content

Commit 006168f

Browse files
rix0rrrrix0rrr
authored
chore(events): migrate tests to assertions (#18552)
---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 455d0b3 commit 006168f

File tree

16 files changed

+139
-139
lines changed

16 files changed

+139
-139
lines changed

‎packages/@aws-cdk/aws-events-targets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
},
8080
"license": "Apache-2.0",
8181
"devDependencies": {
82-
"@aws-cdk/assert-internal": "0.0.0",
82+
"@aws-cdk/assertions": "0.0.0",
8383
"@aws-cdk/aws-batch": "0.0.0",
8484
"@aws-cdk/aws-codecommit": "0.0.0",
8585
"@aws-cdk/aws-s3": "0.0.0",

‎packages/@aws-cdk/aws-events-targets/test/api-gateway/api-gateway.test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '@aws-cdk/assert-internal/jest';
1+
import { Template } from '@aws-cdk/assertions';
22
import * as api from '@aws-cdk/aws-apigateway';
33
import * as events from '@aws-cdk/aws-events';
44
import * as iam from '@aws-cdk/aws-iam';
@@ -20,7 +20,7 @@ test('use api gateway rest api as an event rule target', () => {
2020
rule.addTarget(new targets.ApiGateway(restApi));
2121

2222
// THEN
23-
expect(stack).toHaveResource('AWS::Events::Rule', {
23+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
2424
Targets: [
2525
{
2626
Arn: {
@@ -81,7 +81,7 @@ test('with stage, path, method setting', () => {
8181
}));
8282

8383
// THEN
84-
expect(stack).toHaveResource('AWS::Events::Rule', {
84+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
8585
Targets: [
8686
{
8787
Arn: {
@@ -147,7 +147,7 @@ test('with http parameters', () => {
147147
}));
148148

149149
// THEN
150-
expect(stack).toHaveResourceLike('AWS::Events::Rule', {
150+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
151151
Targets: [
152152
{
153153
HttpParameters: {
@@ -204,7 +204,7 @@ test('with an explicit event role', () => {
204204
}));
205205

206206
// THEN
207-
expect(stack).toHaveResourceLike('AWS::Events::Rule', {
207+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
208208
Targets: [
209209
{
210210
RoleArn: {
@@ -234,7 +234,7 @@ test('use a Dead Letter Queue', () => {
234234
}));
235235

236236
// THEN
237-
expect(stack).toHaveResourceLike('AWS::Events::Rule', {
237+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
238238
Targets: [
239239
{
240240
DeadLetterConfig: {

‎packages/@aws-cdk/aws-events-targets/test/aws-api/aws-api.test.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { countResources, expect as cdkExpect, haveResource, SynthUtils } from '@aws-cdk/assert-internal';
1+
import { Template } from '@aws-cdk/assertions';
22
import * as events from '@aws-cdk/aws-events';
33
import * as iam from '@aws-cdk/aws-iam';
4-
import { Stack } from '@aws-cdk/core';
4+
import { App, Stack } from '@aws-cdk/core';
55
import * as targets from '../../lib';
66

77
test('use AwsApi as an event rule target', () => {
@@ -32,7 +32,7 @@ test('use AwsApi as an event rule target', () => {
3232
}));
3333

3434
// THEN
35-
cdkExpect(stack).to(haveResource('AWS::Events::Rule', {
35+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
3636
Targets: [
3737
{
3838
Arn: {
@@ -70,12 +70,12 @@ test('use AwsApi as an event rule target', () => {
7070
}),
7171
},
7272
],
73-
}));
73+
});
7474

7575
// Uses a singleton function
76-
cdkExpect(stack).to(countResources('AWS::Lambda::Function', 1));
76+
Template.fromStack(stack).resourceCountIs('AWS::Lambda::Function', 1);
7777

78-
cdkExpect(stack).to(haveResource('AWS::IAM::Policy', {
78+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', {
7979
PolicyDocument: {
8080
Statement: [
8181
{
@@ -91,7 +91,7 @@ test('use AwsApi as an event rule target', () => {
9191
],
9292
Version: '2012-10-17',
9393
},
94-
}));
94+
});
9595
});
9696

9797
test('with policy statement', () => {
@@ -112,7 +112,7 @@ test('with policy statement', () => {
112112
}));
113113

114114
// THEN
115-
cdkExpect(stack).to(haveResource('AWS::Events::Rule', {
115+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
116116
Targets: [
117117
{
118118
Arn: {
@@ -128,9 +128,9 @@ test('with policy statement', () => {
128128
}),
129129
},
130130
],
131-
}));
131+
});
132132

133-
cdkExpect(stack).to(haveResource('AWS::IAM::Policy', {
133+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', {
134134
PolicyDocument: {
135135
Statement: [
136136
{
@@ -141,7 +141,7 @@ test('with policy statement', () => {
141141
],
142142
Version: '2012-10-17',
143143
},
144-
}));
144+
});
145145
});
146146

147147
test('with service not in AWS SDK', () => {
@@ -163,7 +163,7 @@ test('with service not in AWS SDK', () => {
163163
rule.addTarget(awsApi);
164164

165165
// THEN
166-
const assembly = SynthUtils.synthesize(stack);
166+
const assembly = App.of(stack)!.synth().getStackArtifact(stack.stackName);
167167
expect(assembly.messages.length).toBe(1);
168168
const message = assembly.messages[0];
169169
expect(message.entry.type).toBe('aws:cdk:warning');

‎packages/@aws-cdk/aws-events-targets/test/batch/batch.test.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { expect, haveResource } from '@aws-cdk/assert-internal';
1+
import { Template } from '@aws-cdk/assertions';
22
import * as batch from '@aws-cdk/aws-batch';
33
import { ContainerImage } from '@aws-cdk/aws-ecs';
44
import * as events from '@aws-cdk/aws-events';
@@ -41,7 +41,7 @@ describe('Batch job event target', () => {
4141
rule.addTarget(new targets.BatchJob(jobQueue.jobQueueArn, jobQueue, jobDefinition.jobDefinitionArn, jobDefinition));
4242

4343
// THEN
44-
expect(stack).to(haveResource('AWS::Events::Rule', {
44+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
4545
ScheduleExpression: 'rate(1 min)',
4646
State: 'ENABLED',
4747
Targets: [
@@ -62,9 +62,9 @@ describe('Batch job event target', () => {
6262
},
6363
},
6464
],
65-
}));
65+
});
6666

67-
expect(stack).to(haveResource('AWS::IAM::Policy', {
67+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', {
6868
PolicyDocument: {
6969
Statement: [
7070
{
@@ -81,7 +81,7 @@ describe('Batch job event target', () => {
8181
Roles: [
8282
{ Ref: 'MyJobEventsRoleCF43C336' },
8383
],
84-
}));
84+
});
8585
});
8686

8787
test('use a Dead Letter Queue for the rule target', () => {
@@ -108,7 +108,7 @@ describe('Batch job event target', () => {
108108
));
109109

110110
// THEN
111-
expect(stack).to(haveResource('AWS::Events::Rule', {
111+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
112112
Targets: [
113113
{
114114
Arn: {
@@ -133,9 +133,9 @@ describe('Batch job event target', () => {
133133
},
134134
},
135135
],
136-
}));
136+
});
137137

138-
expect(stack).to(haveResource('AWS::SQS::QueuePolicy', {
138+
Template.fromStack(stack).hasResourceProperties('AWS::SQS::QueuePolicy', {
139139
PolicyDocument: {
140140
Statement: [
141141
{
@@ -170,7 +170,7 @@ describe('Batch job event target', () => {
170170
Ref: 'Queue4A7E3555',
171171
},
172172
],
173-
}));
173+
});
174174
});
175175

176176
test('specifying retry policy', () => {
@@ -199,7 +199,7 @@ describe('Batch job event target', () => {
199199
));
200200

201201
// THEN
202-
expect(stack).to(haveResource('AWS::Events::Rule', {
202+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
203203
ScheduleExpression: 'rate(1 hour)',
204204
State: 'ENABLED',
205205
Targets: [
@@ -235,6 +235,6 @@ describe('Batch job event target', () => {
235235
},
236236
},
237237
],
238-
}));
238+
});
239239
});
240240
});

‎packages/@aws-cdk/aws-events-targets/test/codebuild/codebuild.test.ts

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { expect, haveResource } from '@aws-cdk/assert-internal';
1+
import { Template } from '@aws-cdk/assertions';
22
import * as codebuild from '@aws-cdk/aws-codebuild';
33
import * as events from '@aws-cdk/aws-events';
44
import * as iam from '@aws-cdk/aws-iam';
@@ -27,17 +27,17 @@ describe('CodeBuild event target', () => {
2727
rule.addTarget(new targets.CodeBuildProject(project));
2828

2929
// THEN
30-
expect(stack).to(haveResource('AWS::Events::Rule', {
30+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
3131
Targets: [
3232
{
3333
Arn: projectArn,
3434
Id: 'Target0',
3535
RoleArn: { 'Fn::GetAtt': ['MyProjectEventsRole5B7D93F5', 'Arn'] },
3636
},
3737
],
38-
}));
38+
});
3939

40-
expect(stack).to(haveResource('AWS::IAM::Role', {
40+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Role', {
4141
AssumeRolePolicyDocument: {
4242
Statement: [
4343
{
@@ -48,9 +48,9 @@ describe('CodeBuild event target', () => {
4848
],
4949
Version: '2012-10-17',
5050
},
51-
}));
51+
});
5252

53-
expect(stack).to(haveResource('AWS::IAM::Policy', {
53+
Template.fromStack(stack).hasResourceProperties('AWS::IAM::Policy', {
5454
PolicyDocument: {
5555
Statement: [
5656
{
@@ -61,7 +61,7 @@ describe('CodeBuild event target', () => {
6161
],
6262
Version: '2012-10-17',
6363
},
64-
}));
64+
});
6565
});
6666

6767
test('specifying event for codebuild project target', () => {
@@ -82,7 +82,7 @@ describe('CodeBuild event target', () => {
8282
);
8383

8484
// THEN
85-
expect(stack).to(haveResource('AWS::Events::Rule', {
85+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
8686
Targets: [
8787
{
8888
Arn: projectArn,
@@ -93,7 +93,7 @@ describe('CodeBuild event target', () => {
9393
},
9494
},
9595
],
96-
}));
96+
});
9797
});
9898

9999
test('specifying custom role for codebuild project target', () => {
@@ -111,15 +111,15 @@ describe('CodeBuild event target', () => {
111111
rule.addTarget(new targets.CodeBuildProject(project, { eventRole: role }));
112112

113113
// THEN
114-
expect(stack).to(haveResource('AWS::Events::Rule', {
114+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
115115
Targets: [
116116
{
117117
Arn: projectArn,
118118
Id: 'Target0',
119119
RoleArn: { 'Fn::GetAtt': ['MyRole', 'Arn'] },
120120
},
121121
],
122-
}));
122+
});
123123
});
124124

125125
test('specifying retry policy', () => {
@@ -142,7 +142,7 @@ describe('CodeBuild event target', () => {
142142
);
143143

144144
// THEN
145-
expect(stack).to(haveResource('AWS::Events::Rule', {
145+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
146146
ScheduleExpression: 'rate(1 hour)',
147147
State: 'ENABLED',
148148
Targets: [
@@ -167,7 +167,7 @@ describe('CodeBuild event target', () => {
167167
},
168168
},
169169
],
170-
}));
170+
});
171171
});
172172

173173
test('use a Dead Letter Queue for the rule target', () => {
@@ -191,7 +191,7 @@ describe('CodeBuild event target', () => {
191191
);
192192

193193
// THEN
194-
expect(stack).to(haveResource('AWS::Events::Rule', {
194+
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
195195
Targets: [
196196
{
197197
Arn: projectArn,
@@ -210,9 +210,9 @@ describe('CodeBuild event target', () => {
210210
},
211211
},
212212
],
213-
}));
213+
});
214214

215-
expect(stack).to(haveResource('AWS::SQS::QueuePolicy', {
215+
Template.fromStack(stack).hasResourceProperties('AWS::SQS::QueuePolicy', {
216216
PolicyDocument: {
217217
Statement: [
218218
{
@@ -247,6 +247,6 @@ describe('CodeBuild event target', () => {
247247
Ref: 'Queue4A7E3555',
248248
},
249249
],
250-
}));
250+
});
251251
});
252252
});

0 commit comments

Comments
 (0)