chore: migrate away from experimental assertions library (#57)

Should make the CDK v2 upgrade simpler.

Doc: https://github.com/aws/aws-cdk/blob/master/packages/@aws-cdk/assertions/MIGRATING.md

.projenrc.js

@@ -15,7 +15,6 @@ const project = new awscdk.AwsCdkConstructLibrary({
   cdkVersionPinning: true,
 
   cdkDependencies: ["monocdk"],
-  cdkTestDependencies: ["@monocdk-experiment/assert"],
 
   srcdir: "lib",
   testdir: "test",

test/common/alarm/AlarmFactory.test.ts

@@ -1,9 +1,5 @@
-import {
-  SynthUtils,
-  expect as cdkExpect,
-  haveResource,
-} from "@monocdk-experiment/assert";
 import { Construct, Duration, Stack } from "monocdk";
+import { Template } from "monocdk/assertions";
 import {
   ComparisonOperator,
   Metric,
@@ -118,43 +114,32 @@ test("addAlarm: verify actions enabled", () => {
     ...props,
     alarmNameSuffix: "DisabledByDefault",
   });
-  cdkExpect(stack).to(
-    haveResource("AWS::CloudWatch::Alarm", {
-      ActionsEnabled: true,
-      AlarmName: "DummyServiceAlarms-prefix-EnabledByFlag",
-    })
-  );
-  cdkExpect(stack).to(
-    haveResource("AWS::CloudWatch::Alarm", {
-      ActionsEnabled: false,
-      AlarmName: "DummyServiceAlarms-prefix-DisabledByFlag",
-    })
-  );
-  cdkExpect(stack).to(
-    haveResource("AWS::CloudWatch::Alarm", {
-      ActionsEnabled: true,
-      AlarmName: "DummyServiceAlarms-prefix-EnabledByDisambiguator-Critical",
-    })
-  );
-  cdkExpect(stack).to(
-    haveResource("AWS::CloudWatch::Alarm", {
-      ActionsEnabled: false,
-      AlarmName: "DummyServiceAlarms-prefix-DisabledByDisambiguator-Warning",
-    })
-  );
-  cdkExpect(stack).to(
-    haveResource("AWS::CloudWatch::Alarm", {
-      ActionsEnabled: false,
-      AlarmName:
-        "DummyServiceAlarms-prefix-DisabledByInvalidDisambiguator-Invalid",
-    })
-  );
-  cdkExpect(stack).to(
-    haveResource("AWS::CloudWatch::Alarm", {
-      ActionsEnabled: false,
-      AlarmName: "DummyServiceAlarms-prefix-DisabledByDefault",
-    })
-  );
+  const template = Template.fromStack(stack);
+  template.hasResourceProperties("AWS::CloudWatch::Alarm", {
+    ActionsEnabled: true,
+    AlarmName: "DummyServiceAlarms-prefix-EnabledByFlag",
+  });
+  template.hasResourceProperties("AWS::CloudWatch::Alarm", {
+    ActionsEnabled: false,
+    AlarmName: "DummyServiceAlarms-prefix-DisabledByFlag",
+  });
+  template.hasResourceProperties("AWS::CloudWatch::Alarm", {
+    ActionsEnabled: true,
+    AlarmName: "DummyServiceAlarms-prefix-EnabledByDisambiguator-Critical",
+  });
+  template.hasResourceProperties("AWS::CloudWatch::Alarm", {
+    ActionsEnabled: false,
+    AlarmName: "DummyServiceAlarms-prefix-DisabledByDisambiguator-Warning",
+  });
+  template.hasResourceProperties("AWS::CloudWatch::Alarm", {
+    ActionsEnabled: false,
+    AlarmName:
+      "DummyServiceAlarms-prefix-DisabledByInvalidDisambiguator-Invalid",
+  });
+  template.hasResourceProperties("AWS::CloudWatch::Alarm", {
+    ActionsEnabled: false,
+    AlarmName: "DummyServiceAlarms-prefix-DisabledByDefault",
+  });
 });
 
 test("addAlarm: description can be overridden", () => {
@@ -192,7 +177,7 @@ test("addAlarm: evaluateLowSampleCountPercentile can be overridden", () => {
     evaluateLowSampleCountPercentile: true,
     alarmNameSuffix: "TrueValue",
   });
-  expect(SynthUtils.toCloudFormation(stack)).toMatchSnapshot();
+  expect(Template.fromStack(stack)).toMatchSnapshot();
 });
 
 test("addAlarm: period override is propagated to alarm metric", () => {
@@ -278,5 +263,5 @@ test("addCompositeAlarm: snapshot for operator", () => {
     alarmNameSuffix: "CompositeOr",
     compositeOperator: CompositeAlarmOperator.OR,
   });
-  expect(SynthUtils.toCloudFormation(stack)).toMatchSnapshot();
+  expect(Template.fromStack(stack)).toMatchSnapshot();
 });

test/common/alarm/MultipleAlarmActionStrategy.test.ts

@@ -1,5 +1,5 @@
-import { SynthUtils } from "@monocdk-experiment/assert";
 import { Stack } from "monocdk";
+import { Template } from "monocdk/assertions";
 import { Alarm, Metric } from "monocdk/aws-cloudwatch";
 import { Topic } from "monocdk/aws-sns";
 
@@ -22,5 +22,5 @@ test("snapshot test: multiple actions", () => {
   );
   action.addAlarmActions({ alarm, action });
 
-  expect(SynthUtils.toCloudFormation(stack)).toMatchSnapshot();
+  expect(Template.fromStack(stack)).toMatchSnapshot();
 });

test/common/alarm/SnsAlarmActionStrategy.test.ts

@@ -1,5 +1,5 @@
-import { SynthUtils } from "@monocdk-experiment/assert";
 import { Stack } from "monocdk";
+import { Template } from "monocdk/assertions";
 import { Alarm, Metric } from "monocdk/aws-cloudwatch";
 import { Topic } from "monocdk/aws-sns";
 
@@ -16,7 +16,7 @@ test("snapshot test: default action only", () => {
   const action = new SnsAlarmActionStrategy({ onAlarmTopic });
   action.addAlarmActions({ alarm, action });
 
-  expect(SynthUtils.toCloudFormation(stack)).toMatchSnapshot();
+  expect(Template.fromStack(stack)).toMatchSnapshot();
 });
 
 test("snapshot test: all actions", () => {
@@ -39,5 +39,5 @@ test("snapshot test: all actions", () => {
   });
   action.addAlarmActions({ alarm, action });
 
-  expect(SynthUtils.toCloudFormation(stack)).toMatchSnapshot();
+  expect(Template.fromStack(stack)).toMatchSnapshot();
 });

test/common/alarm/actions.test.ts

@@ -1,6 +1,5 @@
-import { ABSENT, haveResource } from "@monocdk-experiment/assert";
-import { expect as cdkExpect } from "@monocdk-experiment/assert/lib/expect";
 import { Stack } from "monocdk";
+import { Match, Template } from "monocdk/assertions";
 import { ComparisonOperator, Metric } from "monocdk/aws-cloudwatch";
 import { Topic } from "monocdk/aws-sns";
 
@@ -60,28 +59,23 @@ test("test actions", () => {
     ],
   });
 
