Merge pull request #226 from alrayyes/feat/testifylint

test: enable testifylint
Leaseweb · Dec 18, 2024 · 0f97476 · 0f97476
2 parents b40c72b + 077559c
commit 0f97476
Show file tree

Hide file tree

Showing 10 changed files with 119 additions and 111 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -25,3 +25,4 @@ linters:
     - unparam
     - unused
     - govet
+    - testifylint
diff --git a/internal/provider/dedicatedserver/validators_test.go b/internal/provider/dedicatedserver/validators_test.go
@@ -20,7 +20,7 @@ func Test_greaterThanZeroValidator_ValidateString(t *testing.T) {
 		greaterThanZeroValidator := greaterThanZero()
 		greaterThanZeroValidator.ValidateString(context.TODO(), request, &response)
 
-		assert.Len(t, response.Diagnostics.Errors(), 0)
+		assert.Empty(t, response.Diagnostics.Errors())
 	})
 
 	t.Run("does not set errors if the float value is greater than 0", func(t *testing.T) {
@@ -33,7 +33,7 @@ func Test_greaterThanZeroValidator_ValidateString(t *testing.T) {
 		greaterThanZeroValidator := greaterThanZero()
 		greaterThanZeroValidator.ValidateString(context.TODO(), request, &response)
 
-		assert.Len(t, response.Diagnostics.Errors(), 0)
+		assert.Empty(t, response.Diagnostics.Errors())
 	})
 
 	t.Run("set errors if the value is 0", func(t *testing.T) {

diff --git a/internal/provider/publiccloud/image_resource_test.go b/internal/provider/publiccloud/image_resource_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/leaseweb/leaseweb-go-sdk/v3/publiccloud"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_adaptImageToImageResource(t *testing.T) {
@@ -74,7 +75,7 @@ func Test_adaptImageDetailsToImageResource(t *testing.T) {
 		sdkImageDetails,
 	)
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, want, *got)
 }
 

diff --git a/internal/provider/publiccloud/instance_resource_test.go b/internal/provider/publiccloud/instance_resource_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/leaseweb/leaseweb-go-sdk/v3/publiccloud"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_adaptContractToContractResource(t *testing.T) {
@@ -128,7 +129,7 @@ func Test_adaptInstanceDetailsToInstanceResource(t *testing.T) {
 
 	got, err := adaptInstanceDetailsToInstanceResource(instance, context.TODO())
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 
 	assert.Equal(t, "id", got.ID.ValueString())
 	assert.Equal(t, "region", got.Region.ValueString())
@@ -166,7 +167,7 @@ func Test_instanceResourceModel_getLaunchOpts(t *testing.T) {
 
 		got, err := instance.getLaunchOpts(context.TODO())
 
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, publiccloud.REGIONNAME_EU_WEST_3, got.Region)
 		assert.Equal(t, publiccloud.TYPENAME_M5A_4XLARGE, got.Type)
 		assert.Equal(t, publiccloud.STORAGETYPE_CENTRAL, got.RootDiskStorageType)
@@ -190,7 +191,7 @@ func Test_instanceResourceModel_getLaunchOpts(t *testing.T) {
 
 		got, err := instance.getLaunchOpts(context.TODO())
 
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, "marketAppId", *got.MarketAppId)
 		assert.Equal(t, "reference", *got.Reference)
 		assert.Equal(t, int32(55), *got.RootDiskSize)
@@ -204,8 +205,8 @@ func Test_instanceResourceModel_getLaunchOpts(t *testing.T) {
 
 			_, err := instance.getLaunchOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, "tralala")
+			require.Error(t, err)
+			require.ErrorContains(t, err, "tralala")
 		},
 	)
 
@@ -217,8 +218,8 @@ func Test_instanceResourceModel_getLaunchOpts(t *testing.T) {
 
 			_, err := instance.getLaunchOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, "tralala")
+			require.Error(t, err)
+			require.ErrorContains(t, err, "tralala")
 		},
 	)
 
