From a783bec3eea98546233ae6dee44e012cc08b9020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Cie=C5=9Blak?= Date: Mon, 23 Sep 2024 14:26:20 +0200 Subject: [PATCH] Changes after review --- .../assert/objectassert/task_snowflake_ext.go | 19 ++++++++++++------- pkg/sdk/testint/tasks_gen_integration_test.go | 4 ++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pkg/acceptance/bettertestspoc/assert/objectassert/task_snowflake_ext.go b/pkg/acceptance/bettertestspoc/assert/objectassert/task_snowflake_ext.go index de8b6d1974..40f5894ba3 100644 --- a/pkg/acceptance/bettertestspoc/assert/objectassert/task_snowflake_ext.go +++ b/pkg/acceptance/bettertestspoc/assert/objectassert/task_snowflake_ext.go @@ -54,16 +54,21 @@ func (t *TaskAssert) HasPredecessors(ids ...sdk.SchemaObjectIdentifier) *TaskAss func (t *TaskAssert) HasTaskRelations(expected sdk.TaskRelations) *TaskAssert { t.AddAssertion(func(t *testing.T, o *sdk.Task) error { t.Helper() - if slices.EqualFunc(o.TaskRelations.Predecessors, expected.Predecessors, func(id sdk.SchemaObjectIdentifier, id2 sdk.SchemaObjectIdentifier) bool { - return id.FullyQualifiedName() == id2.FullyQualifiedName() - }) { - return fmt.Errorf("expected task predecessors: %v; got: %v", expected.Predecessors, o.TaskRelations.Predecessors) + if len(o.TaskRelations.Predecessors) != len(expected.Predecessors) { + return fmt.Errorf("expected %d (%v) predecessors in task relations, got %d (%v)", len(expected.Predecessors), expected.Predecessors, len(o.TaskRelations.Predecessors), o.TaskRelations.Predecessors) + } + var errs []error + for _, id := range expected.Predecessors { + if !slices.ContainsFunc(o.TaskRelations.Predecessors, func(predecessorId sdk.SchemaObjectIdentifier) bool { + return predecessorId.FullyQualifiedName() == id.FullyQualifiedName() + }) { + errs = append(errs, fmt.Errorf("expected id: %s, to be in the list of predecessors in task relations: %v", id.FullyQualifiedName(), o.TaskRelations.Predecessors)) + } } - if !reflect.DeepEqual(expected.FinalizerTask, o.TaskRelations.FinalizerTask) { - return fmt.Errorf("expected finalizer task: %v; got: %v", expected.FinalizerTask, o.TaskRelations.FinalizerTask) + errs = append(errs, fmt.Errorf("expected finalizer task: %v; got: %v", expected.FinalizerTask, o.TaskRelations.FinalizerTask)) } - return nil + return errors.Join(errs...) }) return t } diff --git a/pkg/sdk/testint/tasks_gen_integration_test.go b/pkg/sdk/testint/tasks_gen_integration_test.go index 86dae169ff..e0ebd13e15 100644 --- a/pkg/sdk/testint/tasks_gen_integration_test.go +++ b/pkg/sdk/testint/tasks_gen_integration_test.go @@ -696,7 +696,7 @@ func TestInt_Tasks(t *testing.T) { returnedTasks, err := client.Tasks.Show(ctx, sdk.NewShowTaskRequest().WithIn(sdk.In{Schema: testClientHelper().Ids.SchemaId()})) require.NoError(t, err) - require.Len(t, returnedTasks, 2) + require.GreaterOrEqual(t, returnedTasks, 2) assert.Contains(t, returnedTasks, *task1) assert.Contains(t, returnedTasks, *task2) }) @@ -709,7 +709,7 @@ func TestInt_Tasks(t *testing.T) { returnedTasks, err := client.Tasks.Show(ctx, sdk.NewShowTaskRequest().WithIn(sdk.In{Schema: testClientHelper().Ids.SchemaId()}).WithTerse(true)) require.NoError(t, err) - require.Len(t, returnedTasks, 1) + require.GreaterOrEqual(t, returnedTasks, 1) assertTaskTerse(t, &returnedTasks[0], task.ID(), "10 MINUTE") })