-  cdkExpect(stack).to(
-    haveResource("AWS::CloudWatch::Alarm", {
-      AlarmName: "Test-DummyAlarmName-AlarmForDummyMetric1-NoActionOverride",
-      AlarmActions: ABSENT,
-      OKActions: ABSENT,
-      InsufficientDataActions: ABSENT,
-    })
-  );
-  cdkExpect(stack).to(
-    haveResource("AWS::CloudWatch::Alarm", {
-      AlarmName: "Test-DummyAlarmName-AlarmForDummyMetric1-SimpleSnsAction",
-      AlarmActions: [{ Ref: "OnAlarmTopicF22649A2" }],
-      OKActions: ABSENT,
-      InsufficientDataActions: ABSENT,
-    })
-  );
-  cdkExpect(stack).to(
-    haveResource("AWS::CloudWatch::Alarm", {
-      AlarmName: "Test-DummyAlarmName-AlarmForDummyMetric1-ComplexSnsAction",
-      AlarmActions: [{ Ref: "OnAlarmTopicF22649A2" }],
-      OKActions: [{ Ref: "OnOkTopic5903F4A2" }],
-      InsufficientDataActions: [{ Ref: "OnNoDataTopic5F9CF206" }],
-    })
-  );
+  const template = Template.fromStack(stack);
+  template.hasResourceProperties("AWS::CloudWatch::Alarm", {
+    AlarmName: "Test-DummyAlarmName-AlarmForDummyMetric1-NoActionOverride",
+    AlarmActions: Match.absentProperty(),
+    OKActions: Match.absentProperty(),
+    InsufficientDataActions: Match.absentProperty(),
+  });
+  template.hasResourceProperties("AWS::CloudWatch::Alarm", {
+    AlarmName: "Test-DummyAlarmName-AlarmForDummyMetric1-SimpleSnsAction",
+    AlarmActions: [{ Ref: "OnAlarmTopicF22649A2" }],
+    OKActions: Match.absentProperty(),
+    InsufficientDataActions: Match.absentProperty(),
+  });
+  template.hasResourceProperties("AWS::CloudWatch::Alarm", {
+    AlarmName: "Test-DummyAlarmName-AlarmForDummyMetric1-ComplexSnsAction",
+    AlarmActions: [{ Ref: "OnAlarmTopicF22649A2" }],
+    OKActions: [{ Ref: "OnOkTopic5903F4A2" }],
+    InsufficientDataActions: [{ Ref: "OnNoDataTopic5F9CF206" }],
+  });
 });

