From 3ddc6c866f8e4020a5a0e35c0fd8a95af4fdf529 Mon Sep 17 00:00:00 2001 From: Roland Schilter Date: Thu, 29 Jun 2017 14:16:04 +0200 Subject: [PATCH] Remove unnecessary fixture dependency of tests --- render/detailed/links_test.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/render/detailed/links_test.go b/render/detailed/links_test.go index f17f4d9a9..5bb4e3704 100644 --- a/render/detailed/links_test.go +++ b/render/detailed/links_test.go @@ -6,52 +6,53 @@ import ( "github.com/weaveworks/scope/probe/docker" "github.com/weaveworks/scope/render/detailed" "github.com/weaveworks/scope/report" - "github.com/weaveworks/scope/test/fixture" "github.com/stretchr/testify/assert" ) +var ( + sampleReport = report.Report{} + samplePodNode = report.MakeNode("noo").WithTopology(report.Pod) + sampleUnknownNode = report.MakeNode("???").WithTopology("foo") +) + func TestNodeMetricLinks_DefaultDisabled(t *testing.T) { - links := detailed.NodeMetricLinks(fixture.Report, fixture.Report.Pod.Nodes[fixture.ClientPodNodeID]) + links := detailed.NodeMetricLinks(sampleReport, samplePodNode) assert.Nil(t, links) } func TestNodeMetricLinks_UnknownTopology(t *testing.T) { detailed.SetMetricsGraphURL("/foo") - node := report.MakeNode("foo").WithTopology("bar") - links := detailed.NodeMetricLinks(report.Report{}, node) + links := detailed.NodeMetricLinks(sampleReport, sampleUnknownNode) assert.Nil(t, links) } func TestNodeMetricLinks(t *testing.T) { detailed.SetMetricsGraphURL("/foo") defer detailed.SetMetricsGraphURL("") - node := fixture.Report.Pod.Nodes[fixture.ClientPodNodeID] expected := []detailed.MetricLink{ {ID: docker.CPUTotalUsage, Label: "CPU", Priority: 1, URL: ""}, {ID: docker.MemoryUsage, Label: "Memory", Priority: 2, URL: ""}, } - links := detailed.NodeMetricLinks(fixture.Report, node) + links := detailed.NodeMetricLinks(sampleReport, samplePodNode) assert.Equal(t, expected, links) } func TestRenderMetricLinks_UnknownTopology(t *testing.T) { summary := detailed.NodeSummary{} - node := report.MakeNode("foo").WithTopology("bar") - result := detailed.RenderMetricLinks(summary, node) + result := detailed.RenderMetricLinks(summary, sampleUnknownNode) assert.Equal(t, summary, result) } func TestRenderMetricLinks_Pod(t *testing.T) { detailed.SetMetricsGraphURL("/prom/:orgID/notebook/new") defer detailed.SetMetricsGraphURL("") - node := fixture.Report.Pod.Nodes[fixture.ClientPodNodeID] - summary := detailed.NodeSummary{Label: "woo", MetricLinks: detailed.NodeMetricLinks(fixture.Report, node)} + summary := detailed.NodeSummary{Label: "woo", MetricLinks: detailed.NodeMetricLinks(sampleReport, samplePodNode)} - result := detailed.RenderMetricLinks(summary, node) + result := detailed.RenderMetricLinks(summary, samplePodNode) assert.Equal(t, "/prom/:orgID/notebook/new/%7B%22cells%22:%5B%7B%22queries%22:%5B%22sum%28rate%28container_cpu_usage_seconds_total%7Bpod_name=%5C%22woo%5C%22%7D%5B1m%5D%29%29%22%5D%7D%5D%7D", result.MetricLinks[0].URL) @@ -63,10 +64,9 @@ func TestRenderMetricLinks_Pod(t *testing.T) { func TestRenderMetricLinks_QueryReplacement(t *testing.T) { detailed.SetMetricsGraphURL("/foo/:orgID/bar?q=:query") defer detailed.SetMetricsGraphURL("") - node := fixture.Report.Pod.Nodes[fixture.ClientPodNodeID] - summary := detailed.NodeSummary{Label: "boo", MetricLinks: detailed.NodeMetricLinks(fixture.Report, node)} + summary := detailed.NodeSummary{Label: "boo", MetricLinks: detailed.NodeMetricLinks(sampleReport, samplePodNode)} - result := detailed.RenderMetricLinks(summary, node) + result := detailed.RenderMetricLinks(summary, samplePodNode) assert.Equal(t, "/foo/:orgID/bar?q=sum%28rate%28container_cpu_usage_seconds_total%7Bpod_name=%22boo%22%7D%5B1m%5D%29%29", result.MetricLinks[0].URL)