From c12e25a68d32c910fce7b41963de0ca843f1e2c0 Mon Sep 17 00:00:00 2001 From: Lu Fengqi Date: Wed, 29 Apr 2020 13:52:14 +0800 Subject: [PATCH] pkg/chart/chart_test.go: refactor the chart1 and chart2 setup code in a separate function Signed-off-by: Lu Fengqi --- pkg/chart/chart_test.go | 68 +++++++++++------------------------------ 1 file changed, 17 insertions(+), 51 deletions(-) diff --git a/pkg/chart/chart_test.go b/pkg/chart/chart_test.go index d0da38769..7ac5573c8 100644 --- a/pkg/chart/chart_test.go +++ b/pkg/chart/chart_test.go @@ -97,41 +97,31 @@ func TestMetadata(t *testing.T) { is.Equal(nil, chrt.Validate()) } -func TestRoot(t *testing.T) { - chrt1 := Chart{ - parent: &Chart{ +func newTestFixtureCharts() (*Chart, *Chart) { + return &Chart{ + parent: &Chart{ + Metadata: &Metadata{ + Name: "foo", + }, + }, + }, &Chart{ Metadata: &Metadata{ Name: "foo", }, - }, - } + } +} - chrt2 := Chart{ - Metadata: &Metadata{ - Name: "foo", - }, - } +func TestRoot(t *testing.T) { + chrt1, chrt2 := newTestFixtureCharts() is := assert.New(t) - is.Equal(&chrt2, chrt1.Root()) - is.Equal(&chrt2, chrt2.Root()) + is.Equal(chrt2, chrt1.Root()) + is.Equal(chrt2, chrt2.Root()) } func TestIsRoot(t *testing.T) { - chrt1 := Chart{ - parent: &Chart{ - Metadata: &Metadata{ - Name: "foo", - }, - }, - } - - chrt2 := Chart{ - Metadata: &Metadata{ - Name: "foo", - }, - } + chrt1, chrt2 := newTestFixtureCharts() is := assert.New(t) @@ -140,19 +130,7 @@ func TestIsRoot(t *testing.T) { } func TestChartPath(t *testing.T) { - chrt1 := Chart{ - parent: &Chart{ - Metadata: &Metadata{ - Name: "foo", - }, - }, - } - - chrt2 := Chart{ - Metadata: &Metadata{ - Name: "foo", - }, - } + chrt1, chrt2 := newTestFixtureCharts() is := assert.New(t) @@ -161,19 +139,7 @@ func TestChartPath(t *testing.T) { } func TestChartFullPath(t *testing.T) { - chrt1 := Chart{ - parent: &Chart{ - Metadata: &Metadata{ - Name: "foo", - }, - }, - } - - chrt2 := Chart{ - Metadata: &Metadata{ - Name: "foo", - }, - } + chrt1, chrt2 := newTestFixtureCharts() is := assert.New(t)