test/dashboard/BitmapDashboard.test.ts

@@ -1,6 +1,5 @@
-import { haveResource } from "@monocdk-experiment/assert";
-import { expect as cdkExpect } from "@monocdk-experiment/assert/lib/expect";
 import { Stack } from "monocdk";
+import { Template } from "monocdk/assertions";
 import { Column, GraphWidget, Metric, Row } from "monocdk/aws-cloudwatch";
 
 import { BitmapDashboard } from "../../lib";
@@ -49,5 +48,5 @@ test("check the bitmap dashboard is generated with rows/columns", () => {
     )
   );
 
-  cdkExpect(stack).to(haveResource("AWS::CloudWatch::Dashboard"));
+  Template.fromStack(stack).resourceCountIs("AWS::CloudWatch::Dashboard", 1);
 });

test/dashboard/DashboardWithBitmapCopy.test.ts

@@ -1,6 +1,5 @@
-import { haveResource } from "@monocdk-experiment/assert";
-import { expect as cdkExpect } from "@monocdk-experiment/assert/lib/expect";
 import { Stack } from "monocdk";
+import { Template } from "monocdk/assertions";
 
 import { DashboardWithBitmapCopy } from "../../lib";
 
@@ -11,13 +10,11 @@ test("named dashboard has a bitmap copy", () => {
     dashboardName: "DummyDashboard",
   });
 
-  cdkExpect(stack).to(
-    haveResource("AWS::CloudWatch::Dashboard", {
-      DashboardName: "DummyDashboard",
-    }).and(
-      haveResource("AWS::CloudWatch::Dashboard", {
-        DashboardName: "Bitmap-DummyDashboard",
-      })
-    )
-  );
+  const template = Template.fromStack(stack);
+  template.hasResourceProperties("AWS::CloudWatch::Dashboard", {
+    DashboardName: "DummyDashboard",
+  });
+  template.hasResourceProperties("AWS::CloudWatch::Dashboard", {
+    DashboardName: "Bitmap-DummyDashboard",
+  });
 });

test/dashboard/DefaultDashboardFactory.test.ts

@@ -1,5 +1,5 @@
-import { SynthUtils } from "@monocdk-experiment/assert";
 import { Stack } from "monocdk";
+import { Template } from "monocdk/assertions";
 import { TextWidget } from "monocdk/aws-cloudwatch";
 
 import {
@@ -19,7 +19,7 @@ test("default dashboards created", () => {
     renderingPreference: DashboardRenderingPreference.INTERACTIVE_ONLY,
   });
 
-  expect(SynthUtils.toCloudFormation(stack)).toMatchSnapshot();
+  expect(Template.fromStack(stack)).toMatchSnapshot();
 });
 
 test("no dashboards created", () => {
@@ -39,5 +39,5 @@ test("no dashboards created", () => {
     ),
   });
 
-  expect(SynthUtils.toCloudFormation(stack)).toMatchSnapshot();
+  expect(Template.fromStack(stack)).toMatchSnapshot();
 });

test/dashboard/widget/BitmapWidget.test.ts

@@ -1,5 +1,5 @@
-import { SynthUtils } from "@monocdk-experiment/assert";
 import { Stack } from "monocdk";
+import { Template } from "monocdk/assertions";
 import { GraphWidget } from "monocdk/aws-cloudwatch";
 
 import { BitmapWidgetRenderingSupport } from "../../../lib";
@@ -9,7 +9,7 @@ test("support", () => {
 
   new BitmapWidgetRenderingSupport(stack, "Support");
 
-  expect(SynthUtils.toCloudFormation(stack)).toMatchSnapshot();
+  expect(Template.fromStack(stack)).toMatchSnapshot();
 });
 
 test("widget", () => {