fix(testing): use MustIDFromString for platform.IDs
Signed-off-by: Leonardo Di Donato <leodidonato@gmail.com> Co-Authored-By: Lorenzo Fontana <lo@linux.com>pull/10616/head
parent
f5dfe0aecc
commit
ef7007f40c
|
@ -61,13 +61,13 @@ func CreateView(
|
|||
fields: ViewFields{
|
||||
IDGenerator: &mock.IDGenerator{
|
||||
IDFn: func() platform.ID {
|
||||
return idFromString(t, viewTwoID)
|
||||
return MustIDFromString(viewTwoID)
|
||||
},
|
||||
},
|
||||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
},
|
||||
|
@ -88,14 +88,14 @@ func CreateView(
|
|||
views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
Properties: platform.EmptyViewProperties{},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -161,14 +161,14 @@ func FindViewByID(
|
|||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
Properties: platform.EmptyViewProperties{},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -179,12 +179,12 @@ func FindViewByID(
|
|||
},
|
||||
},
|
||||
args: args{
|
||||
id: idFromString(t, viewTwoID),
|
||||
id: MustIDFromString(viewTwoID),
|
||||
},
|
||||
wants: wants{
|
||||
view: &platform.View{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -246,14 +246,14 @@ func FindViews(
|
|||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
Properties: platform.EmptyViewProperties{},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -268,14 +268,14 @@ func FindViews(
|
|||
views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
Properties: platform.EmptyViewProperties{},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -292,14 +292,14 @@ func FindViews(
|
|||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
Properties: platform.EmptyViewProperties{},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -310,13 +310,13 @@ func FindViews(
|
|||
},
|
||||
},
|
||||
args: args{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
},
|
||||
wants: wants{
|
||||
views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -336,7 +336,7 @@ func FindViews(
|
|||
ctx := context.TODO()
|
||||
|
||||
filter := platform.ViewFilter{}
|
||||
if tt.args.ID != nil {
|
||||
if tt.args.ID.Valid() {
|
||||
filter.ID = &tt.args.ID
|
||||
}
|
||||
|
||||
|
@ -383,14 +383,14 @@ func DeleteView(
|
|||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
Properties: platform.EmptyViewProperties{},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -401,13 +401,13 @@ func DeleteView(
|
|||
},
|
||||
},
|
||||
args: args{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
},
|
||||
wants: wants{
|
||||
views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -424,14 +424,14 @@ func DeleteView(
|
|||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
Properties: platform.EmptyViewProperties{},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -442,21 +442,21 @@ func DeleteView(
|
|||
},
|
||||
},
|
||||
args: args{
|
||||
ID: idFromString(t, viewThreeID),
|
||||
ID: MustIDFromString(viewThreeID),
|
||||
},
|
||||
wants: wants{
|
||||
err: fmt.Errorf("View not found"),
|
||||
views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
Properties: platform.EmptyViewProperties{},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -524,14 +524,14 @@ func UpdateView(
|
|||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
Properties: platform.EmptyViewProperties{},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -542,13 +542,13 @@ func UpdateView(
|
|||
},
|
||||
},
|
||||
args: args{
|
||||
id: idFromString(t, viewOneID),
|
||||
id: MustIDFromString(viewOneID),
|
||||
name: "changed",
|
||||
},
|
||||
wants: wants{
|
||||
view: &platform.View{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "changed",
|
||||
},
|
||||
Properties: platform.EmptyViewProperties{},
|
||||
|
@ -561,14 +561,14 @@ func UpdateView(
|
|||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
Properties: platform.EmptyViewProperties{},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewTwoID),
|
||||
ID: MustIDFromString(viewTwoID),
|
||||
Name: "view2",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
@ -579,7 +579,7 @@ func UpdateView(
|
|||
},
|
||||
},
|
||||
args: args{
|
||||
id: idFromString(t, viewOneID),
|
||||
id: MustIDFromString(viewOneID),
|
||||
properties: platform.TableViewProperties{
|
||||
Type: "table",
|
||||
TimeFormat: "rfc3339",
|
||||
|
@ -588,7 +588,7 @@ func UpdateView(
|
|||
wants: wants{
|
||||
view: &platform.View{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, viewOneID),
|
||||
ID: MustIDFromString(viewOneID),
|
||||
Name: "view1",
|
||||
},
|
||||
Properties: platform.TableViewProperties{
|
||||
|
|
|
@ -115,12 +115,12 @@ func CreateDashboard(
|
|||
fields: DashboardFields{
|
||||
IDGenerator: &mock.IDGenerator{
|
||||
IDFn: func() platform.ID {
|
||||
return idFromString(t, dashTwoID)
|
||||
return MustIDFromString(dashTwoID)
|
||||
},
|
||||
},
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
},
|
||||
},
|
||||
|
@ -133,11 +133,11 @@ func CreateDashboard(
|
|||
wants: wants{
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
Name: "dashboard2",
|
||||
},
|
||||
},
|
||||
|
@ -198,29 +198,29 @@ func AddDashboardCell(
|
|||
fields: DashboardFields{
|
||||
IDGenerator: &mock.IDGenerator{
|
||||
IDFn: func() platform.ID {
|
||||
return idFromString(t, dashTwoID)
|
||||
return MustIDFromString(dashTwoID)
|
||||
},
|
||||
},
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
dashboardID: idFromString(t, dashOneID),
|
||||
dashboardID: MustIDFromString(dashOneID),
|
||||
cell: &platform.Cell{},
|
||||
},
|
||||
wants: wants{
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
Cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ViewID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
ViewID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -281,21 +281,21 @@ func FindDashboardByID(
|
|||
fields: DashboardFields{
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
Name: "dashboard2",
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
id: idFromString(t, dashTwoID),
|
||||
id: MustIDFromString(dashTwoID),
|
||||
},
|
||||
wants: wants{
|
||||
dashboard: &platform.Dashboard{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
Name: "dashboard2",
|
||||
},
|
||||
},
|
||||
|
@ -351,11 +351,11 @@ func FindDashboards(
|
|||
fields: DashboardFields{
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "abc",
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
Name: "xyz",
|
||||
},
|
||||
},
|
||||
|
@ -364,11 +364,11 @@ func FindDashboards(
|
|||
wants: wants{
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "abc",
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
Name: "xyz",
|
||||
},
|
||||
},
|
||||
|
@ -379,24 +379,24 @@ func FindDashboards(
|
|||
fields: DashboardFields{
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "abc",
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
Name: "xyz",
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
IDs: []*platform.ID{
|
||||
idPtr(idFromString(t, dashTwoID)),
|
||||
idPtr(MustIDFromString(dashTwoID)),
|
||||
},
|
||||
},
|
||||
wants: wants{
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
Name: "xyz",
|
||||
},
|
||||
},
|
||||
|
@ -407,29 +407,29 @@ func FindDashboards(
|
|||
fields: DashboardFields{
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "abc",
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
Name: "xyz",
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
IDs: []*platform.ID{
|
||||
idPtr(idFromString(t, dashOneID)),
|
||||
idPtr(idFromString(t, dashTwoID)),
|
||||
idPtr(MustIDFromString(dashOneID)),
|
||||
idPtr(MustIDFromString(dashTwoID)),
|
||||
},
|
||||
},
|
||||
wants: wants{
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "abc",
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
Name: "xyz",
|
||||
},
|
||||
},
|
||||
|
@ -491,22 +491,22 @@ func DeleteDashboard(
|
|||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
Name: "A",
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
},
|
||||
{
|
||||
Name: "B",
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
},
|
||||
wants: wants{
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
Name: "B",
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -517,27 +517,27 @@ func DeleteDashboard(
|
|||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
Name: "A",
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
},
|
||||
{
|
||||
Name: "B",
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
ID: idFromString(t, dashThreeID),
|
||||
ID: MustIDFromString(dashThreeID),
|
||||
},
|
||||
wants: wants{
|
||||
err: fmt.Errorf("dashboard not found"),
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
Name: "A",
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
},
|
||||
{
|
||||
Name: "B",
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -598,22 +598,22 @@ func UpdateDashboard(
|
|||
fields: DashboardFields{
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
Name: "dashboard2",
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
id: idFromString(t, dashOneID),
|
||||
id: MustIDFromString(dashOneID),
|
||||
name: "changed",
|
||||
},
|
||||
wants: wants{
|
||||
dashboard: &platform.Dashboard{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "changed",
|
||||
},
|
||||
},
|
||||
|
@ -674,20 +674,20 @@ func RemoveDashboardCell(
|
|||
fields: DashboardFields{
|
||||
IDGenerator: &mock.IDGenerator{
|
||||
IDFn: func() platform.ID {
|
||||
return idFromString(t, dashTwoID)
|
||||
return MustIDFromString(dashTwoID)
|
||||
},
|
||||
},
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
Cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ViewID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
ViewID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -695,23 +695,23 @@ func RemoveDashboardCell(
|
|||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
dashboardID: idFromString(t, dashOneID),
|
||||
cellID: idFromString(t, dashTwoID),
|
||||
dashboardID: MustIDFromString(dashOneID),
|
||||
cellID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
wants: wants{
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
Cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -777,41 +777,41 @@ func UpdateDashboardCell(
|
|||
fields: DashboardFields{
|
||||
IDGenerator: &mock.IDGenerator{
|
||||
IDFn: func() platform.ID {
|
||||
return idFromString(t, dashTwoID)
|
||||
return MustIDFromString(dashTwoID)
|
||||
},
|
||||
},
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
Cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
dashboardID: idFromString(t, dashOneID),
|
||||
cellID: idFromString(t, dashTwoID),
|
||||
dashboardID: MustIDFromString(dashOneID),
|
||||
cellID: MustIDFromString(dashTwoID),
|
||||
x: 10,
|
||||
},
|
||||
wants: wants{
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
Cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
X: 10,
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -886,49 +886,49 @@ func ReplaceDashboardCells(
|
|||
fields: DashboardFields{
|
||||
IDGenerator: &mock.IDGenerator{
|
||||
IDFn: func() platform.ID {
|
||||
return idFromString(t, dashTwoID)
|
||||
return MustIDFromString(dashTwoID)
|
||||
},
|
||||
},
|
||||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
},
|
||||
},
|
||||
},
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
Cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ViewID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
ViewID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ViewID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
ViewID: MustIDFromString(dashOneID),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
dashboardID: idFromString(t, dashOneID),
|
||||
dashboardID: MustIDFromString(dashOneID),
|
||||
cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ViewID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
ViewID: MustIDFromString(dashTwoID),
|
||||
X: 10,
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ViewID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
ViewID: MustIDFromString(dashOneID),
|
||||
Y: 11,
|
||||
},
|
||||
},
|
||||
|
@ -936,17 +936,17 @@ func ReplaceDashboardCells(
|
|||
wants: wants{
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
Cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ViewID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
ViewID: MustIDFromString(dashTwoID),
|
||||
X: 10,
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ViewID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
ViewID: MustIDFromString(dashOneID),
|
||||
Y: 11,
|
||||
},
|
||||
},
|
||||
|
@ -959,40 +959,40 @@ func ReplaceDashboardCells(
|
|||
fields: DashboardFields{
|
||||
IDGenerator: &mock.IDGenerator{
|
||||
IDFn: func() platform.ID {
|
||||
return idFromString(t, dashTwoID)
|
||||
return MustIDFromString(dashTwoID)
|
||||
},
|
||||
},
|
||||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
Cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ViewID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
ViewID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
dashboardID: idFromString(t, dashOneID),
|
||||
dashboardID: MustIDFromString(dashOneID),
|
||||
cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ViewID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
ViewID: MustIDFromString(dashTwoID),
|
||||
X: 10,
|
||||
},
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ViewID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
ViewID: MustIDFromString(dashOneID),
|
||||
Y: 11,
|
||||
},
|
||||
},
|
||||
|
@ -1001,12 +1001,12 @@ func ReplaceDashboardCells(
|
|||
err: fmt.Errorf("cannot replace cells that were not already present"),
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
Cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ViewID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
ViewID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -1018,40 +1018,40 @@ func ReplaceDashboardCells(
|
|||
fields: DashboardFields{
|
||||
IDGenerator: &mock.IDGenerator{
|
||||
IDFn: func() platform.ID {
|
||||
return idFromString(t, dashTwoID)
|
||||
return MustIDFromString(dashTwoID)
|
||||
},
|
||||
},
|
||||
Views: []*platform.View{
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
{
|
||||
ViewContents: platform.ViewContents{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
},
|
||||
},
|
||||
},
|
||||
Dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
Cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ViewID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
ViewID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
dashboardID: idFromString(t, dashOneID),
|
||||
dashboardID: MustIDFromString(dashOneID),
|
||||
cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ViewID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
ViewID: MustIDFromString(dashOneID),
|
||||
X: 10,
|
||||
},
|
||||
},
|
||||
|
@ -1060,12 +1060,12 @@ func ReplaceDashboardCells(
|
|||
err: fmt.Errorf("cannot update view id in replace"),
|
||||
dashboards: []*platform.Dashboard{
|
||||
{
|
||||
ID: idFromString(t, dashOneID),
|
||||
ID: MustIDFromString(dashOneID),
|
||||
Name: "dashboard1",
|
||||
Cells: []*platform.Cell{
|
||||
{
|
||||
ID: idFromString(t, dashTwoID),
|
||||
ViewID: idFromString(t, dashTwoID),
|
||||
ID: MustIDFromString(dashTwoID),
|
||||
ViewID: MustIDFromString(dashTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
@ -73,12 +73,12 @@ func CreateSource(
|
|||
{
|
||||
Name: "autogen",
|
||||
Type: "self",
|
||||
ID: idFromString(t, defaultSourceID),
|
||||
ID: MustIDFromString(defaultSourceID),
|
||||
Default: true,
|
||||
},
|
||||
{
|
||||
Name: "name1",
|
||||
ID: idFromString(t, sourceOneID),
|
||||
ID: MustIDFromString(sourceOneID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -139,17 +139,17 @@ func FindSourceByID(
|
|||
Sources: []*platform.Source{
|
||||
{
|
||||
Name: "name1",
|
||||
ID: idFromString(t, sourceOneID),
|
||||
ID: MustIDFromString(sourceOneID),
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
id: idFromString(t, sourceOneID),
|
||||
id: MustIDFromString(sourceOneID),
|
||||
},
|
||||
wants: wants{
|
||||
source: &platform.Source{
|
||||
Name: "name1",
|
||||
ID: idFromString(t, sourceOneID),
|
||||
ID: MustIDFromString(sourceOneID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -160,13 +160,13 @@ func FindSourceByID(
|
|||
Sources: []*platform.Source{},
|
||||
},
|
||||
args: args{
|
||||
id: idFromString(t, defaultSourceID),
|
||||
id: MustIDFromString(defaultSourceID),
|
||||
},
|
||||
wants: wants{
|
||||
source: &platform.Source{
|
||||
Name: "autogen",
|
||||
Type: "self",
|
||||
ID: idFromString(t, defaultSourceID),
|
||||
ID: MustIDFromString(defaultSourceID),
|
||||
Default: true,
|
||||
},
|
||||
},
|
||||
|
@ -222,11 +222,11 @@ func FindSources(
|
|||
Sources: []*platform.Source{
|
||||
{
|
||||
Name: "name1",
|
||||
ID: idFromString(t, sourceOneID),
|
||||
ID: MustIDFromString(sourceOneID),
|
||||
},
|
||||
{
|
||||
Name: "name2",
|
||||
ID: idFromString(t, sourceTwoID),
|
||||
ID: MustIDFromString(sourceTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -236,16 +236,16 @@ func FindSources(
|
|||
{
|
||||
Name: "autogen",
|
||||
Type: "self",
|
||||
ID: idFromString(t, defaultSourceID),
|
||||
ID: MustIDFromString(defaultSourceID),
|
||||
Default: true,
|
||||
},
|
||||
{
|
||||
Name: "name1",
|
||||
ID: idFromString(t, sourceOneID),
|
||||
ID: MustIDFromString(sourceOneID),
|
||||
},
|
||||
{
|
||||
Name: "name2",
|
||||
ID: idFromString(t, sourceTwoID),
|
||||
ID: MustIDFromString(sourceTwoID),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -301,19 +301,19 @@ func DeleteSource(
|
|||
Sources: []*platform.Source{
|
||||
{
|
||||
Name: "name1",
|
||||
ID: idFromString(t, sourceOneID),
|
||||
ID: MustIDFromString(sourceOneID),
|
||||
},
|
||||
},
|
||||
},
|
||||
args: args{
|
||||
id: idFromString(t, sourceOneID),
|
||||
id: MustIDFromString(sourceOneID),
|
||||
},
|
||||
wants: wants{
|
||||
sources: []*platform.Source{
|
||||
{
|
||||
Name: "autogen",
|
||||
Type: "self",
|
||||
ID: idFromString(t, defaultSourceID),
|
||||
ID: MustIDFromString(defaultSourceID),
|
||||
Default: true,
|
||||
},
|
||||
},
|
||||
|
@ -326,7 +326,7 @@ func DeleteSource(
|
|||
Sources: []*platform.Source{},
|
||||
},
|
||||
args: args{
|
||||
id: idFromString(t, defaultSourceID),
|
||||
id: MustIDFromString(defaultSourceID),
|
||||
},
|
||||
wants: wants{
|
||||
err: fmt.Errorf("cannot delete autogen source"),
|
||||
|
@ -334,7 +334,7 @@ func DeleteSource(
|
|||
{
|
||||
Name: "autogen",
|
||||
Type: "self",
|
||||
ID: idFromString(t, defaultSourceID),
|
||||
ID: MustIDFromString(defaultSourceID),
|
||||
Default: true,
|
||||
},
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue