Skip to content

test(#781): migrate pkg/table tests to require.* #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morgo merged 8 commits into from
May 3, 2026
Merged

test(#781): migrate pkg/table tests to require.* #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0d0e740
test(#781): migrate pkg/table tests from assert.* to require.*
morgo May 2, 2026
11b3889
test(#781): tighten assert→require — only goroutines and table-driven…
morgo May 2, 2026
2d3d5d5
style: gofmt
morgo May 2, 2026
7c85545
Merge branch 'main' into fix-issue-781-pkg-table-assert-require
morgo May 2, 2026
5563fdd
Merge branch 'main' into fix-issue-781-pkg-table-assert-require
morgo May 2, 2026
73f42a0
Merge branch 'main' into fix-issue-781-pkg-table-assert-require
morgo May 2, 2026
70ee2eb
Merge branch 'main' into fix-issue-781-pkg-table-assert-require
morgo May 2, 2026
0634c9b
Merge branch 'main' into fix-issue-781-pkg-table-assert-require
morgo May 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions pkg/table/chunk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package table
import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestChunk2String(t *testing.T) {
Expand All @@ -18,50 +18,50 @@ func TestChunk2String(t *testing.T) {
Inclusive: false,
},
}
assert.Equal(t, "`id` >= 100 AND `id` < 200", chunk.String())
require.Equal(t, "`id` >= 100 AND `id` < 200", chunk.String())
chunk = &Chunk{
Key: []string{"id"},
LowerBound: &Boundary{
Value: []Datum{{Val: 100, Tp: signedType}},
Inclusive: false,
},
}
assert.Equal(t, "`id` > 100", chunk.String())
require.Equal(t, "`id` > 100", chunk.String())
chunk = &Chunk{
Key: []string{"id"},
UpperBound: &Boundary{
Value: []Datum{{Val: 200, Tp: signedType}},
Inclusive: true,
},
}
assert.Equal(t, "`id` <= 200", chunk.String())
require.Equal(t, "`id` <= 200", chunk.String())

// Empty chunks are possible with the composite chunker
chunk = &Chunk{
Key: []string{"id"},
}
assert.Equal(t, "1=1", chunk.String())
require.Equal(t, "1=1", chunk.String())
}

func TestBoundary_ValueString(t *testing.T) {
boundary1 := &Boundary{
Value: []Datum{{Val: 100, Tp: signedType}, {Val: 200, Tp: signedType}},
Inclusive: false,
}
assert.Equal(t, "\"100\",\"200\"", boundary1.valuesString())
require.Equal(t, "\"100\",\"200\"", boundary1.valuesString())

boundary2 := &Boundary{
Value: []Datum{{Val: 100, Tp: signedType}, {Val: 200, Tp: signedType}},
Inclusive: true,
}
// Tests that Inclusive doesn't matter between Boundaries for valuesString
assert.Equal(t, boundary2.valuesString(), boundary1.valuesString())
require.Equal(t, boundary2.valuesString(), boundary1.valuesString())

// Tests composite key boundary with mixed types
boundary3 := &Boundary{
Value: []Datum{{Val: "PENDING", Tp: binaryType}, {Val: 2, Tp: signedType}},
}
assert.Equal(t, "\"PENDING\",\"2\"", boundary3.valuesString())
require.Equal(t, "\"PENDING\",\"2\"", boundary3.valuesString())
}

func TestCompositeChunks(t *testing.T) {
Expand All @@ -76,7 +76,7 @@ func TestCompositeChunks(t *testing.T) {
Inclusive: false,
},
}
assert.Equal(t, "((`id1` > 100)\n OR (`id1` = 100 AND `id2` > 200)) AND ((`id1` < 100)\n OR (`id1` = 100 AND `id2` < 300))", chunk.String())
require.Equal(t, "((`id1` > 100)\n OR (`id1` = 100 AND `id2` > 200)) AND ((`id1` < 100)\n OR (`id1` = 100 AND `id2` < 300))", chunk.String())
// 4 parts to the key - pretty unlikely.
chunk = &Chunk{
Key: []string{"id1", "id2", "id3", "id4"},
Expand All @@ -89,7 +89,7 @@ func TestCompositeChunks(t *testing.T) {
Inclusive: false,
},
}
assert.Equal(t, "((`id1` > 100)\n OR (`id1` = 100 AND `id2` > 200)\n OR (`id1` = 100 AND `id2` = 200 AND `id3` > 200)\n OR (`id1` = 100 AND `id2` = 200 AND `id3` = 200 AND `id4` >= 200)) AND ((`id1` < 101)\n OR (`id1` = 101 AND `id2` < 12)\n OR (`id1` = 101 AND `id2` = 12 AND `id3` < 123)\n OR (`id1` = 101 AND `id2` = 12 AND `id3` = 123 AND `id4` < 1))", chunk.String())
require.Equal(t, "((`id1` > 100)\n OR (`id1` = 100 AND `id2` > 200)\n OR (`id1` = 100 AND `id2` = 200 AND `id3` > 200)\n OR (`id1` = 100 AND `id2` = 200 AND `id3` = 200 AND `id4` >= 200)) AND ((`id1` < 101)\n OR (`id1` = 101 AND `id2` < 12)\n OR (`id1` = 101 AND `id2` = 12 AND `id3` < 123)\n OR (`id1` = 101 AND `id2` = 12 AND `id3` = 123 AND `id4` < 1))", chunk.String())
// A possible scenario when chunking on a non primary key is possible:
chunk = &Chunk{
Key: []string{"status", "id"},
Expand All @@ -102,7 +102,7 @@ func TestCompositeChunks(t *testing.T) {
Inclusive: false,
},
}
assert.Equal(t, "((`status` > \"ARCHIVED\")\n OR (`status` = \"ARCHIVED\" AND `id` >= 1234)) AND ((`status` < \"ARCHIVED\")\n OR (`status` = \"ARCHIVED\" AND `id` < 5412))", chunk.String())
require.Equal(t, "((`status` > \"ARCHIVED\")\n OR (`status` = \"ARCHIVED\" AND `id` >= 1234)) AND ((`status` < \"ARCHIVED\")\n OR (`status` = \"ARCHIVED\" AND `id` < 5412))", chunk.String())
}

func TestComparesTo(t *testing.T) {
Expand All @@ -114,11 +114,11 @@ func TestComparesTo(t *testing.T) {
Value: []Datum{{Val: 200, Tp: signedType}},
Inclusive: true,
}
assert.True(t, b1.comparesTo(b2))
b2.Inclusive = false // change operator
assert.True(t, b1.comparesTo(b2)) // still compares
require.True(t, b1.comparesTo(b2))
b2.Inclusive = false // change operator
require.True(t, b1.comparesTo(b2)) // still compares
b2.Value = []Datum{{Val: 300, Tp: signedType}}
assert.False(t, b1.comparesTo(b2))
require.False(t, b1.comparesTo(b2))

// Compound values.
b1 = &Boundary{
Expand All @@ -129,9 +129,9 @@ func TestComparesTo(t *testing.T) {
Value: []Datum{{Val: 200, Tp: signedType}, {Val: 300, Tp: signedType}},
Inclusive: true,
}
assert.True(t, b1.comparesTo(b2))
require.True(t, b1.comparesTo(b2))
b2.Value = []Datum{{Val: 200, Tp: signedType}, {Val: 400, Tp: signedType}}
assert.False(t, b1.comparesTo(b2))
require.False(t, b1.comparesTo(b2))
}

func TestWatermarkAboveClause(t *testing.T) {
Expand All @@ -143,8 +143,8 @@ func TestWatermarkAboveClause(t *testing.T) {
// Build a watermark JSON: chunk with upper bound id=100
watermark := `{"Key":["id"],"ChunkSize":1000,"LowerBound":{"Value":["50"],"Inclusive":true},"UpperBound":{"Value":["100"],"Inclusive":false}}`
clause, err := WatermarkAboveClause(ti, watermark)
assert.NoError(t, err)
assert.Equal(t, "`id` > 100", clause)
require.NoError(t, err)
require.Equal(t, "`id` > 100", clause)

// Composite key
ti2 := NewTableInfo(nil, "test", "t2")
Expand All @@ -153,13 +153,13 @@ func TestWatermarkAboveClause(t *testing.T) {

watermark2 := `{"Key":["tenant_id","item_id"],"ChunkSize":1000,"LowerBound":{"Value":["1","50"],"Inclusive":true},"UpperBound":{"Value":["2","100"],"Inclusive":false}}`
clause2, err := WatermarkAboveClause(ti2, watermark2)
assert.NoError(t, err)
assert.Contains(t, clause2, "`tenant_id`")
assert.Contains(t, clause2, "`item_id`")
require.NoError(t, err)
require.Contains(t, clause2, "`tenant_id`")
require.Contains(t, clause2, "`item_id`")
// Should be a row constructor comparison: ((tenant_id > 2) OR (tenant_id = 2 AND item_id > 100))
assert.Equal(t, "((`tenant_id` > 2)\n OR (`tenant_id` = 2 AND `item_id` > 100))", clause2)
require.Equal(t, "((`tenant_id` > 2)\n OR (`tenant_id` = 2 AND `item_id` > 100))", clause2)

// Invalid JSON
_, err = WatermarkAboveClause(ti, "not-json")
assert.Error(t, err)
require.Error(t, err)
}
Loading
Loading