From 4e1c6f0934d67c1a0220a7cf8df40958306d35f5 Mon Sep 17 00:00:00 2001 From: Roland Schilter Date: Mon, 14 Aug 2017 18:40:55 +0100 Subject: [PATCH] Update tests to new code --- app/api_report_test.go | 2 +- app/api_topologies_test.go | 4 ++-- render/detailed/node_test.go | 8 ++++---- render/detailed/summary.go | 4 +--- render/detailed/summary_test.go | 6 +++--- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/api_report_test.go b/app/api_report_test.go index c1da6f800..1d7bd2b69 100644 --- a/app/api_report_test.go +++ b/app/api_report_test.go @@ -14,7 +14,7 @@ import ( func topologyServer() *httptest.Server { router := mux.NewRouter().SkipClean(true) - app.RegisterTopologyRoutes(router, app.StaticCollector(fixture.Report), map[string]bool{"foo_capability": true}, "") + app.RegisterTopologyRoutes(router, app.StaticCollector(fixture.Report), map[string]bool{"foo_capability": true}) return httptest.NewServer(router) } diff --git a/app/api_topologies_test.go b/app/api_topologies_test.go index 71c690639..cb2fa6efe 100644 --- a/app/api_topologies_test.go +++ b/app/api_topologies_test.go @@ -183,14 +183,14 @@ func getTestContainerLabelFilterTopologySummary(t *testing.T, exclude bool) (det return nil, err } - return detailed.Summaries(fixture.Report, renderer.Render(fixture.Report, decorator), ""), nil + return detailed.Summaries(report.RenderContext{Report: fixture.Report}, renderer.Render(fixture.Report, decorator)), nil } func TestAPITopologyAddsKubernetes(t *testing.T) { router := mux.NewRouter() c := app.NewCollector(1 * time.Minute) app.RegisterReportPostHandler(c, router) - app.RegisterTopologyRoutes(router, c, map[string]bool{"foo_capability": true}, "") + app.RegisterTopologyRoutes(router, c, map[string]bool{"foo_capability": true}) ts := httptest.NewServer(router) defer ts.Close() diff --git a/render/detailed/node_test.go b/render/detailed/node_test.go index b61229759..19fca09b6 100644 --- a/render/detailed/node_test.go +++ b/render/detailed/node_test.go @@ -18,7 +18,7 @@ import ( ) func child(t *testing.T, r render.Renderer, id string) detailed.NodeSummary { - s, ok := detailed.MakeNodeSummary(fixture.Report, r.Render(fixture.Report, nil)[id], "") + s, ok := detailed.MakeNodeSummary(report.RenderContext{Report: fixture.Report}, r.Render(fixture.Report, nil)[id]) if !ok { t.Fatalf("Expected node %s to be summarizable, but wasn't", id) } @@ -32,7 +32,7 @@ func connectionID(nodeID string, addr string) string { func TestMakeDetailedHostNode(t *testing.T) { renderableNodes := render.HostRenderer.Render(fixture.Report, nil) renderableNode := renderableNodes[fixture.ClientHostNodeID] - have := detailed.MakeNode("hosts", fixture.Report, renderableNodes, renderableNode, "") + have := detailed.MakeNode("hosts", report.RenderContext{Report: fixture.Report}, renderableNodes, renderableNode) containerImageNodeSummary := child(t, render.ContainerImageRenderer, expected.ClientContainerImageNodeID) containerNodeSummary := child(t, render.ContainerRenderer, fixture.ClientContainerNodeID) @@ -183,7 +183,7 @@ func TestMakeDetailedContainerNode(t *testing.T) { if !ok { t.Fatalf("Node not found: %s", id) } - have := detailed.MakeNode("containers", fixture.Report, renderableNodes, renderableNode, "") + have := detailed.MakeNode("containers", report.RenderContext{Report: fixture.Report}, renderableNodes, renderableNode) serverProcessNodeSummary := child(t, render.ProcessRenderer, fixture.ServerProcessNodeID) serverProcessNodeSummary.Linkable = true @@ -313,7 +313,7 @@ func TestMakeDetailedPodNode(t *testing.T) { if !ok { t.Fatalf("Node not found: %s", id) } - have := detailed.MakeNode("pods", fixture.Report, renderableNodes, renderableNode, "") + have := detailed.MakeNode("pods", report.RenderContext{Report: fixture.Report}, renderableNodes, renderableNode) containerNodeSummary := child(t, render.ContainerWithImageNameRenderer, fixture.ServerContainerNodeID) serverProcessNodeSummary := child(t, render.ProcessRenderer, fixture.ServerProcessNodeID) diff --git a/render/detailed/summary.go b/render/detailed/summary.go index 58f0cec32..6f0e508ae 100644 --- a/render/detailed/summary.go +++ b/render/detailed/summary.go @@ -135,7 +135,7 @@ func (n NodeSummary) SummarizeMetrics() NodeSummary { func baseNodeSummary(r report.Report, n report.Node) NodeSummary { t, _ := r.Topology(n.Topology) - ns := NodeSummary{ + return NodeSummary{ ID: n.ID, Shape: t.GetShape(), Linkable: true, @@ -145,8 +145,6 @@ func baseNodeSummary(r report.Report, n report.Node) NodeSummary { Tables: NodeTables(r, n), Adjacency: n.Adjacency, } - - return ns } func pseudoNodeSummary(base NodeSummary, n report.Node) (NodeSummary, bool) { diff --git a/render/detailed/summary_test.go b/render/detailed/summary_test.go index 4bf843bc4..1065a7ee3 100644 --- a/render/detailed/summary_test.go +++ b/render/detailed/summary_test.go @@ -21,7 +21,7 @@ import ( func TestSummaries(t *testing.T) { { // Just a convenient source of some rendered nodes - have := detailed.Summaries(fixture.Report, render.ProcessRenderer.Render(fixture.Report, nil), "") + have := detailed.Summaries(report.RenderContext{Report: fixture.Report}, render.ProcessRenderer.Render(fixture.Report, nil)) // The ids of the processes rendered above expectedIDs := []string{ fixture.ClientProcess1NodeID, @@ -51,7 +51,7 @@ func TestSummaries(t *testing.T) { input := fixture.Report.Copy() input.Process.Nodes[fixture.ClientProcess1NodeID].Metrics[process.CPUUsage] = metric - have := detailed.Summaries(input, render.ProcessRenderer.Render(input, nil), "") + have := detailed.Summaries(report.RenderContext{Report: input}, render.ProcessRenderer.Render(input, nil)) node, ok := have[fixture.ClientProcess1NodeID] if !ok { @@ -184,7 +184,7 @@ func TestMakeNodeSummary(t *testing.T) { }, } for _, testcase := range testcases { - have, ok := detailed.MakeNodeSummary(fixture.Report, testcase.input, "") + have, ok := detailed.MakeNodeSummary(report.RenderContext{Report: fixture.Report}, testcase.input) if ok != testcase.ok { t.Errorf("%s: MakeNodeSummary failed: expected ok value to be: %v", testcase.name, testcase.ok) continue