Merge pull request #16 from stackitcloud/hs/test-improve-comparisons

Improve comparisons in tests
stackitcloud · Nov 22, 2023 · edd81a7 · edd81a7
2 parents 9506161 + 5c24ee8
commit edd81a7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/internal/cmd/postgresql/instance/create/create_test.go b/internal/cmd/postgresql/instance/create/create_test.go
@@ -26,12 +26,12 @@ type postgreSQLClientMocked struct {
 	getOfferingsResp *postgresql.OfferingList
 }
 
-func (c *postgreSQLClientMocked) CreateInstance(_ context.Context, _ string) postgresql.ApiCreateInstanceRequest {
-	return postgresql.ApiCreateInstanceRequest{}
+func (c *postgreSQLClientMocked) CreateInstance(ctx context.Context, projectId string) postgresql.ApiCreateInstanceRequest {
+	return testClient.CreateInstance(ctx, projectId)
 }
 
-func (c *postgreSQLClientMocked) UpdateInstance(_ context.Context, _, _ string) postgresql.ApiUpdateInstanceRequest {
-	return postgresql.ApiUpdateInstanceRequest{}
+func (c *postgreSQLClientMocked) UpdateInstance(ctx context.Context, projectId, instanceId string) postgresql.ApiUpdateInstanceRequest {
+	return testClient.UpdateInstance(ctx, projectId, instanceId)
 }
 
 func (c *postgreSQLClientMocked) GetOfferingsExecute(_ context.Context, _ string) (*postgresql.OfferingList, error) {
@@ -411,7 +411,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.IgnoreFields(postgresql.ApiCreateInstanceRequest{}, "apiService", "ctx", "projectId"),
+				cmpopts.EquateComparable(testCtx),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)

diff --git a/internal/cmd/postgresql/instance/update/update_test.go b/internal/cmd/postgresql/instance/update/update_test.go
@@ -26,12 +26,12 @@ type postgreSQLClientMocked struct {
 	getOfferingsResp *postgresql.OfferingList
 }
 
-func (c *postgreSQLClientMocked) CreateInstance(_ context.Context, _ string) postgresql.ApiCreateInstanceRequest {
-	return postgresql.ApiCreateInstanceRequest{}
+func (c *postgreSQLClientMocked) CreateInstance(ctx context.Context, projectId string) postgresql.ApiCreateInstanceRequest {
+	return testClient.CreateInstance(ctx, projectId)
 }
 
-func (c *postgreSQLClientMocked) UpdateInstance(_ context.Context, _, _ string) postgresql.ApiUpdateInstanceRequest {
-	return postgresql.ApiUpdateInstanceRequest{}
+func (c *postgreSQLClientMocked) UpdateInstance(ctx context.Context, projectId, instanceId string) postgresql.ApiUpdateInstanceRequest {
+	return testClient.UpdateInstance(ctx, projectId, instanceId)
 }
 
 func (c *postgreSQLClientMocked) GetOfferingsExecute(_ context.Context, _ string) (*postgresql.OfferingList, error) {
@@ -432,7 +432,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.IgnoreFields(postgresql.ApiUpdateInstanceRequest{}, "apiService", "ctx", "projectId", "instanceId"),
+				cmpopts.EquateComparable(testCtx),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)

diff --git a/internal/cmd/ske/cluster/create/create_test.go b/internal/cmd/ske/cluster/create/create_test.go
@@ -292,7 +292,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.IgnoreFields(ske.ApiCreateOrUpdateClusterRequest{}, "apiService", "ctx", "projectId"),
+				cmpopts.EquateComparable(testCtx),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)