Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MustIDFromString no more requires test instance 

It panics now.
pull/10616/head
Leonardo Di Donato 2018-07-31 02:55:11 +02:00 committed by Leonardo Di Donato
parent c16a855a58
commit 5addb88eb5
19 changed files with 582 additions and 613 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/fluxd/main.go
View File

@ -20,6 +20,7 @@ import (
"github.com/influxdata/platform/query/functions"
"github.com/influxdata/platform/query/functions/storage"
"github.com/influxdata/platform/query/functions/storage/pb"
platformtesting "github.com/influxdata/platform/testing"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/spf13/cobra"
@ -194,14 +195,8 @@ var (
)
func init() {
var err error
bucketID, err := platform.IDFromString("abbaabbaabbaabba")
orgID, err := platform.IDFromString("baabbaabbaabbaab")
if err != nil {
panic(err)
}
staticBucketID = *bucketID
staticOrgID = *orgID
staticBucketID = platformtesting.MustIDFromString("abbaabbaabbaabba")
staticOrgID = platformtesting.MustIDFromString("baabbaabbaabbaab")
}
// StaticOrganizationService connects to Influx via HTTP using tokens to manage organizations.

2
dashboard_test.go
View File

@ -25,7 +25,7 @@ func TestDashboardCell_MarshalJSON(t *testing.T) {
args: args{
cell: platform.DashboardCell{
DashboardCellContents: platform.DashboardCellContents{
ID: platformtesting.MustIDFromString(t, "f01dab1ef005ba11"),
ID: platformtesting.MustIDFromString("f01dab1ef005ba11"),
Name: "hello",
X: 10,
Y: 10,

6
dbrp_mapping_test.go
View File

@ -60,7 +60,7 @@ func TestDBRPMapping_Validate(t *testing.T) {
Cluster: "abc",
Database: "telegraf",
RetentionPolicy: "autogen",
OrganizationID: platformtesting.MustIDFromString(t, "debac1e0deadbeef"),
OrganizationID: platformtesting.MustIDFromString("debac1e0deadbeef"),
},
wantErr: true,
},
@ -94,8 +94,8 @@ func TestDBRPMapping_Validate(t *testing.T) {
Cluster: "12345_.",
Database: "howdy-doody",
RetentionPolicy: "autogen",
OrganizationID: platformtesting.MustIDFromString(t, "debac1e0deadbeef"),
BucketID: platformtesting.MustIDFromString(t, "5ca1ab1edeadbea7"),
OrganizationID: platformtesting.MustIDFromString("debac1e0deadbeef"),
BucketID: platformtesting.MustIDFromString("5ca1ab1edeadbea7"),
},
},
}

4
id_test.go
View File

@ -28,12 +28,12 @@ func TestIDFromString(t *testing.T) {
{
name: "Should be able to decode an all f ID",
id: "ffffffffffffffff",
want: platformtesting.MustIDFromString(t, "ffffffffffffffff"),
want: platformtesting.MustIDFromString("ffffffffffffffff"),
},
{
name: "Should be able to decode an ID",
id: "020f755c3c082000",
want: platformtesting.MustIDFromString(t, "020f755c3c082000"),
want: platformtesting.MustIDFromString("020f755c3c082000"),
},
{
name: "Should not be able to decode a non hex ID",

4
owner_mapping_test.go
View File

@ -21,7 +21,7 @@ func TestOwnerMappingValidate(t *testing.T) {
name: "mapping requires a resourceid",
fields: fields{
Owner: platform.Owner{
ID: platformtesting.MustIDFromString(t, "debac1e0deadbeef"),
ID: platformtesting.MustIDFromString("debac1e0deadbeef"),
},
},
wantErr: true,
@ -29,7 +29,7 @@ func TestOwnerMappingValidate(t *testing.T) {
{
name: "mapping requires an Owner",
fields: fields{
ResourceID: platformtesting.MustIDFromString(t, "debac1e0deadbeef"),
ResourceID: platformtesting.MustIDFromString("debac1e0deadbeef"),
},
wantErr: true,
},

14
query/functions/compspecs/compspecs.go
View File

@ -16,6 +16,7 @@ import (
"github.com/influxdata/platform/query"
"github.com/influxdata/platform/query/influxql"
"github.com/influxdata/platform/query/semantic/semantictest"
platformtesting "github.com/influxdata/platform/testing"
"github.com/google/go-cmp/cmp"
"golang.org/x/text/unicode/norm"
@ -92,22 +93,13 @@ func main() {
var dbrpMappingSvc = mock.NewDBRPMappingService()
func init() {
organizationID, err := platform.IDFromString("aaaaaaaaaaaaaaaa")
if err != nil {
panic(err)
}
bucketID, err := platform.IDFromString("bbbbbbbbbbbbbbbb")
if err != nil {
panic(err)
}
mapping := platform.DBRPMapping{
Cluster: "cluster",
Database: "db",
RetentionPolicy: "rp",
Default: true,
OrganizationID: *organizationID,
BucketID: *bucketID,
OrganizationID: platformtesting.MustIDFromString("aaaaaaaaaaaaaaaa"),
BucketID: platformtesting.MustIDFromString("bbbbbbbbbbbbbbbb"),
}
dbrpMappingSvc.FindByFn = func(ctx context.Context, cluster string, db string, rp string) (*platform.DBRPMapping, error) {
return &mapping, nil

2
query/functions/from_test.go
View File

@ -46,7 +46,7 @@ func TestFrom_NewQuery(t *testing.T) {
{
ID: "from0",
Spec: &functions.FromOpSpec{
BucketID: platformtesting.MustIDFromString(t, "aaaaaaaaaaaaaaaa"),
BucketID: platformtesting.MustIDFromString("aaaaaaaaaaaaaaaa"),
},
},
},

14
query/functions/query_test.go
View File

@ -15,6 +15,7 @@ import (
"github.com/influxdata/platform/query/csv"
"github.com/influxdata/platform/query/influxql"
"github.com/influxdata/platform/query/querytest"
platformtesting "github.com/influxdata/platform/testing"
"github.com/andreyvit/diff"
)
@ -22,22 +23,13 @@ import (
var dbrpMappingSvc = mock.NewDBRPMappingService()
func init() {
orgID, err := platform.IDFromString("cadecadecadecade")
if err != nil {
panic(err)
}
bucketID, err := platform.IDFromString("da7aba5e5eedca5e")
if err != nil {
panic(err)
}
mapping := platform.DBRPMapping{
Cluster: "cluster",
Database: "db0",
RetentionPolicy: "autogen",
Default: true,
OrganizationID: *orgID,
BucketID: *bucketID,
OrganizationID: platformtesting.MustIDFromString("cadecadecadecade"),
BucketID: platformtesting.MustIDFromString("da7aba5e5eedca5e"),
}
dbrpMappingSvc.FindByFn = func(ctx context.Context, cluster string, db string, rp string) (*platform.DBRPMapping, error) {
return &mapping, nil

6
query/influxql/spectests/testing.go
View File

@ -84,9 +84,9 @@ func NewFixture(stmt string, spec *query.Spec) Fixture {
}
func (f *fixture) Run(t *testing.T) {
organizationID = platformtesting.MustIDFromString(t, "aaaaaaaaaaaaaaaa")
bucketID = platformtesting.MustIDFromString(t, "bbbbbbbbbbbbbbbb")
altBucketID = platformtesting.MustIDFromString(t, "cccccccccccccccc")
organizationID = platformtesting.MustIDFromString("aaaaaaaaaaaaaaaa")
bucketID = platformtesting.MustIDFromString("bbbbbbbbbbbbbbbb")
altBucketID = platformtesting.MustIDFromString("cccccccccccccccc")
t.Run(f.stmt, func(t *testing.T) {
if err := f.spec.Validate(); err != nil {

14
query/influxql/transpiler_test.go
View File

@ -9,28 +9,20 @@ import (
"github.com/influxdata/platform/mock"
"github.com/influxdata/platform/query/influxql"
"github.com/influxdata/platform/query/influxql/spectests"
platformtesting "github.com/influxdata/platform/testing"
"github.com/pkg/errors"
)
var dbrpMappingSvc = mock.NewDBRPMappingService()
func init() {
orgID, err := platform.IDFromString("aaaaaaaaaaaaaaaa")
if err != nil {
panic(err)
}
bucketID, err := platform.IDFromString("bbbbbbbbbbbbbbbb")
if err != nil {
panic(err)
}
mapping := platform.DBRPMapping{
Cluster: "cluster",
Database: "db0",
RetentionPolicy: "autogen",
Default: true,
OrganizationID: *orgID,
BucketID: *bucketID,
OrganizationID: platformtesting.MustIDFromString("aaaaaaaaaaaaaaaa"),
BucketID: platformtesting.MustIDFromString("bbbbbbbbbbbbbbbb"),
}
dbrpMappingSvc.FindByFn = func(ctx context.Context, cluster string, db string, rp string) (*platform.DBRPMapping, error) {
return &mapping, nil

16
task/backend/executor/executor_test.go
View File

@ -226,8 +226,8 @@ const testScript = `option task = {
from(bucket: "one") |> toHTTP(url: "http://example.com")`
func testExecutorQuerySuccess(t *testing.T, fn createSysFn) {
var orgID = platformtesting.MustIDFromString(t, "aaaaaaaaaaaaaaaa")
var userID = platformtesting.MustIDFromString(t, "baaaaaaaaaaaaaab")
var orgID = platformtesting.MustIDFromString("aaaaaaaaaaaaaaaa")
var userID = platformtesting.MustIDFromString("baaaaaaaaaaaaaab")
sys := fn()
t.Run(sys.name+"/QuerySuccess", func(t *testing.T) {
tid, err := sys.st.CreateTask(context.Background(), orgID, userID, testScript)
@ -278,8 +278,8 @@ func testExecutorQuerySuccess(t *testing.T, fn createSysFn) {
}
func testExecutorQueryFailure(t *testing.T, fn createSysFn) {
var orgID = platformtesting.MustIDFromString(t, "aaaaaaaaaaaaaaaa")
var userID = platformtesting.MustIDFromString(t, "baaaaaaaaaaaaaab")
var orgID = platformtesting.MustIDFromString("aaaaaaaaaaaaaaaa")
var userID = platformtesting.MustIDFromString("baaaaaaaaaaaaaab")
sys := fn()
t.Run(sys.name+"/QueryFail", func(t *testing.T) {
tid, err := sys.st.CreateTask(context.Background(), orgID, userID, testScript)
@ -306,8 +306,8 @@ func testExecutorQueryFailure(t *testing.T, fn createSysFn) {
}
func testExecutorPromiseCancel(t *testing.T, fn createSysFn) {
var orgID = platformtesting.MustIDFromString(t, "aaaaaaaaaaaaaaaa")
var userID = platformtesting.MustIDFromString(t, "baaaaaaaaaaaaaab")
var orgID = platformtesting.MustIDFromString("aaaaaaaaaaaaaaaa")
var userID = platformtesting.MustIDFromString("baaaaaaaaaaaaaab")
sys := fn()
t.Run(sys.name+"/PromiseCancel", func(t *testing.T) {
tid, err := sys.st.CreateTask(context.Background(), orgID, userID, testScript)
@ -333,8 +333,8 @@ func testExecutorPromiseCancel(t *testing.T, fn createSysFn) {
}
func testExecutorServiceError(t *testing.T, fn createSysFn) {
var orgID = platformtesting.MustIDFromString(t, "aaaaaaaaaaaaaaaa")
var userID = platformtesting.MustIDFromString(t, "baaaaaaaaaaaaaab")
var orgID = platformtesting.MustIDFromString("aaaaaaaaaaaaaaaa")
var userID = platformtesting.MustIDFromString("baaaaaaaaaaaaaab")
sys := fn()
t.Run(sys.name+"/ServiceError", func(t *testing.T) {
tid, err := sys.st.CreateTask(context.Background(), orgID, userID, testScript)

16
task/backend/storetest/logstoretest.go
View File

@ -41,10 +41,10 @@ func updateRunState(t *testing.T, crf CreateRunStoreFunc, drf DestroyRunStoreFun
writer, reader := crf(t)
defer drf(t, writer, reader)
taskID := platformtesting.MustIDFromString(t, "ab01ab01ab01ab01")
taskID := platformtesting.MustIDFromString("ab01ab01ab01ab01")
queuedAt := time.Unix(1, 0)
run := platform.Run{
ID: platformtesting.MustIDFromString(t, "ab02ab02ab02ab02"),
ID: platformtesting.MustIDFromString("ab02ab02ab02ab02"),
Status: "queued",
QueuedAt: queuedAt.Format(time.RFC3339),
}
@ -100,9 +100,9 @@ func runLogTest(t *testing.T, crf CreateRunStoreFunc, drf DestroyRunStoreFunc) {
writer, reader := crf(t)
defer drf(t, writer, reader)
taskID := platformtesting.MustIDFromString(t, "ab01ab01ab01ab01")
taskID := platformtesting.MustIDFromString("ab01ab01ab01ab01")
run := platform.Run{
ID: platformtesting.MustIDFromString(t, "ab02ab02ab02ab02"),
ID: platformtesting.MustIDFromString("ab02ab02ab02ab02"),
Status: "queued",
QueuedAt: time.Now().Format(time.RFC3339),
}
@ -145,7 +145,7 @@ func listRunsTest(t *testing.T, crf CreateRunStoreFunc, drf DestroyRunStoreFunc)
writer, reader := crf(t)
defer drf(t, writer, reader)
taskID := platformtesting.MustIDFromString(t, "ab01ab01ab01ab01")
taskID := platformtesting.MustIDFromString("ab01ab01ab01ab01")
if _, err := reader.ListRuns(context.Background(), platform.RunFilter{Task: &taskID}); err == nil {
t.Fatal("failed to error on bad id")
@ -243,9 +243,9 @@ func findRunByIDTest(t *testing.T, crf CreateRunStoreFunc, drf DestroyRunStoreFu
t.Fatal("failed to error with bad id")
}
taskID := platformtesting.MustIDFromString(t, "ab01ab01ab01ab01")
taskID := platformtesting.MustIDFromString("ab01ab01ab01ab01")
run := platform.Run{
ID: platformtesting.MustIDFromString(t, "ab02ab02ab02ab02"),
ID: platformtesting.MustIDFromString("ab02ab02ab02ab02"),
Status: "queued",
QueuedAt: time.Now().Format(time.RFC3339),
}
@ -279,7 +279,7 @@ func listLogsTest(t *testing.T, crf CreateRunStoreFunc, drf DestroyRunStoreFunc)
writer, reader := crf(t)
defer drf(t, writer, reader)
taskID := platformtesting.MustIDFromString(t, "ab01ab01ab01ab01")
taskID := platformtesting.MustIDFromString("ab01ab01ab01ab01")
if _, err := reader.ListLogs(context.Background(), platform.LogFilter{}); err == nil {
t.Fatal("failed to error with no filter")

174
testing/auth.go
View File

@ -73,7 +73,7 @@ func CreateAuthorization(
Users: []*platform.User{
{
Name: "cooluser",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
},
},
@ -89,8 +89,8 @@ func CreateAuthorization(
wants: wants{
authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
Token: "rand",
User: "cooluser",
Permissions: []platform.Permission{
@ -113,17 +113,17 @@ func CreateAuthorization(
Users: []*platform.User{
{
Name: "cooluser",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
{
Name: "regularuser",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
Authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
Token: "supersecret",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -143,8 +143,8 @@ func CreateAuthorization(
wants: wants{
authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
User: "cooluser",
Token: "supersecret",
Permissions: []platform.Permission{
@ -153,8 +153,8 @@ func CreateAuthorization(
},
},
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
User: "regularuser",
Token: "rand",
Permissions: []platform.Permission{
@ -221,17 +221,17 @@ func FindAuthorizationByID(
Users: []*platform.User{
{
Name: "cooluser",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
{
Name: "regularuser",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
Authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
Token: "rand1",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -239,8 +239,8 @@ func FindAuthorizationByID(
},
},
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
Token: "rand2",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -249,12 +249,12 @@ func FindAuthorizationByID(
},
},
args: args{
id: MustIDFromString(t, authTwoID),
id: MustIDFromString(authTwoID),
},
wants: wants{
authorization: &platform.Authorization{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
User: "regularuser",
Token: "rand2",
Permissions: []platform.Permission{
@ -314,17 +314,17 @@ func FindAuthorizationByToken(
Users: []*platform.User{
{
Name: "cooluser",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
{
Name: "regularuser",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
Authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
Token: "rand1",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -332,8 +332,8 @@ func FindAuthorizationByToken(
},
},
{
ID: MustIDFromString(t, authZeroID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authZeroID),
UserID: MustIDFromString(userOneID),
Token: "rand0",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -341,16 +341,16 @@ func FindAuthorizationByToken(
},
},
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
Token: "rand2",
Permissions: []platform.Permission{
platform.CreateUserPermission,
},
},
{
ID: MustIDFromString(t, authThreeID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authThreeID),
UserID: MustIDFromString(userOneID),
Token: "rand3",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -364,8 +364,8 @@ func FindAuthorizationByToken(
},
wants: wants{
authorization: &platform.Authorization{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
User: "cooluser",
Token: "rand1",
Permissions: []platform.Permission{
@ -428,17 +428,17 @@ func FindAuthorizations(
Users: []*platform.User{
{
Name: "cooluser",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
{
Name: "regularuser",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
Authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
Token: "rand1",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -446,8 +446,8 @@ func FindAuthorizations(
},
},
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
Token: "rand2",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -459,8 +459,8 @@ func FindAuthorizations(
wants: wants{
authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
User: "cooluser",
Token: "rand1",
Permissions: []platform.Permission{
@ -469,8 +469,8 @@ func FindAuthorizations(
},
},
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
User: "regularuser",
Token: "rand2",
Permissions: []platform.Permission{
@ -486,17 +486,17 @@ func FindAuthorizations(
Users: []*platform.User{
{
Name: "cooluser",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
{
Name: "regularuser",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
Authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
Token: "rand1",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -504,16 +504,16 @@ func FindAuthorizations(
},
},
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
Token: "rand2",
Permissions: []platform.Permission{
platform.CreateUserPermission,
},
},
{
ID: MustIDFromString(t, authThreeID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authThreeID),
UserID: MustIDFromString(userOneID),
Token: "rand3",
Permissions: []platform.Permission{
platform.DeleteUserPermission,
@ -522,13 +522,13 @@ func FindAuthorizations(
},
},
args: args{
UserID: MustIDFromString(t, userOneID),
UserID: MustIDFromString(userOneID),
},
wants: wants{
authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
User: "cooluser",
Token: "rand1",
Permissions: []platform.Permission{
@ -537,8 +537,8 @@ func FindAuthorizations(
},
},
{
ID: MustIDFromString(t, authThreeID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authThreeID),
UserID: MustIDFromString(userOneID),
User: "cooluser",
Token: "rand3",
Permissions: []platform.Permission{
@ -554,25 +554,25 @@ func FindAuthorizations(
Users: []*platform.User{
{
Name: "cooluser",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
{
Name: "regularuser",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
Authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authZeroID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authZeroID),
UserID: MustIDFromString(userOneID),
Token: "rand1",
Permissions: []platform.Permission{
platform.DeleteUserPermission,
},
},
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
Token: "rand1",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -580,16 +580,16 @@ func FindAuthorizations(
},
},
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
Token: "rand2",
Permissions: []platform.Permission{
platform.CreateUserPermission,
},
},
{
ID: MustIDFromString(t, authThreeID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authThreeID),
UserID: MustIDFromString(userOneID),
Token: "rand3",
Permissions: []platform.Permission{
platform.DeleteUserPermission,
@ -603,8 +603,8 @@ func FindAuthorizations(
wants: wants{
authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
User: "regularuser",
Token: "rand2",
Permissions: []platform.Permission{
@ -676,17 +676,17 @@ func DeleteAuthorization(
Users: []*platform.User{
{
Name: "cooluser",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
{
Name: "regularuser",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
Authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
Token: "rand1",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -694,8 +694,8 @@ func DeleteAuthorization(
},
},
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
Token: "rand2",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -704,13 +704,13 @@ func DeleteAuthorization(
},
},
args: args{
ID: MustIDFromString(t, authOneID),
ID: MustIDFromString(authOneID),
},
wants: wants{
authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
User: "regularuser",
Token: "rand2",
Permissions: []platform.Permission{
@ -726,17 +726,17 @@ func DeleteAuthorization(
Users: []*platform.User{
{
Name: "cooluser",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
{
Name: "regularuser",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
Authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
Token: "rand1",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -744,8 +744,8 @@ func DeleteAuthorization(
},
},
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
Token: "rand2",
Permissions: []platform.Permission{
platform.CreateUserPermission,
@ -754,14 +754,14 @@ func DeleteAuthorization(
},
},
args: args{
ID: MustIDFromString(t, authThreeID),
ID: MustIDFromString(authThreeID),
},
wants: wants{
err: fmt.Errorf("authorization not found"),
authorizations: []*platform.Authorization{
{
ID: MustIDFromString(t, authOneID),
UserID: MustIDFromString(t, userOneID),
ID: MustIDFromString(authOneID),
UserID: MustIDFromString(userOneID),
User: "cooluser",
Token: "rand1",
Permissions: []platform.Permission{
@ -770,8 +770,8 @@ func DeleteAuthorization(
},
},
{
ID: MustIDFromString(t, authTwoID),
UserID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(authTwoID),
UserID: MustIDFromString(userTwoID),
User: "regularuser",
Token: "rand2",
Permissions: []platform.Permission{

296
testing/bucket_service.go
View File

@ -66,22 +66,22 @@ func CreateBucket(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
},
args: args{
bucket: &platform.Bucket{
Name: "name1",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
},
wants: wants{
buckets: []*platform.Bucket{
{
Name: "name1",
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
},
},
@ -92,46 +92,46 @@ func CreateBucket(
fields: BucketFields{
IDGenerator: &mock.IDGenerator{
IDFn: func() platform.ID {
return MustIDFromString(t, bucketTwoID)
return MustIDFromString(bucketTwoID)
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
ID: MustIDFromString(bucketOneID),
Name: "bucket1",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
},
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
},
args: args{
bucket: &platform.Bucket{
Name: "bucket2",
OrganizationID: MustIDFromString(t, orgTwoID),
OrganizationID: MustIDFromString(orgTwoID),
},
},
wants: wants{
buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
ID: MustIDFromString(bucketOneID),
Name: "bucket1",
Organization: "theorg",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
{
ID: MustIDFromString(t, bucketTwoID),
ID: MustIDFromString(bucketTwoID),
Name: "bucket2",
Organization: "otherorg",
OrganizationID: MustIDFromString(t, orgTwoID),
OrganizationID: MustIDFromString(orgTwoID),
},
},
},
@ -141,24 +141,24 @@ func CreateBucket(
fields: BucketFields{
IDGenerator: &mock.IDGenerator{
IDFn: func() platform.ID {
return MustIDFromString(t, bucketTwoID)
return MustIDFromString(bucketTwoID)
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
ID: MustIDFromString(bucketOneID),
Name: "bucket1",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
},
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
},
@ -171,16 +171,16 @@ func CreateBucket(
wants: wants{
buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
ID: MustIDFromString(bucketOneID),
Name: "bucket1",
Organization: "theorg",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
{
ID: MustIDFromString(t, bucketTwoID),
ID: MustIDFromString(bucketTwoID),
Name: "bucket2",
Organization: "otherorg",
OrganizationID: MustIDFromString(t, orgTwoID),
OrganizationID: MustIDFromString(orgTwoID),
},
},
},
@ -190,40 +190,40 @@ func CreateBucket(
fields: BucketFields{
IDGenerator: &mock.IDGenerator{
IDFn: func() platform.ID {
return MustIDFromString(t, bucketTwoID)
return MustIDFromString(bucketTwoID)
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
ID: MustIDFromString(bucketOneID),
Name: "bucket1",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
},
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
},
args: args{
bucket: &platform.Bucket{
Name: "bucket1",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
},
wants: wants{
buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
ID: MustIDFromString(bucketOneID),
Name: "bucket1",
Organization: "theorg",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
},
err: fmt.Errorf("bucket with name bucket1 already exists"),
@ -234,46 +234,46 @@ func CreateBucket(
fields: BucketFields{
IDGenerator: &mock.IDGenerator{
IDFn: func() platform.ID {
return MustIDFromString(t, bucketTwoID)
return MustIDFromString(bucketTwoID)
},
},
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
ID: MustIDFromString(bucketOneID),
Name: "bucket1",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
},
},
args: args{
bucket: &platform.Bucket{
Name: "bucket1",
OrganizationID: MustIDFromString(t, orgTwoID),
OrganizationID: MustIDFromString(orgTwoID),
},
},
wants: wants{
buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
ID: MustIDFromString(bucketOneID),
Name: "bucket1",
Organization: "theorg",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
{
ID: MustIDFromString(t, bucketTwoID),
ID: MustIDFromString(bucketTwoID),
Name: "bucket1",
Organization: "otherorg",
OrganizationID: MustIDFromString(t, orgTwoID),
OrganizationID: MustIDFromString(orgTwoID),
},
},
},
@ -336,30 +336,30 @@ func FindBucketByID(
fields: BucketFields{
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "bucket1",
},
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgOneID),
Name: "bucket2",
},
},
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
},
args: args{
id: MustIDFromString(t, bucketTwoID),
id: MustIDFromString(bucketTwoID),
},
wants: wants{
bucket: &platform.Bucket{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "bucket2",
},
@ -419,22 +419,22 @@ func FindBuckets(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgTwoID),
Name: "xyz",
},
},
@ -443,14 +443,14 @@ func FindBuckets(
wants: wants{
buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
},
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgTwoID),
Organization: "otherorg",
Name: "xyz",
},
@ -463,27 +463,27 @@ func FindBuckets(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgTwoID),
Name: "xyz",
},
{
ID: MustIDFromString(t, bucketThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketThreeID),
OrganizationID: MustIDFromString(orgOneID),
Name: "123",
},
},
@ -494,14 +494,14 @@ func FindBuckets(
wants: wants{
buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
},
{
ID: MustIDFromString(t, bucketThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketThreeID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "123",
},
@ -514,45 +514,45 @@ func FindBuckets(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgTwoID),
Name: "xyz",
},
{
ID: MustIDFromString(t, bucketThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketThreeID),
OrganizationID: MustIDFromString(orgOneID),
Name: "123",
},
},
},
args: args{
organizationID: MustIDFromString(t, orgOneID),
organizationID: MustIDFromString(orgOneID),
},
wants: wants{
buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
},
{
ID: MustIDFromString(t, bucketThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketThreeID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "123",
},
@ -565,30 +565,30 @@ func FindBuckets(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgOneID),
Name: "xyz",
},
},
},
args: args{
ID: MustIDFromString(t, bucketTwoID),
ID: MustIDFromString(bucketTwoID),
},
wants: wants{
buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "xyz",
},
@ -601,18 +601,18 @@ func FindBuckets(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgOneID),
Name: "xyz",
},
},
@ -623,8 +623,8 @@ func FindBuckets(
wants: wants{
buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "xyz",
},
@ -696,19 +696,19 @@ func DeleteBucket(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Buckets: []*platform.Bucket{
{
Name: "A",
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
},
{
Name: "B",
ID: MustIDFromString(t, bucketThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketThreeID),
OrganizationID: MustIDFromString(orgOneID),
},
},
},
@ -719,8 +719,8 @@ func DeleteBucket(
buckets: []*platform.Bucket{
{
Name: "B",
ID: MustIDFromString(t, bucketThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketThreeID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
},
},
@ -732,19 +732,19 @@ func DeleteBucket(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Buckets: []*platform.Bucket{
{
Name: "A",
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
},
{
Name: "B",
ID: MustIDFromString(t, bucketThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketThreeID),
OrganizationID: MustIDFromString(orgOneID),
},
},
},
@ -756,14 +756,14 @@ func DeleteBucket(
buckets: []*platform.Bucket{
{
Name: "A",
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
},
{
Name: "B",
ID: MustIDFromString(t, bucketThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketThreeID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
},
},
@ -776,7 +776,7 @@ func DeleteBucket(
s, done := init(tt.fields, t)
defer done()
ctx := context.TODO()
err := s.DeleteBucket(ctx, MustIDFromString(t, tt.args.ID))
err := s.DeleteBucket(ctx, MustIDFromString(tt.args.ID))
if (err != nil) != (tt.wants.err != nil) {
t.Fatalf("expected error '%v' got '%v'", tt.wants.err, err)
}
@ -826,30 +826,30 @@ func FindBucket(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgOneID),
Name: "xyz",
},
},
},
args: args{
name: "abc",
organizationID: MustIDFromString(t, orgOneID),
organizationID: MustIDFromString(orgOneID),
},
wants: wants{
bucket: &platform.Bucket{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
},
@ -915,30 +915,30 @@ func UpdateBucket(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "bucket1",
},
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgOneID),
Name: "bucket2",
},
},
},
args: args{
id: MustIDFromString(t, bucketOneID),
id: MustIDFromString(bucketOneID),
name: "changed",
},
wants: wants{
bucket: &platform.Bucket{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "changed",
},
@ -950,30 +950,30 @@ func UpdateBucket(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "bucket1",
},
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgOneID),
Name: "bucket2",
},
},
},
args: args{
id: MustIDFromString(t, bucketOneID),
id: MustIDFromString(bucketOneID),
retention: 100,
},
wants: wants{
bucket: &platform.Bucket{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "bucket1",
RetentionPeriod: 100 * time.Minute,
@ -986,31 +986,31 @@ func UpdateBucket(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Buckets: []*platform.Bucket{
{
ID: MustIDFromString(t, bucketOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "bucket1",
},
{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgOneID),
Name: "bucket2",
},
},
},
args: args{
id: MustIDFromString(t, bucketTwoID),
id: MustIDFromString(bucketTwoID),
retention: 101,
name: "changed",
},
wants: wants{
bucket: &platform.Bucket{
ID: MustIDFromString(t, bucketTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(bucketTwoID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "changed",
RetentionPeriod: 101 * time.Minute,

306
testing/dashboards.go
View File

@ -65,14 +65,14 @@ func CreateDashboard(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
},
args: args{
dashboard: &platform.Dashboard{
Name: "name1",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
Cells: []platform.DashboardCell{
{
DashboardCellContents: platform.DashboardCellContents{
@ -93,13 +93,13 @@ func CreateDashboard(
dashboards: []*platform.Dashboard{
{
Name: "name1",
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Cells: []platform.DashboardCell{
{
DashboardCellContents: platform.DashboardCellContents{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
Name: "hello",
X: 10,
Y: 10,
@ -120,46 +120,46 @@ func CreateDashboard(
fields: DashboardFields{
IDGenerator: &mock.IDGenerator{
IDFn: func() platform.ID {
return MustIDFromString(t, dashTwoID)
return MustIDFromString(dashTwoID)
},
},
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
Name: "dashboard1",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
},
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
},
args: args{
dashboard: &platform.Dashboard{
Name: "dashboard2",
OrganizationID: MustIDFromString(t, orgTwoID),
OrganizationID: MustIDFromString(orgTwoID),
},
},
wants: wants{
dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
Name: "dashboard1",
Organization: "theorg",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
{
ID: MustIDFromString(t, dashTwoID),
ID: MustIDFromString(dashTwoID),
Name: "dashboard2",
Organization: "otherorg",
OrganizationID: MustIDFromString(t, orgTwoID),
OrganizationID: MustIDFromString(orgTwoID),
},
},
},
@ -170,19 +170,19 @@ func CreateDashboard(
IDGenerator: mock.NewIDGenerator(orgTwoID, t),
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
Name: "dashboard1",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
},
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
},
@ -195,16 +195,16 @@ func CreateDashboard(
wants: wants{
dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
Name: "dashboard1",
Organization: "theorg",
OrganizationID: MustIDFromString(t, orgOneID),
OrganizationID: MustIDFromString(orgOneID),
},
{
ID: MustIDFromString(t, dashTwoID),
ID: MustIDFromString(dashTwoID),
Name: "dashboard2",
Organization: "otherorg",
OrganizationID: MustIDFromString(t, orgTwoID),
OrganizationID: MustIDFromString(orgTwoID),
},
},
},
@ -263,30 +263,30 @@ func FindDashboardByID(
fields: DashboardFields{
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "dashboard1",
},
{
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgOneID),
Name: "dashboard2",
},
},
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
},
args: args{
id: MustIDFromString(t, dashTwoID),
id: MustIDFromString(dashTwoID),
},
wants: wants{
dashboard: &platform.Dashboard{
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "dashboard2",
},
@ -343,27 +343,27 @@ func FindDashboardsByOrganizationName(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgTwoID),
Name: "xyz",
},
{
ID: MustIDFromString(t, dashThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashThreeID),
OrganizationID: MustIDFromString(orgOneID),
Name: "123",
},
},
@ -374,14 +374,14 @@ func FindDashboardsByOrganizationName(
wants: wants{
dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
},
{
ID: MustIDFromString(t, dashThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashThreeID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "123",
},
@ -438,45 +438,45 @@ func FindDashboardsByOrganizationID(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgTwoID),
Name: "xyz",
},
{
ID: MustIDFromString(t, dashThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashThreeID),
OrganizationID: MustIDFromString(orgOneID),
Name: "123",
},
},
},
args: args{
organizationID: MustIDFromString(t, orgOneID),
organizationID: MustIDFromString(orgOneID),
},
wants: wants{
dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
},
{
ID: MustIDFromString(t, dashThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashThreeID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "123",
},
@ -538,22 +538,22 @@ func FindDashboards(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgTwoID),
Name: "xyz",
},
},
@ -562,14 +562,14 @@ func FindDashboards(
wants: wants{
dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
},
{
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgTwoID),
Organization: "otherorg",
Name: "xyz",
},
@ -582,27 +582,27 @@ func FindDashboards(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgTwoID),
Name: "xyz",
},
{
ID: MustIDFromString(t, dashThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashThreeID),
OrganizationID: MustIDFromString(orgOneID),
Name: "123",
},
},
@ -613,14 +613,14 @@ func FindDashboards(
wants: wants{
dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
},
{
ID: MustIDFromString(t, dashThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashThreeID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "123",
},
@ -633,45 +633,45 @@ func FindDashboards(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "otherorg",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgTwoID),
Name: "xyz",
},
{
ID: MustIDFromString(t, dashThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashThreeID),
OrganizationID: MustIDFromString(orgOneID),
Name: "123",
},
},
},
args: args{
organizationID: MustIDFromString(t, orgOneID),
organizationID: MustIDFromString(orgOneID),
},
wants: wants{
dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
},
{
ID: MustIDFromString(t, dashThreeID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashThreeID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "123",
},
@ -684,30 +684,30 @@ func FindDashboards(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgOneID),
Name: "xyz",
},
},
},
args: args{
ID: MustIDFromString(t, dashTwoID),
ID: MustIDFromString(dashTwoID),
},
wants: wants{
dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "xyz",
},
@ -776,31 +776,31 @@ func DeleteDashboard(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Dashboards: []*platform.Dashboard{
{
Name: "A",
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
},
{
Name: "B",
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgOneID),
},
},
},
args: args{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
},
wants: wants{
dashboards: []*platform.Dashboard{
{
Name: "B",
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
},
},
@ -812,38 +812,38 @@ func DeleteDashboard(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Dashboards: []*platform.Dashboard{
{
Name: "A",
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
},
{
Name: "B",
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgOneID),
},
},
},
args: args{
ID: MustIDFromString(t, dashThreeID),
ID: MustIDFromString(dashThreeID),
},
wants: wants{
err: fmt.Errorf("dashboard not found"),
dashboards: []*platform.Dashboard{
{
Name: "A",
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
},
{
Name: "B",
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
},
},
@ -906,30 +906,30 @@ func UpdateDashboard(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "dashboard1",
},
{
ID: MustIDFromString(t, dashTwoID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashTwoID),
OrganizationID: MustIDFromString(orgOneID),
Name: "dashboard2",
},
},
},
args: args{
id: MustIDFromString(t, dashOneID),
id: MustIDFromString(dashOneID),
name: "changed",
},
wants: wants{
dashboard: &platform.Dashboard{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "changed",
},
@ -993,19 +993,19 @@ func AddDashboardCell(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
},
},
},
args: args{
dashboardID: MustIDFromString(t, dashOneID),
dashboardID: MustIDFromString(dashOneID),
cell: &platform.DashboardCell{
DashboardCellContents: platform.DashboardCellContents{
Name: "hello",
@ -1022,14 +1022,14 @@ func AddDashboardCell(
wants: wants{
dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
Cells: []platform.DashboardCell{
{
DashboardCellContents: platform.DashboardCellContents{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
Name: "hello",
X: 10,
Y: 10,
@ -1101,18 +1101,18 @@ func RemoveDashboardCell(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
Cells: []platform.DashboardCell{
{
DashboardCellContents: platform.DashboardCellContents{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
Name: "hello",
X: 10,
Y: 10,
@ -1125,7 +1125,7 @@ func RemoveDashboardCell(
},
{
DashboardCellContents: platform.DashboardCellContents{
ID: MustIDFromString(t, dashTwoID),
ID: MustIDFromString(dashTwoID),
Name: "world",
X: 10,
Y: 10,
@ -1138,7 +1138,7 @@ func RemoveDashboardCell(
},
{
DashboardCellContents: platform.DashboardCellContents{
ID: MustIDFromString(t, dashThreeID),
ID: MustIDFromString(dashThreeID),
Name: "bar",
X: 10,
Y: 10,
@ -1154,20 +1154,20 @@ func RemoveDashboardCell(
},
},
args: args{
dashboardID: MustIDFromString(t, dashOneID),
cellID: MustIDFromString(t, dashTwoID),
dashboardID: MustIDFromString(dashOneID),
cellID: MustIDFromString(dashTwoID),
},
wants: wants{
dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
Cells: []platform.DashboardCell{
{
DashboardCellContents: platform.DashboardCellContents{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
Name: "hello",
X: 10,
Y: 10,
@ -1180,7 +1180,7 @@ func RemoveDashboardCell(
},
{
DashboardCellContents: platform.DashboardCellContents{
ID: MustIDFromString(t, dashThreeID),
ID: MustIDFromString(dashThreeID),
Name: "bar",
X: 10,
Y: 10,
@ -1251,18 +1251,18 @@ func ReplaceDashboardCell(
Organizations: []*platform.Organization{
{
Name: "theorg",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
Dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Name: "abc",
Cells: []platform.DashboardCell{
{
DashboardCellContents: platform.DashboardCellContents{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
Name: "hello",
X: 10,
Y: 10,
@ -1278,10 +1278,10 @@ func ReplaceDashboardCell(
},
},
args: args{
dashboardID: MustIDFromString(t, dashOneID),
dashboardID: MustIDFromString(dashOneID),
cell: &platform.DashboardCell{
DashboardCellContents: platform.DashboardCellContents{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
Name: "what",
X: 101,
Y: 102,
@ -1296,14 +1296,14 @@ func ReplaceDashboardCell(
wants: wants{
dashboards: []*platform.Dashboard{
{
ID: MustIDFromString(t, dashOneID),
OrganizationID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(dashOneID),
OrganizationID: MustIDFromString(orgOneID),
Organization: "theorg",
Name: "abc",
Cells: []platform.DashboardCell{
{
DashboardCellContents: platform.DashboardCellContents{
ID: MustIDFromString(t, dashOneID),
ID: MustIDFromString(dashOneID),
Name: "what",
X: 101,
Y: 102,

156
testing/dbrp_mapping.go
View File

@ -91,8 +91,8 @@ func CreateDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
},
wants: wants{
@ -101,8 +101,8 @@ func CreateDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
}},
},
},
@ -114,8 +114,8 @@ func CreateDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
}},
},
args: args{
@ -124,8 +124,8 @@ func CreateDBRPMapping(
Database: "database2",
RetentionPolicy: "retention_policy2",
Default: true,
OrganizationID: MustIDFromString(t, "org2"),
BucketID: MustIDFromString(t, "bucket2"),
OrganizationID: MustIDFromString("org2"),
BucketID: MustIDFromString("bucket2"),
},
},
wants: wants{
@ -135,16 +135,16 @@ func CreateDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
{
Cluster: "cluster2",
Database: "database2",
RetentionPolicy: "retention_policy2",
Default: true,
OrganizationID: MustIDFromString(t, "org2"),
BucketID: MustIDFromString(t, "bucket2"),
OrganizationID: MustIDFromString("org2"),
BucketID: MustIDFromString("bucket2"),
},
},
},
@ -157,8 +157,8 @@ func CreateDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
}},
},
args: args{
@ -167,8 +167,8 @@ func CreateDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
},
wants: wants{
@ -178,8 +178,8 @@ func CreateDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
},
},
@ -192,8 +192,8 @@ func CreateDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
}},
},
args: args{
@ -202,8 +202,8 @@ func CreateDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: true,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
},
wants: wants{
@ -214,8 +214,8 @@ func CreateDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
},
},
@ -277,16 +277,16 @@ func FindDBRPMappings(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
{
Cluster: "cluster2",
Database: "database2",
RetentionPolicy: "retention_policy2",
Default: true,
OrganizationID: MustIDFromString(t, "org2"),
BucketID: MustIDFromString(t, "bucket2"),
OrganizationID: MustIDFromString("org2"),
BucketID: MustIDFromString("bucket2"),
},
},
},
@ -300,16 +300,16 @@ func FindDBRPMappings(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
{
Cluster: "cluster2",
Database: "database2",
RetentionPolicy: "retention_policy2",
Default: true,
OrganizationID: MustIDFromString(t, "org2"),
BucketID: MustIDFromString(t, "bucket2"),
OrganizationID: MustIDFromString("org2"),
BucketID: MustIDFromString("bucket2"),
},
},
},
@ -323,16 +323,16 @@ func FindDBRPMappings(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
{
Cluster: "cluster2",
Database: "database2",
RetentionPolicy: "retention_policy2",
Default: true,
OrganizationID: MustIDFromString(t, "org2"),
BucketID: MustIDFromString(t, "bucket2"),
OrganizationID: MustIDFromString("org2"),
BucketID: MustIDFromString("bucket2"),
},
},
},
@ -348,8 +348,8 @@ func FindDBRPMappings(
Database: "database2",
RetentionPolicy: "retention_policy2",
Default: true,
OrganizationID: MustIDFromString(t, "org2"),
BucketID: MustIDFromString(t, "bucket2"),
OrganizationID: MustIDFromString("org2"),
BucketID: MustIDFromString("bucket2"),
},
},
},
@ -363,16 +363,16 @@ func FindDBRPMappings(
Database: "database",
RetentionPolicy: "retention_policyA",
Default: false,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketA"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketA"),
},
{
Cluster: "cluster",
Database: "database",
RetentionPolicy: "retention_policyB",
Default: true,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketB"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketB"),
},
},
},
@ -390,8 +390,8 @@ func FindDBRPMappings(
Database: "database",
RetentionPolicy: "retention_policyB",
Default: true,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketB"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketB"),
},
},
},
@ -453,16 +453,16 @@ func FindDBRPMappingByKey(
Database: "database",
RetentionPolicy: "retention_policyA",
Default: false,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketA"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketA"),
},
{
Cluster: "cluster",
Database: "database",
RetentionPolicy: "retention_policyB",
Default: false,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketB"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketB"),
},
},
},
@ -477,8 +477,8 @@ func FindDBRPMappingByKey(
Database: "database",
RetentionPolicy: "retention_policyB",
Default: false,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketB"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketB"),
},
},
},
@ -491,8 +491,8 @@ func FindDBRPMappingByKey(
Database: "database",
RetentionPolicy: "retention_policyA",
Default: false,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketA"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketA"),
},
},
},
@ -560,16 +560,16 @@ func FindDBRPMapping(
Database: "database",
RetentionPolicy: "retention_policyA",
Default: false,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketA"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketA"),
},
{
Cluster: "cluster",
Database: "database",
RetentionPolicy: "retention_policyB",
Default: false,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketB"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketB"),
},
},
},
@ -586,8 +586,8 @@ func FindDBRPMapping(
Database: "database",
RetentionPolicy: "retention_policyB",
Default: false,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketB"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketB"),
},
},
},
@ -600,16 +600,16 @@ func FindDBRPMapping(
Database: "database",
RetentionPolicy: "retention_policyA",
Default: false,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketA"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketA"),
},
{
Cluster: "cluster",
Database: "database",
RetentionPolicy: "retention_policyB",
Default: true,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketB"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketB"),
},
},
},
@ -626,8 +626,8 @@ func FindDBRPMapping(
Database: "database",
RetentionPolicy: "retention_policyB",
Default: true,
OrganizationID: MustIDFromString(t, "org"),
BucketID: MustIDFromString(t, "bucketB"),
OrganizationID: MustIDFromString("org"),
BucketID: MustIDFromString("bucketB"),
},
},
},
@ -685,16 +685,16 @@ func DeleteDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
{
Cluster: "cluster2",
Database: "database2",
RetentionPolicy: "retention_policy2",
Default: true,
OrganizationID: MustIDFromString(t, "org2"),
BucketID: MustIDFromString(t, "bucket2"),
OrganizationID: MustIDFromString("org2"),
BucketID: MustIDFromString("bucket2"),
},
},
},
@ -709,8 +709,8 @@ func DeleteDBRPMapping(
Database: "database2",
RetentionPolicy: "retention_policy2",
Default: true,
OrganizationID: MustIDFromString(t, "org2"),
BucketID: MustIDFromString(t, "bucket2"),
OrganizationID: MustIDFromString("org2"),
BucketID: MustIDFromString("bucket2"),
}},
},
},
@ -723,16 +723,16 @@ func DeleteDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
{
Cluster: "cluster2",
Database: "database2",
RetentionPolicy: "retention_policy2",
Default: true,
OrganizationID: MustIDFromString(t, "org2"),
BucketID: MustIDFromString(t, "bucket2"),
OrganizationID: MustIDFromString("org2"),
BucketID: MustIDFromString("bucket2"),
},
},
},
@ -748,16 +748,16 @@ func DeleteDBRPMapping(
Database: "database1",
RetentionPolicy: "retention_policy1",
Default: false,
OrganizationID: MustIDFromString(t, "org1"),
BucketID: MustIDFromString(t, "bucket1"),
OrganizationID: MustIDFromString("org1"),
BucketID: MustIDFromString("bucket1"),
},
{
Cluster: "cluster2",
Database: "database2",
RetentionPolicy: "retention_policy2",
Default: true,
OrganizationID: MustIDFromString(t, "org2"),
BucketID: MustIDFromString(t, "bucket2"),
OrganizationID: MustIDFromString("org2"),
BucketID: MustIDFromString("bucket2"),
},
},
},

72
testing/organization_service.go
View File

@ -70,7 +70,7 @@ func CreateOrganization(
organizations: []*platform.Organization{
{
Name: "name1",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
},
},
@ -81,7 +81,7 @@ func CreateOrganization(
IDGenerator: mock.NewIDGenerator(orgTwoID, t),
Organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "organization1",
},
},
@ -94,11 +94,11 @@ func CreateOrganization(
wants: wants{
organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "organization1",
},
{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
Name: "organization2",
},
},
@ -110,7 +110,7 @@ func CreateOrganization(
IDGenerator: mock.NewIDGenerator(orgTwoID, t),
Organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "organization1",
},
},
@ -123,7 +123,7 @@ func CreateOrganization(
wants: wants{
organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "organization1",
},
},
@ -188,21 +188,21 @@ func FindOrganizationByID(
fields: OrganizationFields{
Organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "organization1",
},
{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
Name: "organization2",
},
},
},
args: args{
id: MustIDFromString(t, orgTwoID),
id: MustIDFromString(orgTwoID),
},
wants: wants{
organization: &platform.Organization{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
Name: "organization2",
},
},
@ -258,11 +258,11 @@ func FindOrganizations(
fields: OrganizationFields{
Organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
Name: "xyz",
},
},
@ -271,11 +271,11 @@ func FindOrganizations(
wants: wants{
organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
Name: "xyz",
},
},
@ -286,22 +286,22 @@ func FindOrganizations(
fields: OrganizationFields{
Organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
Name: "xyz",
},
},
},
args: args{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
wants: wants{
organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
Name: "xyz",
},
},
@ -312,11 +312,11 @@ func FindOrganizations(
fields: OrganizationFields{
Organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
Name: "xyz",
},
},
@ -327,7 +327,7 @@ func FindOrganizations(
wants: wants{
organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
Name: "xyz",
},
},
@ -392,11 +392,11 @@ func DeleteOrganization(
Organizations: []*platform.Organization{
{
Name: "orgA",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "orgB",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
},
@ -407,7 +407,7 @@ func DeleteOrganization(
organizations: []*platform.Organization{
{
Name: "orgB",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
},
@ -418,11 +418,11 @@ func DeleteOrganization(
Organizations: []*platform.Organization{
{
Name: "orgA",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "orgB",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
},
@ -434,11 +434,11 @@ func DeleteOrganization(
organizations: []*platform.Organization{
{
Name: "orgA",
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
},
{
Name: "orgB",
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
},
},
},
@ -450,7 +450,7 @@ func DeleteOrganization(
s, done := init(tt.fields, t)
defer done()
ctx := context.TODO()
err := s.DeleteOrganization(ctx, MustIDFromString(t, tt.args.ID))
err := s.DeleteOrganization(ctx, MustIDFromString(tt.args.ID))
if (err != nil) != (tt.wants.err != nil) {
t.Fatalf("expected error '%v' got '%v'", tt.wants.err, err)
}
@ -498,11 +498,11 @@ func FindOrganization(
fields: OrganizationFields{
Organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
Name: "xyz",
},
},
@ -512,7 +512,7 @@ func FindOrganization(
},
wants: wants{
organization: &platform.Organization{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "abc",
},
},
@ -572,22 +572,22 @@ func UpdateOrganization(
fields: OrganizationFields{
Organizations: []*platform.Organization{
{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "organization1",
},
{
ID: MustIDFromString(t, orgTwoID),
ID: MustIDFromString(orgTwoID),
Name: "organization2",
},
},
},
args: args{
id: MustIDFromString(t, orgOneID),
id: MustIDFromString(orgOneID),
name: "changed",
},
wants: wants{
organization: &platform.Organization{
ID: MustIDFromString(t, orgOneID),
ID: MustIDFromString(orgOneID),
Name: "changed",
},
},

76
testing/user_service.go
View File

@ -71,7 +71,7 @@ func CreateUser(
users: []*platform.User{
{
Name: "name1",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
},
},
@ -82,7 +82,7 @@ func CreateUser(
IDGenerator: mock.NewIDGenerator(userTwoID, t),
Users: []*platform.User{
{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "user1",
},
},
@ -95,11 +95,11 @@ func CreateUser(
wants: wants{
users: []*platform.User{
{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "user1",
},
{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
Name: "user2",
},
},
@ -110,12 +110,12 @@ func CreateUser(
fields: UserFields{
IDGenerator: &mock.IDGenerator{
IDFn: func() platform.ID {
return MustIDFromString(t, userOneID)
return MustIDFromString(userOneID)
},
},
Users: []*platform.User{
{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "user1",
},
},
@ -128,7 +128,7 @@ func CreateUser(
wants: wants{
users: []*platform.User{
{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "user1",
},
},
@ -193,21 +193,21 @@ func FindUserByID(
fields: UserFields{
Users: []*platform.User{
{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "user1",
},
{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
Name: "user2",
},
},
},
args: args{
id: MustIDFromString(t, userTwoID),
id: MustIDFromString(userTwoID),
},
wants: wants{
user: &platform.User{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
Name: "user2",
},
},
@ -263,11 +263,11 @@ func FindUsers(
fields: UserFields{
Users: []*platform.User{
{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
Name: "xyz",
},
},
@ -276,11 +276,11 @@ func FindUsers(
wants: wants{
users: []*platform.User{
{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
Name: "xyz",
},
},
@ -291,22 +291,22 @@ func FindUsers(
fields: UserFields{
Users: []*platform.User{
{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
Name: "xyz",
},
},
},
args: args{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
wants: wants{
users: []*platform.User{
{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
Name: "xyz",
},
},
@ -317,11 +317,11 @@ func FindUsers(
fields: UserFields{
Users: []*platform.User{
{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
Name: "xyz",
},
},
@ -332,7 +332,7 @@ func FindUsers(
wants: wants{
users: []*platform.User{
{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
Name: "xyz",
},
},
@ -397,22 +397,22 @@ func DeleteUser(
Users: []*platform.User{
{
Name: "orgA",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
{
Name: "orgB",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
},
args: args{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
wants: wants{
users: []*platform.User{
{
Name: "orgB",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
},
@ -423,27 +423,27 @@ func DeleteUser(
Users: []*platform.User{
{
Name: "orgA",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
{
Name: "orgB",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
},
args: args{
ID: MustIDFromString(t, userThreeID),
ID: MustIDFromString(userThreeID),
},
wants: wants{
err: fmt.Errorf("user not found"),
users: []*platform.User{
{
Name: "orgA",
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
},
{
Name: "orgB",
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
},
},
},
@ -503,11 +503,11 @@ func FindUser(
fields: UserFields{
Users: []*platform.User{
{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "abc",
},
{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
Name: "xyz",
},
},
@ -517,7 +517,7 @@ func FindUser(
},
wants: wants{
user: &platform.User{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "abc",
},
},
@ -577,22 +577,22 @@ func UpdateUser(
fields: UserFields{
Users: []*platform.User{
{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "user1",
},
{
ID: MustIDFromString(t, userTwoID),
ID: MustIDFromString(userTwoID),
Name: "user2",
},
},
},
args: args{
id: MustIDFromString(t, userOneID),
id: MustIDFromString(userOneID),
name: "changed",
},
wants: wants{
user: &platform.User{
ID: MustIDFromString(t, userOneID),
ID: MustIDFromString(userOneID),
Name: "changed",
},
},

6
testing/util.go
View File

@ -1,16 +1,14 @@
package testing
import (
"testing"
"github.com/influxdata/platform"
)
// MustIDFromString is an helper to ensure a correct ID is built during testing.
func MustIDFromString(t *testing.T, s string) platform.ID {
func MustIDFromString(s string) platform.ID {
id, err := platform.IDFromString(s)
if err != nil {
t.Fatal(err)
panic(err)
}
return *id
}