Skip to content

Commit

Permalink
Fix bad test (#1837)
Browse files Browse the repository at this point in the history
  • Loading branch information
@alishakawaguchi
alishakawaguchi committed Apr 25, 2024
1 parent 88378f1 commit d5005db
Showing 1 changed file with 41 additions and 35 deletions.
76 changes: 41 additions & 35 deletions worker/pkg/workflows/datasync/activities/gen-benthos-configs/query-builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
dbschemas_utils "github.com/nucleuscloud/neosync/backend/pkg/dbschemas"
sql_manager "github.com/nucleuscloud/neosync/backend/pkg/sqlmanager"
tabledependency "github.com/nucleuscloud/neosync/backend/pkg/table-dependency"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func Test_buildSelectQuery(t *testing.T) {
Expand Down Expand Up @@ -73,8 +73,8 @@ func Test_buildSelectQuery(t *testing.T) {
t.Run(fmt.Sprintf("%s_%s", t.Name(), tt.name), func(t *testing.T) {
where := tt.where
sql, err := buildSelectQuery(tt.driver, tt.schema, tt.table, tt.columns, &where)
assert.NoError(t, err)
assert.Equal(t, tt.expected, sql)
require.NoError(t, err)
require.Equal(t, tt.expected, sql)
})
}
}
Expand Down Expand Up @@ -161,8 +161,8 @@ func Test_buildSelectJoinQuery(t *testing.T) {
for _, tt := range tests {
t.Run(fmt.Sprintf("%s_%s", t.Name(), tt.name), func(t *testing.T) {
response, err := buildSelectJoinQuery(tt.driver, tt.schema, tt.table, tt.columns, tt.joins, tt.whereClauses)
assert.NoError(t, err)
assert.Equal(t, tt.expected, response)
require.NoError(t, err)
require.Equal(t, tt.expected, response)
})
}
}
Expand Down Expand Up @@ -240,8 +240,8 @@ func Test_buildSelectRecursiveQuery(t *testing.T) {
for _, tt := range tests {
t.Run(fmt.Sprintf("%s_%s", t.Name(), tt.name), func(t *testing.T) {
response, err := buildSelectRecursiveQuery(tt.driver, tt.schema, tt.table, tt.columns, tt.foreignKeys, tt.primaryKeyCol, tt.joins, tt.whereClauses)
assert.NoError(t, err)
assert.Equal(t, tt.expected, response)
require.NoError(t, err)
require.Equal(t, tt.expected, response)
})
}
}
Expand Down Expand Up @@ -389,8 +389,8 @@ func Test_buildSelectQueryMap(t *testing.T) {
for _, tt := range tests {
t.Run(fmt.Sprintf("%s_%s", t.Name(), tt.name), func(t *testing.T) {
sql, err := buildSelectQueryMap(tt.driver, tt.mappings, tt.sourceTableOpts, tt.tableDependencies, tt.dependencyConfigs, tt.subsetByForeignKeyConstraints)
assert.NoError(t, err)
assert.Equal(t, tt.expected, sql)
require.NoError(t, err)
require.Equal(t, tt.expected, sql)
})
}
}
Expand Down Expand Up @@ -524,8 +524,8 @@ func Test_buildSelectQueryMap_SubsetsForeignKeys(t *testing.T) {
}

sql, err := buildSelectQueryMap("postgres", mappings, sourceTableOpts, tableDependencies, dependencyConfigs, true)
assert.NoError(t, err)
assert.Equal(t, expected, sql)
require.NoError(t, err)
require.Equal(t, expected, sql)
}

func Test_buildSelectQueryMap_SubsetsCompositeForeignKeys(t *testing.T) {
Expand Down Expand Up @@ -606,8 +606,8 @@ func Test_buildSelectQueryMap_SubsetsCompositeForeignKeys(t *testing.T) {
}

sql, err := buildSelectQueryMap("postgres", mappings, sourceTableOpts, tableDependencies, dependencyConfigs, true)
assert.NoError(t, err)
assert.Equal(t, expected, sql)
require.NoError(t, err)
require.Equal(t, expected, sql)
}

func Test_buildSelectQueryMap_SubsetsOffForeignKeys(t *testing.T) {
Expand Down Expand Up @@ -739,8 +739,8 @@ func Test_buildSelectQueryMap_SubsetsOffForeignKeys(t *testing.T) {
}
sql, err := buildSelectQueryMap("postgres", mappings, sourceTableOpts, tableDependencies, dependencyConfigs, false)

assert.NoError(t, err)
assert.Equal(t, expected, sql)
require.NoError(t, err)
require.Equal(t, expected, sql)
}

func Test_buildSelectQueryMap_CircularDependency(t *testing.T) {
Expand Down Expand Up @@ -857,8 +857,8 @@ func Test_buildSelectQueryMap_CircularDependency(t *testing.T) {
}
sql, err := buildSelectQueryMap("postgres", mappings, sourceTableOpts, tableDependencies, dependencyConfigs, true)

assert.NoError(t, err)
assert.Equal(t, expected, sql)
require.NoError(t, err)
require.Equal(t, expected, sql)
}

func Test_buildSelectQueryMap_MultiplSubsets(t *testing.T) {
Expand Down Expand Up @@ -1041,8 +1041,8 @@ func Test_buildSelectQueryMap_MultiplSubsets(t *testing.T) {
"public.f": `SELECT "public"."f"."id", "public"."f"."e_id" FROM "public"."f" INNER JOIN "public"."e" ON ("public"."e"."id" = "public"."f"."e_id") WHERE public.e.id = 1;`,
}
sql, err := buildSelectQueryMap("postgres", mappings, sourceTableOpts, tableDependencies, dependencyConfigs, true)
assert.NoError(t, err)
assert.Equal(t, expected, sql)
require.NoError(t, err)
require.Equal(t, expected, sql)
}

