From 38678aebb5ab0dc96c7fe8edc22d2e74153e5ee3 Mon Sep 17 00:00:00 2001 From: mario rodriguez Date: Thu, 10 Oct 2019 11:58:11 +0200 Subject: [PATCH] Improve testing --- prometheusvanilla/builders_test.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/prometheusvanilla/builders_test.go b/prometheusvanilla/builders_test.go index 0af61eb..1e8b904 100644 --- a/prometheusvanilla/builders_test.go +++ b/prometheusvanilla/builders_test.go @@ -23,6 +23,7 @@ var ( bucketsTag reflect.StructTag = `name:"some_name" help:"some help for the metric" buckets:"0.001,0.005,0.01,0.05,0.1,0.5,1,5,10"` maxAgeTag reflect.StructTag = `name:"some_name" help:"some help for the metric" max_age:"1h"` objectivesTag reflect.StructTag = `name:"some_name" help:"some help for the metric" max_age:"1h" objectives:"0.55,0.95,0.98"` + objectivesMalformedTag reflect.StructTag = `name:"some_name" help:"some help for the metric" max_age:"1h" objectives:"this,will,fail"` expectedBuckets = []float64{0.001, 0.005, 0.01, 0.05, 0.1, 0.5, 1, 5, 10} expectedMaxAge = time.Hour expectedObjectives = map[float64]float64{0.55: 0.045, 0.95: 0.005, 0.98: 0.002} @@ -88,12 +89,12 @@ func TestMaxAge(t *testing.T) { t.Run("Test it retrieves custom max_age", func(t *testing.T) { maxAge, err := maxAgeFromTag(maxAgeTag) assert.NoError(t, err) - assert.Equal(t, maxAge, expectedMaxAge) + assert.Equal(t, expectedMaxAge, maxAge) }) t.Run("Test it returns 0 when no max_age is found", func(t *testing.T) { maxAge, err := maxAgeFromTag(defaultTag) assert.NoError(t, err) - assert.Equal(t, maxAge, time.Duration(0)) + assert.Equal(t, time.Duration(0), maxAge) }) } @@ -101,12 +102,17 @@ func TestObjectives(t *testing.T) { t.Run("Test parsing objectives from tag", func(t *testing.T) { obj, err := objectivesFromTag(objectivesTag) assert.NoError(t, err) - assert.Equal(t, obj, expectedObjectives) + assert.Equal(t, expectedObjectives, obj) }) t.Run("Test returning default objective values when none are specified", func(t *testing.T) { obj, err := objectivesFromTag(defaultTag) assert.NoError(t, err) - assert.Equal(t, obj, DefaultObjectives()) + assert.Equal(t, DefaultObjectives(), obj) + }) + t.Run("Test returning default objective values when none are specified", func(t *testing.T) { + obj, err := objectivesFromTag(objectivesMalformedTag) + assert.Error(t, err) + assert.Nil(t, obj) }) }