From 93f9a40fc016e8b07dae0fe91c08c605c644082d Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Wed, 20 Dec 2023 13:31:47 -0600 Subject: [PATCH] testify auto fixes --- backend/internal/data/repo/repo_items_test.go | 2 +- backend/internal/data/repo/repo_locations_test.go | 6 +++--- backend/internal/data/repo/repo_maintenance_entry_test.go | 2 +- backend/internal/data/repo/repo_users_test.go | 8 ++++---- backend/pkgs/mailer/mailer_test.go | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/internal/data/repo/repo_items_test.go b/backend/internal/data/repo/repo_items_test.go index d4d067c..736f500 100644 --- a/backend/internal/data/repo/repo_items_test.go +++ b/backend/internal/data/repo/repo_items_test.go @@ -97,7 +97,7 @@ func TestItemsRepository_GetAll(t *testing.T) { results, err := tRepos.Items.GetAll(context.Background(), tGroup.ID) assert.NoError(t, err) - assert.Equal(t, length, len(results)) + assert.Len(t, results, length) for _, item := range results { for _, expectedItem := range expected { diff --git a/backend/internal/data/repo/repo_locations_test.go b/backend/internal/data/repo/repo_locations_test.go index c649bcb..f67b032 100644 --- a/backend/internal/data/repo/repo_locations_test.go +++ b/backend/internal/data/repo/repo_locations_test.go @@ -136,12 +136,12 @@ func TestItemRepository_TreeQuery(t *testing.T) { assert.NoError(t, err) - assert.Equal(t, 2, len(locations)) + assert.Len(t, locations, 2) // Check roots for _, loc := range locations { if loc.ID == locs[1].ID { - assert.Equal(t, 1, len(loc.Children)) + assert.Len(t, loc.Children, 1) } } } @@ -165,7 +165,7 @@ func TestLocationRepository_PathForLoc(t *testing.T) { path, err := tRepos.Locations.PathForLoc(context.Background(), tGroup.ID, last.ID) assert.NoError(t, err) - assert.Equal(t, 3, len(path)) + assert.Len(t, path, 3) // Check path and order for i, loc := range path { diff --git a/backend/internal/data/repo/repo_maintenance_entry_test.go b/backend/internal/data/repo/repo_maintenance_entry_test.go index a82768c..acbea2a 100644 --- a/backend/internal/data/repo/repo_maintenance_entry_test.go +++ b/backend/internal/data/repo/repo_maintenance_entry_test.go @@ -67,7 +67,7 @@ func TestMaintenanceEntryRepository_GetLog(t *testing.T) { } assert.Equal(t, item.ID, log.ItemID) - assert.Equal(t, 10, len(log.Entries)) + assert.Len(t, log.Entries, 10) // Calculate the average cost var total float64 diff --git a/backend/internal/data/repo/repo_users_test.go b/backend/internal/data/repo/repo_users_test.go index d3cd361..73dec5a 100644 --- a/backend/internal/data/repo/repo_users_test.go +++ b/backend/internal/data/repo/repo_users_test.go @@ -28,7 +28,7 @@ func TestUserRepo_GetOneEmail(t *testing.T) { foundUser, err := tRepos.Users.GetOneEmail(ctx, user.Email) assert.NotNil(foundUser) - assert.Nil(err) + assert.NoError(err) assert.Equal(user.Email, foundUser.Email) assert.Equal(user.Name, foundUser.Name) @@ -46,7 +46,7 @@ func TestUserRepo_GetOneId(t *testing.T) { foundUser, err := tRepos.Users.GetOneId(ctx, userOut.ID) assert.NotNil(foundUser) - assert.Nil(err) + assert.NoError(err) assert.Equal(user.Email, foundUser.Email) assert.Equal(user.Name, foundUser.Name) @@ -131,12 +131,12 @@ func TestUserRepo_Delete(t *testing.T) { ctx := context.Background() allUsers, _ := tRepos.Users.GetAll(ctx) - assert.Greater(t, len(allUsers), 0) + assert.NotEmpty(t, allUsers) err := tRepos.Users.DeleteAll(ctx) assert.NoError(t, err) allUsers, _ = tRepos.Users.GetAll(ctx) - assert.Equal(t, len(allUsers), 0) + assert.Empty(t, allUsers) } func TestUserRepo_GetSuperusers(t *testing.T) { diff --git a/backend/pkgs/mailer/mailer_test.go b/backend/pkgs/mailer/mailer_test.go index 3e67a68..3bd6afc 100644 --- a/backend/pkgs/mailer/mailer_test.go +++ b/backend/pkgs/mailer/mailer_test.go @@ -59,5 +59,5 @@ func Test_Mailer(t *testing.T) { err = mailer.Send(msg) - assert.Nil(t, err) + assert.NoError(t, err) }