@@ -232,8 +233,8 @@ func Test_instanceResourceModel_getLaunchOpts(t *testing.T) {
 
 			_, err := instance.getLaunchOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, "tralala")
+			require.Error(t, err)
+			require.ErrorContains(t, err, "tralala")
 		},
 	)
 
@@ -247,8 +248,8 @@ func Test_instanceResourceModel_getLaunchOpts(t *testing.T) {
 
 			_, err := instance.getLaunchOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, "555")
+			require.Error(t, err)
+			require.ErrorContains(t, err, "555")
 		},
 	)
 
@@ -262,8 +263,8 @@ func Test_instanceResourceModel_getLaunchOpts(t *testing.T) {
 
 			_, err := instance.getLaunchOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, "555")
+			require.Error(t, err)
+			require.ErrorContains(t, err, "555")
 		},
 	)
 
@@ -273,8 +274,8 @@ func Test_instanceResourceModel_getLaunchOpts(t *testing.T) {
 
 		_, err := instance.getLaunchOpts(context.TODO())
 
-		assert.Error(t, err)
-		assert.ErrorContains(t, err, "tralala")
+		require.Error(t, err)
+		require.ErrorContains(t, err, "tralala")
 	})
 
 	t.Run(
@@ -285,8 +286,8 @@ func Test_instanceResourceModel_getLaunchOpts(t *testing.T) {
 
 			_, err := instance.getLaunchOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, ".imageResourceModel")
+			require.Error(t, err)
+			require.ErrorContains(t, err, ".imageResourceModel")
 		},
 	)
 
@@ -298,8 +299,8 @@ func Test_instanceResourceModel_getLaunchOpts(t *testing.T) {
 
 			_, err := instance.getLaunchOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, ".contractResourceModel")
+			require.Error(t, err)
+			require.ErrorContains(t, err, ".contractResourceModel")
 		},
 	)
 }
@@ -310,7 +311,7 @@ func Test_instanceResourceModel_getUpdateOpts(t *testing.T) {
 
 		got, err := instance.getUpdateOpts(context.TODO())
 
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, publiccloud.TYPENAME_M5A_4XLARGE, *got.Type)
 		assert.Equal(t, publiccloud.CONTRACTTYPE_MONTHLY, *got.ContractType)
 		assert.Equal(t, publiccloud.CONTRACTTERM__3, *got.ContractTerm)
@@ -327,8 +328,8 @@ func Test_instanceResourceModel_getUpdateOpts(t *testing.T) {
 
 			_, err := instance.getUpdateOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, "tralala")
+			require.Error(t, err)
+			require.ErrorContains(t, err, "tralala")
 		},
 	)
 
@@ -342,8 +343,8 @@ func Test_instanceResourceModel_getUpdateOpts(t *testing.T) {
 
 			_, err := instance.getUpdateOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, "tralala")
+			require.Error(t, err)
+			require.ErrorContains(t, err, "tralala")
 		},
 	)
 
@@ -357,8 +358,8 @@ func Test_instanceResourceModel_getUpdateOpts(t *testing.T) {
 
 			_, err := instance.getUpdateOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, "555")
+			require.Error(t, err)
+			require.ErrorContains(t, err, "555")
 		},
 	)
 
@@ -372,8 +373,8 @@ func Test_instanceResourceModel_getUpdateOpts(t *testing.T) {
 
 			_, err := instance.getUpdateOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, "555")
+			require.Error(t, err)
+			require.ErrorContains(t, err, "555")
 		},
 	)
 
@@ -385,8 +386,8 @@ func Test_instanceResourceModel_getUpdateOpts(t *testing.T) {
 
 			_, err := instance.getUpdateOpts(context.TODO())
 
-			assert.Error(t, err)
-			assert.ErrorContains(t, err, ".contractResourceModel")
+			require.Error(t, err)
+			require.ErrorContains(t, err, ".contractResourceModel")
 		},
 	)
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,3 +25,4 @@ linters: @@
         - unparam
         - unused
         - govet
+        - testifylint