opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 06:02:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove folderid service test (#80433)

Browse Source 
* Remove FolderID from service tests

* Add models

* Add folderID pack to publicdashboard tests

* Remove folderID from dashboard tests

* Remove folderID from folders

* Remove folderID from ngalert tests

* Remove nolint comment

* Add back some tests after rebase
This commit is contained in:
idafurjes
2024-01-12 16:43:39 +01:00
committed by GitHub
parent e553d4b796
commit cb419e799b
18 changed files with 105 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/services/folder/folderimpl/sqlstore_test.go
View File

@ -70,8 +70,7 @@ func TestIntegrationCreate(t *testing.T) {
assert.Equal(t, folderTitle, f.Title)
assert.Equal(t, folderDsc, f.Description)
// nolint:staticcheck
assert.NotEmpty(t, f.ID)
assert.NotEmpty(t, f.UID)
assert.Equal(t, uid, f.UID)
assert.Empty(t, f.ParentUID)
assert.NotEmpty(t, f.URL)
@ -98,8 +97,7 @@ func TestIntegrationCreate(t *testing.T) {
})
require.NoError(t, err)
require.Equal(t, "parent", parent.Title)
// nolint:staticcheck
require.NotEmpty(t, parent.ID)
require.NotEmpty(t, parent.UID)
assert.Equal(t, parentUID, parent.UID)
assert.NotEmpty(t, parent.URL)
@ -125,8 +123,7 @@ func TestIntegrationCreate(t *testing.T) {
assert.Equal(t, folderTitle, f.Title)
assert.Equal(t, folderDsc, f.Description)
// nolint:staticcheck
assert.NotEmpty(t, f.ID)
assert.NotEmpty(t, f.UID)
assert.Equal(t, uid, f.UID)
assert.Equal(t, parentUID, f.ParentUID)
assert.NotEmpty(t, f.URL)
@ -404,8 +401,6 @@ func TestIntegrationGet(t *testing.T) {
OrgID: orgID,
})
require.NoError(t, err)
// nolint:staticcheck
assert.Equal(t, f.ID, ff.ID)
assert.Equal(t, f.UID, ff.UID)
assert.Equal(t, f.OrgID, ff.OrgID)
assert.Equal(t, f.Title, ff.Title)
@ -422,8 +417,6 @@ func TestIntegrationGet(t *testing.T) {
OrgID: orgID,
})
require.NoError(t, err)
// nolint:staticcheck
assert.Equal(t, f.ID, ff.ID)
assert.Equal(t, f.UID, ff.UID)
assert.Equal(t, f.OrgID, ff.OrgID)
assert.Equal(t, f.Title, ff.Title)
@ -436,11 +429,10 @@ func TestIntegrationGet(t *testing.T) {
t.Run("get folder by title should succeed", func(t *testing.T) {
ff, err := folderStore.Get(context.Background(), folder.GetFolderQuery{
ID: &f.ID, // nolint:staticcheck
UID: &f.UID,
OrgID: orgID,
})
require.NoError(t, err)
// nolint:staticcheck
assert.Equal(t, f.ID, ff.ID)
assert.Equal(t, f.UID, ff.UID)
assert.Equal(t, f.OrgID, ff.OrgID)
assert.Equal(t, f.Title, ff.Title)
@ -777,8 +769,7 @@ func TestIntegrationGetFolders(t *testing.T) {
})
assert.NotEqual(t, -1, folderInResponseIdx)
rf := ff[folderInResponseIdx]
// nolint:staticcheck
assert.Equal(t, f.ID, rf.ID)
assert.Equal(t, f.UID, rf.UID)
assert.Equal(t, f.OrgID, rf.OrgID)
assert.Equal(t, f.Title, rf.Title)
assert.Equal(t, f.Description, rf.Description)
@ -822,8 +813,6 @@ func CreateSubtree(t *testing.T, store *sqlStore, orgID int64, parentUID string,
f, err := store.Create(context.Background(), cmd)
require.NoError(t, err)
require.Equal(t, title, f.Title)
// nolint:staticcheck
require.NotEmpty(t, f.ID)
require.NotEmpty(t, f.UID)
parents, err := store.GetParents(context.Background(), folder.GetParentsQuery{