diff options
author | 2024-01-17 14:54:30 +0000 | |
---|---|---|
committer | 2024-01-17 14:54:30 +0000 | |
commit | 906639ad7eb92e9d631599f78979908930e59c84 (patch) | |
tree | dfef6d0a5ba47c49c214e4537a89dee6ad528df8 /internal/db/bundb/list_test.go | |
parent | [bugfix] Better Postgres search case insensitivity (#2526) (diff) | |
download | gotosocial-906639ad7eb92e9d631599f78979908930e59c84.tar.xz |
[chore] update viper version (#2539)
* update viper version
* removes our last uses of the slice package
* fix tests
Diffstat (limited to 'internal/db/bundb/list_test.go')
-rw-r--r-- | internal/db/bundb/list_test.go | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/internal/db/bundb/list_test.go b/internal/db/bundb/list_test.go index ca078d086..9c5fb2c76 100644 --- a/internal/db/bundb/list_test.go +++ b/internal/db/bundb/list_test.go @@ -19,13 +19,13 @@ package bundb_test import ( "context" + "slices" "testing" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtscontext" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "golang.org/x/exp/slices" ) type ListTestSuite struct { @@ -43,8 +43,16 @@ func (suite *ListTestSuite) testStructs() (*gtsmodel.List, *gtsmodel.Account) { } // Sort by ID descending (again, as we'd expect from the db). - slices.SortFunc(entries, func(a, b *gtsmodel.ListEntry) bool { - return b.ID < a.ID + slices.SortFunc(entries, func(a, b *gtsmodel.ListEntry) int { + const k = -1 + switch { + case a.ID > b.ID: + return +k + case a.ID < b.ID: + return -k + default: + return 0 + } }) testList.ListEntries = entries @@ -239,8 +247,16 @@ func (suite *ListTestSuite) TestPutListEntries() { // Add these entries to the test list, sort it again // to reflect what we'd expect to get from the db. testList.ListEntries = append(testList.ListEntries, listEntries...) - slices.SortFunc(testList.ListEntries, func(a, b *gtsmodel.ListEntry) bool { - return b.ID < a.ID + slices.SortFunc(testList.ListEntries, func(a, b *gtsmodel.ListEntry) int { + const k = -1 + switch { + case a.ID > b.ID: + return +k + case a.ID < b.ID: + return -k + default: + return 0 + } }) // Now get all list entries from the db. |