Refactoring VolumeId Tests to use gomock; Adding additional tests to …

…assert the calls to functions (#32) * The EC2 Volume tests have been refactored to use `gomock` instead of the home grown mock objects.
HBOCodeLabs · Mar 11, 2022 · dd23474 · dd23474
1 parent 943de4b
commit dd23474
Showing 1 changed file with 47 additions and 16 deletions.
diff --git a/pkg/aws/ec2_test.go b/pkg/aws/ec2_test.go
@@ -734,6 +734,7 @@ func TestGetEC2SecurityGroupByNameE(t *testing.T) {
 
 func TestAssertEC2VolumeType_MatchWithGP2MultipleDevices(t *testing.T) {
 	// Setup
+	t.Parallel()
 	instanceID := "i546acas321sd"
 	volumeId := "v123dfasd92"
 	deviceName := "/dev/sdc"
@@ -777,11 +778,18 @@ func TestAssertEC2VolumeType_MatchWithGP2MultipleDevices(t *testing.T) {
 			},
 		},
 	}
-	clientMock := &EC2ClientMock{
-		DescribeInstancesOutput: instanceOutput,
-		DescribeVolumesOutput:   volumeOutput,
+	ctrl := gomock.NewController(t)
+	clientMock := mock.NewMockEC2Client(ctrl)
+	DescribeInstancesInput := &ec2.DescribeInstancesInput{
+		InstanceIds: []string{instanceID},
+	}
+	expectedInput := &ec2.DescribeVolumesInput{
+		VolumeIds: []string{volumeId},
 	}
+	ctx := context.Background()
 	fakeTest := &testing.T{}
+	clientMock.EXPECT().DescribeInstances(ctx, DescribeInstancesInput).Times(1).Return(instanceOutput, nil)
+	clientMock.EXPECT().DescribeVolumes(ctx, expectedInput).Times(1).Return(volumeOutput, nil)
 
 	// Execute
 	AssertEC2VolumeType(fakeTest, context.Background(), clientMock, AssertVolumeAttributesInput{
@@ -798,6 +806,7 @@ func TestAssertEC2VolumeType_MatchWithGP2MultipleDevices(t *testing.T) {
 
 func TestAssertEC2VolumeType_MatchWithGP3MultipleDevices(t *testing.T) {
 	// Setup
+	t.Parallel()
 	instanceID := "i546acas321sd"
 	volumeId := "v123dfasd92"
 	deviceName := "/dev/sdc"
@@ -841,14 +850,21 @@ func TestAssertEC2VolumeType_MatchWithGP3MultipleDevices(t *testing.T) {
 			},
 		},
 	}
-	clientMock := &EC2ClientMock{
-		DescribeInstancesOutput: instanceOutput,
-		DescribeVolumesOutput:   volumeOutput,
+	ctrl := gomock.NewController(t)
+	clientMock := mock.NewMockEC2Client(ctrl)
+	DescribeInstancesInput := &ec2.DescribeInstancesInput{
+		InstanceIds: []string{instanceID},
 	}
+	expectedInput := &ec2.DescribeVolumesInput{
+		VolumeIds: []string{volumeId},
+	}
+	ctx := context.Background()
 	fakeTest := &testing.T{}
+	clientMock.EXPECT().DescribeInstances(ctx, DescribeInstancesInput).Times(1).Return(instanceOutput, nil)
+	clientMock.EXPECT().DescribeVolumes(ctx, expectedInput).Times(1).Return(volumeOutput, nil)
 
 	// Execute
-	AssertEC2VolumeType(fakeTest, context.Background(), clientMock, AssertVolumeAttributesInput{
+	AssertEC2VolumeType(fakeTest, ctx, clientMock, AssertVolumeAttributesInput{
 		DeviceID:         deviceName,
 		InstanceID:       instanceID,
 		VolumeType:       "gp3",
@@ -862,6 +878,7 @@ func TestAssertEC2VolumeType_MatchWithGP3MultipleDevices(t *testing.T) {
 
 func TestAssertEC2VolumeType_MatchWithThroughputMultipleDevices(t *testing.T) {
 	// Setup
+	t.Parallel()
 	instanceID := "i546acas321sd"
 	volumeId := "v123dfasd92"
 	deviceName := "/dev/sdc"
@@ -907,14 +924,21 @@ func TestAssertEC2VolumeType_MatchWithThroughputMultipleDevices(t *testing.T) {
 			},
 		},
 	}
-	clientMock := &EC2ClientMock{
-		DescribeInstancesOutput: instanceOutput,
-		DescribeVolumesOutput:   volumeOutput,
+	ctrl := gomock.NewController(t)
+	clientMock := mock.NewMockEC2Client(ctrl)
+	DescribeInstancesInput := &ec2.DescribeInstancesInput{
+		InstanceIds: []string{instanceID},
+	}
+	expectedInput := &ec2.DescribeVolumesInput{
+		VolumeIds: []string{volumeId},
 	}
+	ctx := context.Background()
 	fakeTest := &testing.T{}
+	clientMock.EXPECT().DescribeInstances(ctx, DescribeInstancesInput).Times(1).Return(instanceOutput, nil)
+	clientMock.EXPECT().DescribeVolumes(ctx, expectedInput).Times(1).Return(volumeOutput, nil)
 
 	// Execute
-	AssertEC2VolumeThroughput(fakeTest, context.Background(), clientMock, AssertVolumeAttributesInput{
+	AssertEC2VolumeThroughput(fakeTest, ctx, clientMock, AssertVolumeAttributesInput{
 		DeviceID:         deviceName,
 		InstanceID:       instanceID,
 		VolumeType:       "gp3",
@@ -928,6 +952,7 @@ func TestAssertEC2VolumeType_MatchWithThroughputMultipleDevices(t *testing.T) {
 
 func TestAssertEC2VolumeType_MatchWithIOPSMultipleDevices(t *testing.T) {
 	// Setup
+	t.Parallel()
 	instanceID := "i546acas321sd"
 	volumeId := "v123dfasd92"
 	deviceName := "/dev/sdc"
@@ -973,14 +998,20 @@ func TestAssertEC2VolumeType_MatchWithIOPSMultipleDevices(t *testing.T) {
 			},
 		},
 	}
-	clientMock := &EC2ClientMock{
-		DescribeInstancesOutput: instanceOutput,
-		DescribeVolumesOutput:   volumeOutput,
+	ctrl := gomock.NewController(t)
+	clientMock := mock.NewMockEC2Client(ctrl)
+	DescribeInstancesInput := &ec2.DescribeInstancesInput{
+		InstanceIds: []string{instanceID},
 	}
+	expectedInput := &ec2.DescribeVolumesInput{
+		VolumeIds: []string{volumeId},
+	}
+	ctx := context.Background()
 	fakeTest := &testing.T{}
-
+	clientMock.EXPECT().DescribeInstances(ctx, DescribeInstancesInput).Times(1).Return(instanceOutput, nil)
+	clientMock.EXPECT().DescribeVolumes(ctx, expectedInput).Times(1).Return(volumeOutput, nil)
 	// Execute
-	AssertEC2VolumeIOPS(fakeTest, context.Background(), clientMock, AssertVolumeAttributesInput{
+	AssertEC2VolumeIOPS(fakeTest, ctx, clientMock, AssertVolumeAttributesInput{
 		DeviceID:         deviceName,
 		InstanceID:       instanceID,
 		VolumeType:       "gp3",