Changes after review

Snowflake-Labs · Sep 23, 2024 · a783bec · a783bec
1 parent 87638ea
commit a783bec
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git 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
@@ -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")
 	})