use sort method in tests

Author: denchenko

source/clickhouse/clickhouse_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"log/slog"
-	"sort"
 	"testing"
 	"time"
 
@@ -60,9 +59,12 @@ func TestExtractSchema(t *testing.T) {
 	}
 
 	source := NewSourceFromDB(db)
+
 	actual, err := source.ExtractSchema(ctx)
 	require.NoError(t, err)
 
+	actual.Sort()
+
 	expected := dberd.Schema{
 		Tables: []dberd.Table{
 			{
@@ -94,17 +96,7 @@ func TestExtractSchema(t *testing.T) {
 		},
 	}
 
-	// Sort tables and columns for consistent comparison
-	for _, s := range []dberd.Schema{actual, expected} {
-		sort.Slice(s.Tables, func(i, j int) bool {
-			return s.Tables[i].Name < s.Tables[j].Name
-		})
-		for _, table := range s.Tables {
-			sort.Slice(table.Columns, func(i, j int) bool {
-				return table.Columns[i].Name < table.Columns[j].Name
-			})
-		}
-	}
+	expected.Sort()
 
 	assert.Equal(t, expected, actual)
 }

source/cockroach/cockroach_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"log/slog"
-	"sort"
 	"testing"
 	"time"
 
@@ -96,11 +95,13 @@ func TestExtractSchema(t *testing.T) {
 	`)
 	require.NoError(t, err)
 
-	// Create source and extract schema
 	source := NewSourceFromDB(db)
+
 	actual, err := source.ExtractSchema(ctx)
 	require.NoError(t, err)
 
+	actual.Sort()
+
 	expected := dberd.Schema{
 		Tables: []dberd.Table{
 			{
@@ -178,23 +179,9 @@ func TestExtractSchema(t *testing.T) {
 			{Source: dberd.TableColumn{Table: "public.user_roles", Column: "user_id"}, Target: dberd.TableColumn{Table: "public.users", Column: "id"}},
 		},
 	}
-	for _, s := range []dberd.Schema{actual, expected} {
-		sort.Slice(s.Tables, func(i, j int) bool {
-			return s.Tables[i].Name < s.Tables[j].Name
-		})
-		sort.Slice(s.References, func(i, j int) bool {
-			switch {
-			case s.References[i].Source.Table != s.References[j].Source.Table:
-				return s.References[i].Source.Table < s.References[j].Source.Table
-			case s.References[i].Source.Column != s.References[j].Source.Column:
-				return s.References[i].Source.Column < s.References[j].Source.Column
-			case s.References[i].Target.Table != s.References[j].Target.Table:
-				return s.References[i].Target.Table < s.References[j].Target.Table
-			default:
-				return s.References[i].Target.Column < s.References[j].Target.Column
-			}
-		})
-	}
+
+	expected.Sort()
+
 	assert.Equal(t, expected, actual)
 }
 

source/mongodb/mongodb_test.go

@@ -3,7 +3,6 @@ package mongodb
 import (
 	"context"
 	"log/slog"
-	"sort"
 	"testing"
 	"time"
 
@@ -70,11 +69,13 @@ func TestExtractSchema(t *testing.T) {
 		require.NoError(t, err)
 	}
 
-	// Create source and extract schema
 	source := NewSourceFromClient(client)
+
 	actual, err := source.ExtractSchema(ctx)
 	require.NoError(t, err)
 
+	actual.Sort()
+
 	expected := dberd.Schema{
 		Tables: []dberd.Table{
 			{
@@ -103,17 +104,7 @@ func TestExtractSchema(t *testing.T) {
 		},
 	}
 
-	// Sort tables and columns for consistent comparison
-	for _, s := range []dberd.Schema{actual, expected} {
-		sort.Slice(s.Tables, func(i, j int) bool {
-			return s.Tables[i].Name < s.Tables[j].Name
-		})
-		for _, table := range s.Tables {
-			sort.Slice(table.Columns, func(i, j int) bool {
-				return table.Columns[i].Name < table.Columns[j].Name
-			})
-		}
-	}
+	expected.Sort()
 
 	assert.Equal(t, expected, actual)
 }