Replace incorrect property checks in tests

awslabs · Oct 4, 2023 · 69d748b · 69d748b
1 parent 1a15512
commit 69d748b
Show file tree

Hide file tree

Showing 41 changed files with 208 additions and 208 deletions.
diff --git a/...tterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/apigateway-dynamodb.test.ts b/...tterns/@aws-solutions-constructs/aws-apigateway-dynamodb/test/apigateway-dynamodb.test.ts
@@ -23,11 +23,11 @@ test("check properties", () => {
   const apiGatewayToDynamoDBProps: ApiGatewayToDynamoDBProps = {};
   const construct = new ApiGatewayToDynamoDB( stack, "test-api-gateway-dynamodb-default", apiGatewayToDynamoDBProps);
 
-  expect(construct.dynamoTable !== null);
-  expect(construct.apiGateway !== null);
-  expect(construct.apiGatewayRole !== null);
-  expect(construct.apiGatewayCloudWatchRole !== null);
-  expect(construct.apiGatewayLogGroup !== null);
+  expect(construct.dynamoTable).toBeDefined();
+  expect(construct.apiGateway).toBeDefined();
+  expect(construct.apiGatewayRole).toBeDefined();
+  expect(construct.apiGatewayCloudWatchRole).toBeDefined();
+  expect(construct.apiGatewayLogGroup).toBeDefined();
 });
 
 test("check allow CRUD operations", () => {

diff --git a/...solutions-constructs/aws-apigateway-kinesisstreams/test/apigateway-kinesisstreams.test.ts b/...solutions-constructs/aws-apigateway-kinesisstreams/test/apigateway-kinesisstreams.test.ts
@@ -21,12 +21,12 @@ test('Test construct properties', () => {
   const stack = new Stack();
   const pattern = new ApiGatewayToKinesisStreams(stack, 'api-gateway-kinesis', {});
 
-  expect(pattern.apiGateway !== null);
-  expect(pattern.apiGatewayRole !== null);
-  expect(pattern.apiGatewayCloudWatchRole !== null);
-  expect(pattern.apiGatewayLogGroup !== null);
-  expect(pattern.kinesisStream !== null);
-  expect(pattern.cloudwatchAlarms !== null);
+  expect(pattern.apiGateway).toBeDefined();
+  expect(pattern.apiGatewayRole).toBeDefined();
+  expect(pattern.apiGatewayCloudWatchRole).toBeDefined();
+  expect(pattern.apiGatewayLogGroup).toBeDefined();
+  expect(pattern.kinesisStream).toBeDefined();
+  expect(pattern.cloudwatchAlarms).toBeDefined();
 });
 
 test('Test deployment w/ overwritten properties', () => {

diff --git a/...terns/@aws-solutions-constructs/aws-apigateway-lambda/test/test.apigateway-lambda.test.ts b/...terns/@aws-solutions-constructs/aws-apigateway-lambda/test/test.apigateway-lambda.test.ts
@@ -72,11 +72,11 @@ test('Test properties', () => {
   };
   const app = new ApiGatewayToLambda(stack, 'test-apigateway-lambda', props);
   // Assertion 1
-  expect(app.lambdaFunction !== null);
+  expect(app.lambdaFunction).toBeDefined();
   // Assertion 2
-  expect(app.apiGateway !== null);
-  expect(app.apiGatewayCloudWatchRole !== null);
-  expect(app.apiGatewayLogGroup !== null);
+  expect(app.apiGateway).toBeDefined();
+  expect(app.apiGatewayCloudWatchRole).toBeDefined();
+  expect(app.apiGatewayLogGroup).toBeDefined();
 });
 
 test('Error on lambdaFunctionProps=undefined', () => {

diff --git a/...ons-constructs/aws-apigateway-sagemakerendpoint/test/apigateway-sagemakerendpoint.test.ts b/...ons-constructs/aws-apigateway-sagemakerendpoint/test/apigateway-sagemakerendpoint.test.ts
@@ -25,10 +25,10 @@ test('Test construct properties', () => {
     requestMappingTemplate: 'my-request-vtl-template'
   });
 
-  expect(pattern.apiGateway !== null);
-  expect(pattern.apiGatewayRole !== null);
-  expect(pattern.apiGatewayCloudWatchRole !== null);
-  expect(pattern.apiGatewayLogGroup !== null);
+  expect(pattern.apiGateway).toBeDefined();
+  expect(pattern.apiGatewayRole).toBeDefined();
+  expect(pattern.apiGatewayCloudWatchRole).toBeDefined();
+  expect(pattern.apiGatewayLogGroup).toBeDefined();
 });
 
 test('Test deployment w/ overwritten properties', () => {

diff --git a/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/apigateway-sqs.test.ts b/source/patterns/@aws-solutions-constructs/aws-apigateway-sqs/test/apigateway-sqs.test.ts
@@ -70,14 +70,14 @@ test('Test properties', () => {
     maxReceiveCount: 3
   });
     // Assertion 1
-  expect(pattern.apiGateway !== null);
+  expect(pattern.apiGateway).toBeDefined();
   // Assertion 2
-  expect(pattern.sqsQueue !== null);
+  expect(pattern.sqsQueue).toBeDefined();
   // Assertion 3
-  expect(pattern.apiGatewayRole !== null);
-  expect(pattern.apiGatewayCloudWatchRole !== null);
-  expect(pattern.apiGatewayLogGroup !== null);
-  expect(pattern.deadLetterQueue !== null);
+  expect(pattern.apiGatewayRole).toBeDefined();
+  expect(pattern.apiGatewayCloudWatchRole).toBeDefined();
+  expect(pattern.apiGatewayLogGroup).toBeDefined();
+  expect(pattern.deadLetterQueue).toBeDefined();
 });
 
 test('Test deployment ApiGateway AuthorizationType override', () => {

diff --git a/...onstructs/aws-cloudfront-apigateway-lambda/test/test.cloudfront-apigateway-lambda.test.ts b/...onstructs/aws-cloudfront-apigateway-lambda/test/test.cloudfront-apigateway-lambda.test.ts
@@ -47,13 +47,13 @@ test('check properties', () => {
 
   const construct: CloudFrontToApiGatewayToLambda = deployNewFunc(stack);
 
-  expect(construct.cloudFrontWebDistribution !== null);
-  expect(construct.apiGateway !== null);
-  expect(construct.lambdaFunction !== null);
-  expect(construct.cloudFrontFunction !== null);
-  expect(construct.cloudFrontLoggingBucket !== null);
-  expect(construct.apiGatewayCloudWatchRole !== null);
-  expect(construct.apiGatewayLogGroup !== null);
+  expect(construct.cloudFrontWebDistribution).toBeDefined();
+  expect(construct.apiGateway).toBeDefined();
+  expect(construct.lambdaFunction).toBeDefined();
+  expect(construct.cloudFrontFunction).toBeDefined();
+  expect(construct.cloudFrontLoggingBucket).toBeDefined();
+  expect(construct.apiGatewayCloudWatchRole).toBeDefined();
+  expect(construct.apiGatewayLogGroup).toBeDefined();
 });
 
 test('check lambda function properties for deploy: true', () => {

diff --git a/...ws-solutions-constructs/aws-cloudfront-apigateway/test/test.cloudfront-apigateway.test.ts b/...ws-solutions-constructs/aws-cloudfront-apigateway/test/test.cloudfront-apigateway.test.ts
@@ -40,10 +40,10 @@ test('check getter methods', () => {
 
   const construct: CloudFrontToApiGateway = deploy(stack);
 
-  expect(construct.cloudFrontWebDistribution !== null);
-  expect(construct.apiGateway !== null);
-  expect(construct.cloudFrontFunction !== null);
-  expect(construct.cloudFrontLoggingBucket !== null);
+  expect(construct.cloudFrontWebDistribution).toBeDefined();
+  expect(construct.apiGateway).toBeDefined();
+  expect(construct.cloudFrontFunction).toBeDefined();
+  expect(construct.cloudFrontLoggingBucket).toBeDefined();
 });
 
 test('test cloudfront DomainName', () => {

diff --git a/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/test.cloudfront-s3.test.ts b/source/patterns/@aws-solutions-constructs/aws-cloudfront-s3/test/test.cloudfront-s3.test.ts
@@ -143,8 +143,8 @@ test('check properties', () => {
 
   const construct: CloudFrontToS3 = deploy(stack);
 
-  expect(construct.cloudFrontWebDistribution !== null);
-  expect(construct.s3Bucket !== null);
+  expect(construct.cloudFrontWebDistribution).toBeDefined();
+  expect(construct.s3Bucket).toBeDefined();
 });
 
 test("Confirm CheckS3Props is called", () => {
@@ -173,7 +173,7 @@ test("Test existingBucketObj", () => {
     existingBucketObj: s3.Bucket.fromBucketName(stack, 'mybucket', 'mybucket')
   });
   // Assertion
-  expect(construct.cloudFrontWebDistribution !== null);
+  expect(construct.cloudFrontWebDistribution).toBeDefined();
   const template = Template.fromStack(stack);
   template.hasResourceProperties("AWS::CloudFront::Distribution", {
     DistributionConfig: {

diff --git a/...ions-constructs/aws-cognito-apigateway-lambda/test/test.cognito-apigateway-lambda.test.ts b/...ions-constructs/aws-cognito-apigateway-lambda/test/test.cognito-apigateway-lambda.test.ts
@@ -89,13 +89,13 @@ test('check properties', () => {
 
   const construct: CognitoToApiGatewayToLambda = deployNewFunc(stack);
 
-  expect(construct.userPool !== null);
-  expect(construct.userPoolClient !== null);
-  expect(construct.apiGateway !== null);
-  expect(construct.lambdaFunction !== null);
-  expect(construct.apiGatewayCloudWatchRole !== null);
-  expect(construct.apiGatewayLogGroup !== null);
-  expect(construct.apiGatewayAuthorizer !== null);
+  expect(construct.userPool).toBeDefined();
+  expect(construct.userPoolClient).toBeDefined();
+  expect(construct.apiGateway).toBeDefined();
+  expect(construct.lambdaFunction).toBeDefined();
+  expect(construct.apiGatewayCloudWatchRole).toBeDefined();
+  expect(construct.apiGatewayLogGroup).toBeDefined();
+  expect(construct.apiGatewayAuthorizer).toBeDefined();
 });
 
 test('override cognito cognitoUserPoolClientProps', () => {

diff --git a/...eams-lambda-elasticsearch-kibana/test/dynamodbstreams-lambda-elasticsearch-kibana.test.ts b/...eams-lambda-elasticsearch-kibana/test/dynamodbstreams-lambda-elasticsearch-kibana.test.ts
@@ -58,14 +58,14 @@ test('check properties', () => {
 
   const construct: DynamoDBStreamsToLambdaToElasticSearchAndKibana = deployNewFunc(stack);
 
-  expect(construct.lambdaFunction !== null);
-  expect(construct.dynamoTable !== null);
-  expect(construct.elasticsearchDomain !== null);
-  expect(construct.elasticsearchRole !== null);
-  expect(construct.identityPool !== null);
-  expect(construct.userPool !== null);
-  expect(construct.userPoolClient !== null);
-  expect(construct.cloudwatchAlarms !== null);
+  expect(construct.lambdaFunction).toBeDefined();
+  expect(construct.dynamoTable).toBeDefined();
+  expect(construct.elasticsearchDomain).toBeDefined();
+  expect(construct.elasticsearchRole).toBeDefined();
+  expect(construct.identityPool).toBeDefined();
+  expect(construct.userPool).toBeDefined();
+  expect(construct.userPoolClient).toBeDefined();
+  expect(construct.cloudwatchAlarms).toBeDefined();
 });
 
 test('check exception for Missing existingObj from props for deploy = false', () => {

diff --git a/...constructs/aws-eventbridge-kinesisfirehose-s3/test/eventbridge-kinesisfirehose-s3.test.ts b/...constructs/aws-eventbridge-kinesisfirehose-s3/test/eventbridge-kinesisfirehose-s3.test.ts
@@ -33,13 +33,13 @@ test('Test properties', () => {
   const construct: EventbridgeToKinesisFirehoseToS3 = deployNewStack(stack);
 
   // Assertions
-  expect(construct.eventsRule !== null);
-  expect(construct.eventsRole !== null);
-  expect(construct.kinesisFirehose !== null);
-  expect(construct.kinesisFirehoseRole !== null);
-  expect(construct.kinesisFirehoseLogGroup !== null);
-  expect(construct.s3Bucket !== null);
-  expect(construct.s3LoggingBucket !== null);
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.eventsRole).toBeDefined();
+  expect(construct.kinesisFirehose).toBeDefined();
+  expect(construct.kinesisFirehoseRole).toBeDefined();
+  expect(construct.kinesisFirehoseLogGroup).toBeDefined();
+  expect(construct.s3Bucket).toBeDefined();
+  expect(construct.s3LoggingBucket).toBeDefined();
 });
 
 test('Test default server side s3 bucket encryption', () => {
@@ -144,14 +144,14 @@ test('check eventbus property, snapshot & eventbus exists', () => {
   };
   const construct = new EventbridgeToKinesisFirehoseToS3(stack, 'test-eventbridge-kinesis-firehose-default-parameters', props);
 
-  expect(construct.eventsRule !== null);
-  expect(construct.eventsRole !== null);
-  expect(construct.kinesisFirehose !== null);
-  expect(construct.kinesisFirehoseRole !== null);
-  expect(construct.kinesisFirehoseLogGroup !== null);
-  expect(construct.s3Bucket !== null);
-  expect(construct.s3LoggingBucket !== null);
-  expect(construct.eventBus !== null);
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.eventsRole).toBeDefined();
+  expect(construct.kinesisFirehose).toBeDefined();
+  expect(construct.kinesisFirehoseRole).toBeDefined();
+  expect(construct.kinesisFirehoseLogGroup).toBeDefined();
+  expect(construct.s3Bucket).toBeDefined();
+  expect(construct.s3LoggingBucket).toBeDefined();
+  expect(construct.eventBus).toBeDefined();
   // Check whether eventbus exists
   const template = Template.fromStack(stack);
   template.resourceCountIs('AWS::Events::EventBus', 1);

diff --git a/...lutions-constructs/aws-eventbridge-kinesisstreams/test/eventbridge-kinesisstreams.test.ts b/...lutions-constructs/aws-eventbridge-kinesisstreams/test/eventbridge-kinesisstreams.test.ts
@@ -32,9 +32,9 @@ test('Test properties', () => {
   const construct: EventbridgeToKinesisStreams = deployNewStack(stack);
 
   // Assertions
-  expect(construct.eventsRule !== null);
-  expect(construct.kinesisStream !== null);
-  expect(construct.eventsRole !== null);
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.kinesisStream).toBeDefined();
+  expect(construct.eventsRole).toBeDefined();
 });
 
 test('Test default AWS managed encryption key property', () => {
@@ -91,10 +91,10 @@ test('check eventbus property, snapshot & eventbus exists', () => {
   };
   const construct = new EventbridgeToKinesisStreams(stack, 'test-eventbridge-kinesis-streams-default-parameters', props);
 
-  expect(construct.eventsRule !== null);
-  expect(construct.kinesisStream !== null);
-  expect(construct.eventsRole !== null);
-  expect(construct.eventBus !== null);
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.kinesisStream).toBeDefined();
+  expect(construct.eventsRole).toBeDefined();
+  expect(construct.eventBus).toBeDefined();
   // Check whether eventbus exists
   const template = Template.fromStack(stack);
   template.resourceCountIs('AWS::Events::EventBus', 1);

diff --git a/...patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/eventbridge-lambda.test.ts b/...patterns/@aws-solutions-constructs/aws-eventbridge-lambda/test/eventbridge-lambda.test.ts
@@ -184,8 +184,8 @@ test('check properties', () => {
 
   const construct: EventbridgeToLambda = deployNewFunc(stack);
 
-  expect(construct.eventsRule !== null);
-  expect(construct.lambdaFunction !== null);
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.lambdaFunction).toBeDefined();
 });
 
 test('check exception for Missing existingObj from props', () => {
@@ -209,9 +209,9 @@ test('check eventbus property, snapshot & eventbus exists', () => {
 
   const construct: EventbridgeToLambda = deployNewEventBus(stack);
 
-  expect(construct.eventsRule !== null);
-  expect(construct.lambdaFunction !== null);
-  expect(construct.eventBus !== null);
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.lambdaFunction).toBeDefined();
+  expect(construct.eventBus).toBeDefined();
   // Check whether eventbus exists
   const template = Template.fromStack(stack);
   template.resourceCountIs('AWS::Events::EventBus', 1);

diff --git a/...patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/eventbridge-sns-topic.test.ts b/...patterns/@aws-solutions-constructs/aws-eventbridge-sns/test/eventbridge-sns-topic.test.ts
@@ -169,9 +169,9 @@ test('check properties', () => {
   const stack = new cdk.Stack();
   const construct: EventbridgeToSns = deployNewStack(stack);
 
-  expect(construct.eventsRule !== null);
-  expect(construct.snsTopic !== null);
-  expect(construct.encryptionKey !== null);
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.snsTopic).toBeDefined();
+  expect(construct.encryptionKey).toBeDefined();
 });
 
 test('check the sns topic properties', () => {
@@ -224,10 +224,10 @@ test('check eventbus property, snapshot & eventbus exists', () => {
 
   const construct: EventbridgeToSns = deployStackWithNewEventBus(stack);
 
-  expect(construct.eventsRule !== null);
-  expect(construct.snsTopic !== null);
-  expect(construct.encryptionKey !== null);
-  expect(construct.eventBus !== null);
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.snsTopic).toBeDefined();
+  expect(construct.encryptionKey).toBeDefined();
+  expect(construct.eventBus).toBeDefined();
 
   // Check whether eventbus exists
   const template = Template.fromStack(stack);

diff --git a/...patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/eventbridge-sqs-queue.test.ts b/...patterns/@aws-solutions-constructs/aws-eventbridge-sqs/test/eventbridge-sqs-queue.test.ts
@@ -278,21 +278,21 @@ test('check properties', () => {
   const stack = new cdk.Stack();
   const construct: EventbridgeToSqs = deployNewStack(stack);
 
-  expect(construct.eventsRule !== null);
-  expect(construct.sqsQueue !== null);
-  expect(construct.encryptionKey !== null);
-  expect(construct.deadLetterQueue !== null);
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.sqsQueue).toBeDefined();
+  expect(construct.encryptionKey).toBeDefined();
+  expect(construct.deadLetterQueue).toBeDefined();
 });
 
 test('check eventbus property, snapshot & eventbus exists', () => {
   const stack = new cdk.Stack();
   const construct: EventbridgeToSqs = deployStackWithNewEventBus(stack);
 
-  expect(construct.eventsRule !== null);
-  expect(construct.sqsQueue !== null);
-  expect(construct.encryptionKey !== null);
-  expect(construct.deadLetterQueue !== null);
-  expect(construct.eventBus !== null);
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.sqsQueue).toBeDefined();
+  expect(construct.encryptionKey).toBeDefined();
+  expect(construct.deadLetterQueue).toBeDefined();
+  expect(construct.eventBus).toBeDefined();
 
   // Check whether eventbus exists
   const template = Template.fromStack(stack);

diff --git a/...solutions-constructs/aws-eventbridge-stepfunctions/test/eventbridge-stepfunctions.test.ts b/...solutions-constructs/aws-eventbridge-stepfunctions/test/eventbridge-stepfunctions.test.ts
@@ -106,10 +106,10 @@ test('check properties', () => {
 
   const construct: EventbridgeToStepfunctions = deployNewStateMachine(stack);
 
-  expect(construct.cloudwatchAlarms !== null);
-  expect(construct.stateMachine !== null);
-  expect(construct.eventsRule !== null);
-  expect(construct.stateMachineLogGroup !== null);
+  expect(construct.cloudwatchAlarms).toBeDefined();
+  expect(construct.stateMachine).toBeDefined();
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.stateMachineLogGroup).toBeDefined();
 });
 
 test('check properties with no CW Alarms', () => {
@@ -128,22 +128,22 @@ test('check properties with no CW Alarms', () => {
 
   const construct: EventbridgeToStepfunctions =  new EventbridgeToStepfunctions(stack, 'test-eventbridge-stepfunctions', props);
 
-  expect(construct.cloudwatchAlarms === null);
-  expect(construct.stateMachine !== null);
-  expect(construct.eventsRule !== null);
-  expect(construct.stateMachineLogGroup !== null);
+  expect(construct.cloudwatchAlarms).not.toBeDefined();
+  expect(construct.stateMachine).toBeDefined();
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.stateMachineLogGroup).toBeDefined();
 });
 
 test('check eventbus property, snapshot & eventbus exists', () => {
   const stack = new cdk.Stack();
 
   const construct: EventbridgeToStepfunctions = deployNewStateMachineAndEventBus(stack);
 
-  expect(construct.cloudwatchAlarms !== null);
-  expect(construct.stateMachine !== null);
-  expect(construct.eventsRule !== null);
-  expect(construct.stateMachineLogGroup !== null);
-  expect(construct.eventBus !== null);
+  expect(construct.cloudwatchAlarms).toBeDefined();
+  expect(construct.stateMachine).toBeDefined();
+  expect(construct.eventsRule).toBeDefined();
+  expect(construct.stateMachineLogGroup).toBeDefined();
+  expect(construct.eventBus).toBeDefined();
 
   // Check whether eventbus exists
   const template = Template.fromStack(stack);