From 2be3928de6d6db812b256f92008b88f4b98b40c6 Mon Sep 17 00:00:00 2001 From: Nikolay Date: Tue, 8 Dec 2020 18:59:43 +0800 Subject: [PATCH] test cleanup --- charts/charts_test.go | 115 +++++++++++++++++++++--------------------- charts/svg_test.go | 95 +++++----------------------------- 2 files changed, 72 insertions(+), 138 deletions(-) diff --git a/charts/charts_test.go b/charts/charts_test.go index 816b800..84b3a74 100644 --- a/charts/charts_test.go +++ b/charts/charts_test.go @@ -1,73 +1,74 @@ -package charts +package charts_test import ( - "fmt" "image/color" "os" "testing" + "github.com/nikolaydubina/calendarheatmap/charts" "github.com/nikolaydubina/calendarheatmap/colorscales" ) -func save(t *testing.T, conf HeatmapConfig, filename string) { +var counts map[string]int = map[string]int{ + "2020-05-17": 13, + "2020-05-18": 5, + "2020-05-19": 8, + "2020-05-20": 5, + "2020-05-21": 5, + "2020-05-22": 3, + "2020-05-23": 5, + "2020-05-24": 6, + "2020-05-25": 3, + "2020-05-26": 5, + "2020-05-27": 8, + "2020-05-28": 2, + "2020-05-29": 2, + "2020-05-30": 8, + "2020-05-31": 5, + "2020-06-01": 1, + "2020-06-02": 3, + "2020-06-03": 1, + "2020-06-04": 3, + "2020-06-05": 1, + "2020-06-06": 3, + "2020-06-07": 5, + "2020-06-09": 1, + "2020-06-10": 2, + "2020-06-12": 9, + "2020-06-13": 7, + "2020-06-14": 4, + "2020-06-15": 1, + "2020-06-17": 1, + "2020-06-20": 2, + "2020-06-21": 1, + "2020-06-23": 2, + "2020-06-24": 2, + "2020-06-25": 3, + "2020-06-26": 3, + "2020-06-27": 2, + "2020-06-28": 1, + "2020-06-29": 1, + "2020-06-30": 2, +} + +func save(t *testing.T, conf charts.HeatmapConfig, filename string) { f, err := os.Create(filename) if err != nil { - t.Errorf(fmt.Errorf("can not save: %w", err).Error()) + t.Errorf(err.Error()) } - if err := WriteHeatmap(conf, f); err != nil { - t.Errorf(fmt.Errorf("can not save output: %w", err).Error()) + if err := charts.WriteHeatmap(conf, f); err != nil { + t.Errorf(err.Error()) } if err := f.Close(); err != nil { - t.Errorf(fmt.Errorf("can not close: %w", err).Error()) + t.Errorf(err.Error()) } } func TestBasicData(t *testing.T) { os.Setenv("CALENDAR_HEATMAP_ASSETS_PATH", "assets") - counts := map[string]int{ - "2020-05-17": 13, - "2020-05-18": 5, - "2020-05-19": 8, - "2020-05-20": 5, - "2020-05-21": 5, - "2020-05-22": 3, - "2020-05-23": 5, - "2020-05-24": 6, - "2020-05-25": 3, - "2020-05-26": 5, - "2020-05-27": 8, - "2020-05-28": 2, - "2020-05-29": 2, - "2020-05-30": 8, - "2020-05-31": 5, - "2020-06-01": 1, - "2020-06-02": 3, - "2020-06-03": 1, - "2020-06-04": 3, - "2020-06-05": 1, - "2020-06-06": 3, - "2020-06-07": 5, - "2020-06-09": 1, - "2020-06-10": 2, - "2020-06-12": 9, - "2020-06-13": 7, - "2020-06-14": 4, - "2020-06-15": 1, - "2020-06-17": 1, - "2020-06-20": 2, - "2020-06-21": 1, - "2020-06-23": 2, - "2020-06-24": 2, - "2020-06-25": 3, - "2020-06-26": 3, - "2020-06-27": 2, - "2020-06-28": 1, - "2020-06-29": 1, - "2020-06-30": 2, - } t.Run("basic", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: counts, ColorScale: colorscales.PuBu9, DrawMonthSeparator: true, @@ -84,7 +85,7 @@ func TestBasicData(t *testing.T) { }) t.Run("colorscale_1", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: counts, ColorScale: colorscales.GnBu9, DrawMonthSeparator: true, @@ -101,7 +102,7 @@ func TestBasicData(t *testing.T) { }) t.Run("colorscale_2", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: counts, ColorScale: colorscales.YlGn9, DrawMonthSeparator: true, @@ -118,7 +119,7 @@ func TestBasicData(t *testing.T) { }) t.Run("korean", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: counts, ColorScale: colorscales.PuBu9, DrawMonthSeparator: true, @@ -136,7 +137,7 @@ func TestBasicData(t *testing.T) { }) t.Run("no separator", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: counts, ColorScale: colorscales.PuBu9, DrawMonthSeparator: false, @@ -153,7 +154,7 @@ func TestBasicData(t *testing.T) { }) t.Run("no labels", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: counts, ColorScale: colorscales.PuBu9, DrawMonthSeparator: true, @@ -170,7 +171,7 @@ func TestBasicData(t *testing.T) { }) t.Run("no separator, no labels", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: counts, ColorScale: colorscales.PuBu9, DrawMonthSeparator: false, @@ -187,7 +188,7 @@ func TestBasicData(t *testing.T) { }) t.Run("empty data", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: counts, ColorScale: colorscales.PuBu9, DrawMonthSeparator: true, @@ -204,7 +205,7 @@ func TestBasicData(t *testing.T) { }) t.Run("nil data", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: counts, ColorScale: colorscales.PuBu9, DrawMonthSeparator: true, diff --git a/charts/svg_test.go b/charts/svg_test.go index babfd3e..e3f1653 100644 --- a/charts/svg_test.go +++ b/charts/svg_test.go @@ -1,131 +1,64 @@ -package charts +package charts_test import ( - "fmt" "image/color" - "os" "testing" + "github.com/nikolaydubina/calendarheatmap/charts" "github.com/nikolaydubina/calendarheatmap/colorscales" ) -func saveSVG(t *testing.T, conf HeatmapConfig, filename string) { - f, err := os.Create(filename) - if err != nil { - t.Errorf(fmt.Errorf("can not save: %w", err).Error()) - } - writeSVG(conf, f) - if err := f.Close(); err != nil { - t.Errorf(fmt.Errorf("can not close: %w", err).Error()) - } -} - func TestBasicDataSVG(t *testing.T) { - os.Setenv("CALENDAR_HEATMAP_ASSETS_PATH", "assets") - counts := map[string]int{ - "2020-05-17": 13, - "2020-05-18": 5, - "2020-05-19": 8, - "2020-05-20": 5, - "2020-05-21": 5, - "2020-05-22": 3, - "2020-05-23": 5, - "2020-05-24": 6, - "2020-05-25": 3, - "2020-05-26": 5, - "2020-05-27": 8, - "2020-05-28": 2, - "2020-05-29": 2, - "2020-05-30": 8, - "2020-05-31": 5, - "2020-06-01": 1, - "2020-06-02": 3, - "2020-06-03": 1, - "2020-06-04": 3, - "2020-06-05": 1, - "2020-06-06": 3, - "2020-06-07": 5, - "2020-06-09": 1, - "2020-06-10": 2, - "2020-06-12": 9, - "2020-06-13": 7, - "2020-06-14": 4, - "2020-06-15": 1, - "2020-06-17": 1, - "2020-06-20": 2, - "2020-06-21": 1, - "2020-06-23": 2, - "2020-06-24": 2, - "2020-06-25": 3, - "2020-06-26": 3, - "2020-06-27": 2, - "2020-06-28": 1, - "2020-06-29": 1, - "2020-06-30": 2, - } - t.Run("basic", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: counts, ColorScale: colorscales.PuBu9, DrawMonthSeparator: true, DrawLabels: true, - Margin: 30, - BoxSize: 150, - TextWidthLeft: 350, - TextHeightTop: 200, TextColor: color.RGBA{100, 100, 100, 255}, BorderColor: color.RGBA{200, 200, 200, 255}, + Format: "svg", } - saveSVG(t, conf, "testdata/basic.svg") + save(t, conf, "testdata/basic.svg") }) t.Run("korean", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: counts, ColorScale: colorscales.PuBu9, DrawMonthSeparator: true, DrawLabels: true, - Margin: 30, - BoxSize: 150, - TextWidthLeft: 350, - TextHeightTop: 200, TextColor: color.RGBA{100, 100, 100, 255}, BorderColor: color.RGBA{200, 200, 200, 255}, Locale: "ko_KR", + Format: "svg", } - saveSVG(t, conf, "testdata/korean.svg") + save(t, conf, "testdata/korean.svg") }) t.Run("empty data", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: map[string]int{}, ColorScale: colorscales.PuBu9, DrawMonthSeparator: true, DrawLabels: false, - Margin: 30, - BoxSize: 150, - TextWidthLeft: 350, - TextHeightTop: 200, TextColor: color.RGBA{100, 100, 100, 255}, BorderColor: color.RGBA{200, 200, 200, 255}, + Format: "svg", } - saveSVG(t, conf, "testdata/empty_data.svg") + save(t, conf, "testdata/empty_data.svg") }) t.Run("nil data", func(t *testing.T) { - conf := HeatmapConfig{ + conf := charts.HeatmapConfig{ Counts: nil, ColorScale: colorscales.PuBu9, DrawMonthSeparator: true, DrawLabels: false, - Margin: 30, - BoxSize: 150, - TextWidthLeft: 350, - TextHeightTop: 200, TextColor: color.RGBA{100, 100, 100, 255}, BorderColor: color.RGBA{200, 200, 200, 255}, + Format: "svg", } - saveSVG(t, conf, "testdata/nil_data.svg") + save(t, conf, "testdata/nil_data.svg") }) }