func Test_buildSelectQueryMap_MultipleRoots(t *testing.T) {
Expand Down Expand Up @@ -1190,8 +1190,8 @@ func Test_buildSelectQueryMap_MultipleRoots(t *testing.T) {
"public.e": `SELECT "public"."e"."id", "public"."e"."c_id" FROM "public"."e" INNER JOIN "public"."c" ON ("public"."c"."id" = "public"."e"."c_id") INNER JOIN "public"."b" ON ("public"."b"."id" = "public"."c"."b_id") WHERE public.b.id = 1;`,
}
sql, err := buildSelectQueryMap("postgres", mappings, sourceTableOpts, tableDependencies, dependencyConfigs, true)
assert.NoError(t, err)
assert.Equal(t, expected, sql)
require.NoError(t, err)
require.Equal(t, expected, sql)
}

func Test_buildSelectQueryMap_DoubleCircularDependencyRoot(t *testing.T) {
Expand Down Expand Up @@ -1279,8 +1279,8 @@ func Test_buildSelectQueryMap_DoubleCircularDependencyRoot(t *testing.T) {
"public.b": `SELECT "public"."b"."id", "public"."b"."a_id" FROM "public"."b" INNER JOIN "public"."a" ON ("public"."a"."id" = "public"."b"."a_id") WHERE public.a.id = 1;`,
}
sql, err := buildSelectQueryMap("postgres", mappings, sourceTableOpts, tableDependencies, dependencyConfigs, true)
assert.NoError(t, err)
assert.Equal(t, expected, sql)
require.NoError(t, err)
require.Equal(t, expected, sql)
}

func Test_buildSelectQueryMap_doubleCircularDependencyRoot_mysql(t *testing.T) {
Expand Down Expand Up @@ -1368,8 +1368,8 @@ func Test_buildSelectQueryMap_doubleCircularDependencyRoot_mysql(t *testing.T) {
"public.b": "SELECT `public`.`b`.`id`, `public`.`b`.`a_id` FROM `public`.`b` INNER JOIN `public`.`a` ON (`public`.`a`.`id` = `public`.`b`.`a_id`) WHERE public.a.id = 1;",
}
sql, err := buildSelectQueryMap("mysql", mappings, sourceTableOpts, tableDependencies, dependencyConfigs, true)
assert.NoError(t, err)
assert.Equal(t, expected, sql)
require.NoError(t, err)
require.Equal(t, expected, sql)
}

func Test_buildSelectQueryMap_DoubleCircularDependencyChild(t *testing.T) {
Expand Down Expand Up @@ -1453,8 +1453,8 @@ func Test_buildSelectQueryMap_DoubleCircularDependencyChild(t *testing.T) {
"public.b": `SELECT "id" FROM "public"."b" WHERE public.b.id = 1;`,
}
sql, err := buildSelectQueryMap("postgres", mappings, sourceTableOpts, tableDependencies, dependencyConfigs, true)
assert.NoError(t, err)
assert.Equal(t, expected, sql)
require.NoError(t, err)
require.Equal(t, expected, sql)
}

func Test_buildSelectQueryMap_shouldContinue(t *testing.T) {
Expand Down Expand Up @@ -1601,8 +1601,8 @@ func Test_buildSelectQueryMap_shouldContinue(t *testing.T) {
}
sql, err := buildSelectQueryMap("postgres", mappings, sourceTableOpts, tableDependencies, dependencyConfigs, true)

assert.NoError(t, err)
assert.Equal(t, expected, sql)
require.NoError(t, err)
require.Equal(t, expected, sql)
}

func Test_getBfsPathMap(t *testing.T) {
Expand Down Expand Up @@ -1724,7 +1724,7 @@ func Test_getBfsPathMap(t *testing.T) {
for _, tt := range tests {
t.Run(fmt.Sprintf("%s_%s", t.Name(), tt.name), func(t *testing.T) {
path := getBfsPathMap(tt.graph, tt.start)
assert.Equal(t, tt.expected, path)
require.Equal(t, tt.expected, path)
})
}
}
Expand Down Expand Up @@ -1777,8 +1777,8 @@ func Test_qualifyWhereColumnNames_mysql(t *testing.T) {
for _, tt := range tests {
t.Run(fmt.Sprintf("%s_%s", t.Name(), tt.name), func(t *testing.T) {
response, err := qualifyWhereColumnNames(sql_manager.MysqlDriver, tt.where, tt.schema, tt.table)
assert.NoError(t, err)
assert.Equal(t, tt.expected, response)
require.NoError(t, err)
require.Equal(t, tt.expected, response)
})
}
}
Expand Down Expand Up @@ -1831,8 +1831,8 @@ func Test_qualifyWhereColumnNames_postgres(t *testing.T) {
for _, tt := range tests {
t.Run(fmt.Sprintf("%s_%s", t.Name(), tt.name), func(t *testing.T) {
response, err := qualifyWhereColumnNames(sql_manager.PostgresDriver, tt.where, tt.schema, tt.table)
assert.NoError(t, err)
assert.Equal(t, tt.expected, response)
require.NoError(t, err)
require.Equal(t, tt.expected, response)
})
}
}
Expand Down Expand Up @@ -1911,7 +1911,13 @@ func TestGetPrimaryToForeignTableMapFromRunConfigs(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
actual := getPrimaryToForeignTableMapFromRunConfigs(tt.runConfigs)
assert.Equal(t, tt.expected, actual)
for table, dependencies := range actual {
expected, exists := tt.expected[table]
require.True(t, exists)
for _, dep := range dependencies {
require.Contains(t, expected, dep)
}
}
})
}
}

0 comments on commit d5005db

Please sign in to comment.