From f5b37d0886936fb6f8de7778e93e7148bd2a0069 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Sun, 17 Feb 2019 14:34:29 -0500 Subject: [PATCH 1/2] Fix summary iota --- flags_test.go | 2 +- testjson/summary.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flags_test.go b/flags_test.go index 488b0371..20ebdf54 100644 --- a/flags_test.go +++ b/flags_test.go @@ -8,7 +8,7 @@ import ( func TestNoSummaryValue_SetAndString(t *testing.T) { t.Run("none", func(t *testing.T) { - assert.Equal(t, newNoSummaryValue().String(), "") + assert.Equal(t, newNoSummaryValue().String(), "none") }) t.Run("one", func(t *testing.T) { value := newNoSummaryValue() diff --git a/testjson/summary.go b/testjson/summary.go index 814e3839..a8e501bb 100644 --- a/testjson/summary.go +++ b/testjson/summary.go @@ -16,8 +16,8 @@ type Summary int // nolint: golint const ( - SummarizeNone Summary = 1 << (iota * 2) - SummarizeSkipped + SummarizeNone Summary = 0 + SummarizeSkipped Summary = (1 << iota) / 2 SummarizeFailed SummarizeErrors SummarizeOutput @@ -45,7 +45,7 @@ func (s Summary) String() string { return "none" } var result []string - for v := SummarizeNone; v <= s; v = v << 1 { + for v := Summary(1); v <= s; v = v << 1 { if s.Includes(v) { result = append(result, summaryValues[v]) } From c96a20aa9b67482c561299b753ffca27f2a2c9db Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Sun, 17 Feb 2019 14:52:57 -0500 Subject: [PATCH 2/2] Rename printer.go to format.go To be more consistent with terminology --- testjson/{printer.go => format.go} | 0 testjson/{printer_test.go => format_test.go} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename testjson/{printer.go => format.go} (100%) rename testjson/{printer_test.go => format_test.go} (100%) diff --git a/testjson/printer.go b/testjson/format.go similarity index 100% rename from testjson/printer.go rename to testjson/format.go diff --git a/testjson/printer_test.go b/testjson/format_test.go similarity index 100% rename from testjson/printer_test.go rename to testjson/format_test.go