Skip to content

Commit 833bbc2

Browse files
EmyrkEmyrk
committed
Use slice.New()
1 parent 58b71f9 commit 833bbc2

File tree

6 files changed

+19
-12
lines changed

6 files changed

+19
-12
lines changed

‎coderd/authzquery/apikey_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/coder/coder/coderd/database"
88
"github.com/coder/coder/coderd/database/dbgen"
99
"github.com/coder/coder/coderd/rbac"
10+
"github.com/coder/coder/coderd/util/slice"
1011
)
1112

1213
func (suite *MethodTestSuite) TestAPIKey() {
@@ -29,7 +30,7 @@ func (suite *MethodTestSuite) TestAPIKey() {
2930
_, _ = dbgen.APIKey(t, db, database.APIKey{LoginType: database.LoginTypeGithub})
3031
return methodCase(values(database.LoginTypePassword),
3132
asserts(a, rbac.ActionRead, b, rbac.ActionRead),
32-
values([]database.APIKey{a, b}))
33+
values(slice.New(a, b)))
3334
})
3435
})
3536
suite.Run("GetAPIKeysLastUsedAfter", func() {
@@ -39,7 +40,7 @@ func (suite *MethodTestSuite) TestAPIKey() {
3940
_, _ = dbgen.APIKey(t, db, database.APIKey{LastUsed: time.Now().Add(-time.Hour)})
4041
return methodCase(values(time.Now()),
4142
asserts(a, rbac.ActionRead, b, rbac.ActionRead),
42-
values([]database.APIKey{a, b}))
43+
values(slice.New(a, b)))
4344
})
4445
})
4546
suite.Run("InsertAPIKey", func() {

‎coderd/authzquery/job_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/coder/coder/coderd/database"
1010
"github.com/coder/coder/coderd/database/dbgen"
1111
"github.com/coder/coder/coderd/rbac"
12+
"github.com/coder/coder/coderd/util/slice"
1213
)
1314

1415
func (suite *MethodTestSuite) TestProvsionerJob() {
@@ -95,8 +96,7 @@ func (suite *MethodTestSuite) TestProvsionerJob() {
9596
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
9697
a := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{})
9798
b := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{})
98-
return methodCase(values([]uuid.UUID{a.ID, b.ID}), asserts(),
99-
values([]database.ProvisionerJob{a, b}))
99+
return methodCase(values([]uuid.UUID{a.ID, b.ID}), asserts(), values(slice.New(a, b)))
100100
})
101101
})
102102
suite.Run("GetProvisionerLogsByIDBetween", func() {

‎coderd/authzquery/organization_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/coder/coder/coderd/database"
99
"github.com/coder/coder/coderd/database/dbgen"
1010
"github.com/coder/coder/coderd/rbac"
11+
"github.com/coder/coder/coderd/util/slice"
1112
)
1213

1314
func (suite *MethodTestSuite) TestOrganization() {
@@ -59,15 +60,15 @@ func (suite *MethodTestSuite) TestOrganization() {
5960
a := dbgen.OrganizationMember(t, db, database.OrganizationMember{UserID: u.ID})
6061
b := dbgen.OrganizationMember(t, db, database.OrganizationMember{UserID: u.ID})
6162
return methodCase(values(u.ID), asserts(a, rbac.ActionRead, b, rbac.ActionRead),
62-
values([]database.OrganizationMember{a, b}))
63+
values(slice.New(a, b)))
6364
})
6465
})
6566
suite.Run("GetOrganizations", func() {
6667
suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
6768
a := dbgen.Organization(t, db, database.Organization{})
6869
b := dbgen.Organization(t, db, database.Organization{})
6970
return methodCase(values(), asserts(a, rbac.ActionRead, b, rbac.ActionRead),
70-
values([]database.Organization{a, b}))
71+
values(slice.New(a, b)))
7172
})
7273
})
7374
suite.Run("GetOrganizationsByUserID", func() {
@@ -78,7 +79,7 @@ func (suite *MethodTestSuite) TestOrganization() {
7879
b := dbgen.Organization(t, db, database.Organization{})
7980
_ = dbgen.OrganizationMember(t, db, database.OrganizationMember{UserID: u.ID, OrganizationID: b.ID})
8081
return methodCase(values(u.ID), asserts(a, rbac.ActionRead, b, rbac.ActionRead),
81-
values([]database.Organization{a, b}))
82+
values(slice.New(a, b)))
8283
})
8384
})
8485
suite.Run("InsertOrganization", func() {

‎coderd/authzquery/parameters_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package authzquery_test
33
import (
44
"testing"
55

6+
"github.com/coder/coder/coderd/util/slice"
7+
68
"github.com/google/uuid"
79

810
"github.com/coder/coder/coderd/database/dbgen"
@@ -88,8 +90,7 @@ func (suite *MethodTestSuite) TestParameters() {
8890
})
8991
return methodCase(values(database.ParameterValuesParams{
9092
IDs: []uuid.UUID{a.ID, b.ID},
91-
}), asserts(tpl, rbac.ActionRead, w, rbac.ActionRead),
92-
values([]database.ParameterValue{a, b}))
93+
}), asserts(tpl, rbac.ActionRead, w, rbac.ActionRead), values(slice.New(a, b)))
9394
})
9495
})
9596
suite.Run("GetParameterSchemasByJobID", func() {

‎coderd/authzquery/user_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package authzquery_test
33
import (
44
"testing"
55

6+
"github.com/coder/coder/coderd/util/slice"
7+
68
"github.com/google/uuid"
79

810
"github.com/coder/coder/coderd/database"
@@ -78,7 +80,7 @@ func (s *MethodTestSuite) TestUser() {
7880
b := dbgen.User(t, db, database.User{})
7981
return methodCase(values([]uuid.UUID{a.ID, b.ID}),
8082
asserts(a, rbac.ActionRead, b, rbac.ActionRead),
81-
values([]database.User{a, b}))
83+
values(slice.New(a, b)))
8284
})
8385
})
8486
s.Run("InsertUser", func() {

‎coderd/authzquery/workspace_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package authzquery_test
33
import (
44
"testing"
55

6+
"github.com/coder/coder/coderd/util/slice"
7+
68
"github.com/google/uuid"
79

810
"github.com/coder/coder/coderd/database"
@@ -48,7 +50,7 @@ func (s *MethodTestSuite) TestWorkspace() {
4850
b := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: ws.ID})
4951
return methodCase(
5052
values([]uuid.UUID{ws.ID}),
51-
asserts(ws, rbac.ActionRead), values([]database.WorkspaceBuild{b}))
53+
asserts(ws, rbac.ActionRead), values(slice.New(b)))
5254
})
5355
})
5456
s.Run("GetWorkspaceAgentByID", func() {
@@ -114,7 +116,7 @@ func (s *MethodTestSuite) TestWorkspace() {
114116
a := dbgen.WorkspaceApp(t, db, database.WorkspaceApp{AgentID: agt.ID})
115117
b := dbgen.WorkspaceApp(t, db, database.WorkspaceApp{AgentID: agt.ID})
116118

117-
return methodCase(values(agt.ID), asserts(ws, rbac.ActionRead), values([]database.WorkspaceApp{a, b}))
119+
return methodCase(values(agt.ID), asserts(ws, rbac.ActionRead), values(slice.New(a, b)))
118120
})
119121
})
120122
s.Run("GetWorkspaceAppsByAgentIDs", func() {

0 commit comments

Comments
 (0)