Skip to content

[usage] make tests robust #12764

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
merged 1 commit into from
Sep 8, 2022
Merged

[usage] make tests robust #12764

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 22 additions & 8 deletions components/usage/pkg/db/usage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,19 @@ func TestInsertUsageRecords(t *testing.T) {

drafts, err := db.FindAllDraftUsage(context.Background(), conn)
require.NoError(t, err)
require.Equal(t, 1, len(drafts))
require.NotEqual(t, updatedDesc, drafts[0].Description)
cleaned := filter(drafts, attributionID)
require.Equal(t, 1, len(cleaned))
require.NotEqual(t, updatedDesc, cleaned[0].Description)
}

func filter(drafts []db.Usage, attributionID db.AttributionID) []db.Usage {
var cleaned []db.Usage
for _, draft := range drafts {
if draft.AttributionID == attributionID {
cleaned = append(cleaned, draft)
}
}
return cleaned
}

func TestUpdateUsageRecords(t *testing.T) {
Expand All @@ -168,8 +179,9 @@ func TestUpdateUsageRecords(t *testing.T) {

drafts, err := db.FindAllDraftUsage(context.Background(), conn)
require.NoError(t, err)
require.Equal(t, 1, len(drafts))
require.Equal(t, updatedDesc, drafts[0].Description)
cleaned := filter(drafts, attributionID)
require.Equal(t, 1, len(cleaned))
require.Equal(t, updatedDesc, cleaned[0].Description)
}

func TestFindAllDraftUsage(t *testing.T) {
Expand Down Expand Up @@ -197,8 +209,9 @@ func TestFindAllDraftUsage(t *testing.T) {
dbtest.CreateUsageRecords(t, conn, usage1, usage2, usage3)
drafts, err := db.FindAllDraftUsage(context.Background(), conn)
require.NoError(t, err)
require.Equal(t, 2, len(drafts))
for _, usage := range drafts {
cleaned := filter(drafts, attributionID)
require.Equal(t, 2, len(cleaned))
for _, usage := range cleaned {
require.True(t, usage.Draft)
}

Expand All @@ -208,8 +221,9 @@ func TestFindAllDraftUsage(t *testing.T) {

drafts, err = db.FindAllDraftUsage(context.Background(), conn)
require.NoError(t, err)
require.Equal(t, 1, len(drafts))
for _, usage := range drafts {
cleaned = filter(drafts, attributionID)
require.Equal(t, 1, len(cleaned))
for _, usage := range cleaned {
require.True(t, usage.Draft)
}
}
Expand Down