Tests in alphabetical order.

counter_test.go

@@ -2,49 +2,49 @@ package metrics
 
 import "testing"
 
-func TestCounterZero(t *testing.T) {
+func TestCounterClear(t *testing.T) {
 	c := NewCounter()
+	c.Inc(1)
+	c.Clear()
 	if count := c.Count(); 0 != count {
 		t.Errorf("c.Count(): 0 != %v\n", count)
 	}
 }
 
-func TestCounterInc1(t *testing.T) {
+func TestCounterDec1(t *testing.T) {
 	c := NewCounter()
-	c.Inc(1)
-	if count := c.Count(); 1 != count {
-		t.Errorf("c.Count(): 1 != %v\n", count)
+	c.Dec(1)
+	if count := c.Count(); -1 != count {
+		t.Errorf("c.Count(): -1 != %v\n", count)
 	}
 }
 
-func TestCounterInc12(t *testing.T) {
+func TestCounterDec2(t *testing.T) {
 	c := NewCounter()
-	c.Inc(12)
-	if count := c.Count(); 12 != count {
-		t.Errorf("c.Count(): 12 != %v\n", count)
+	c.Dec(2)
+	if count := c.Count(); -2 != count {
+		t.Errorf("c.Count(): -2 != %v\n", count)
 	}
 }
 
-func TestCounterDec1(t *testing.T) {
+func TestCounterInc1(t *testing.T) {
 	c := NewCounter()
-	c.Dec(1)
-	if count := c.Count(); -1 != count {
-		t.Errorf("c.Count(): -1 != %v\n", count)
+	c.Inc(1)
+	if count := c.Count(); 1 != count {
+		t.Errorf("c.Count(): 1 != %v\n", count)
 	}
 }
 
-func TestCounterDec12(t *testing.T) {
+func TestCounterInc2(t *testing.T) {
 	c := NewCounter()
-	c.Dec(12)
-	if count := c.Count(); -12 != count {
-		t.Errorf("c.Count(): -12 != %v\n", count)
+	c.Inc(2)
+	if count := c.Count(); 2 != count {
+		t.Errorf("c.Count(): 2 != %v\n", count)
 	}
 }
 
-func TestCounterClear(t *testing.T) {
+func TestCounterZero(t *testing.T) {
 	c := NewCounter()
-	c.Inc(3)
-	c.Clear()
 	if count := c.Count(); 0 != count {
 		t.Errorf("c.Count(): 0 != %v\n", count)
 	}

histogram_test.go

@@ -9,35 +9,6 @@ func BenchmarkHistogram(b *testing.B) {
 	}
 }
 
-func TestEmptyHistogram(t *testing.T) {
-	h := NewHistogram(NewUniformSample(100))
-	if count := h.Count(); 0 != count {
-		t.Errorf("h.Count(): 0 != %v\n", count)
-	}
-	if min := h.Min(); 0 != min {
-		t.Errorf("h.Min(): 0 != %v\n", min)
-	}
-	if max := h.Max(); 0 != max {
-		t.Errorf("h.Max(): 0 != %v\n", max)
-	}
-	if mean := h.Mean(); 0.0 != mean {
-		t.Errorf("h.Mean(): 0.0 != %v\n", mean)
-	}
-	if stdDev := h.StdDev(); 0.0 != stdDev {
-		t.Errorf("h.StdDev(): 0.0 != %v\n", stdDev)
-	}
-	ps := h.Percentiles([]float64{0.5, 0.75, 0.99})
-	if 0.0 != ps[0] {
-		t.Errorf("median: 0.0 != %v\n", ps[0])
-	}
-	if 0.0 != ps[1] {
-		t.Errorf("75th percentile: 0.0 != %v\n", ps[1])
-	}
-	if 0.0 != ps[2] {
-		t.Errorf("99th percentile: 0.0 != %v\n", ps[2])
-	}
-}
-
 func TestHistogram10000(t *testing.T) {
 	h := NewHistogram(NewUniformSample(100000))
 	for i := 1; i <= 10000; i++ {
@@ -69,3 +40,32 @@ func TestHistogram10000(t *testing.T) {
 		t.Errorf("99th percentile: 9900.99 != %v\n", ps[2])
 	}
 }
+
+func TestHistogramEmpty(t *testing.T) {
+	h := NewHistogram(NewUniformSample(100))
+	if count := h.Count(); 0 != count {
+		t.Errorf("h.Count(): 0 != %v\n", count)
+	}
+	if min := h.Min(); 0 != min {
+		t.Errorf("h.Min(): 0 != %v\n", min)
+	}
+	if max := h.Max(); 0 != max {
+		t.Errorf("h.Max(): 0 != %v\n", max)
+	}
+	if mean := h.Mean(); 0.0 != mean {
+		t.Errorf("h.Mean(): 0.0 != %v\n", mean)
+	}
+	if stdDev := h.StdDev(); 0.0 != stdDev {
+		t.Errorf("h.StdDev(): 0.0 != %v\n", stdDev)
+	}
+	ps := h.Percentiles([]float64{0.5, 0.75, 0.99})
+	if 0.0 != ps[0] {
+		t.Errorf("median: 0.0 != %v\n", ps[0])
+	}
+	if 0.0 != ps[1] {
+		t.Errorf("75th percentile: 0.0 != %v\n", ps[1])
+	}
+	if 0.0 != ps[2] {
+		t.Errorf("99th percentile: 0.0 != %v\n", ps[2])
+	}
+}

meter_test.go

@@ -5,21 +5,6 @@ import (
 	"time"
 )
 
-func TestMeterZero(t *testing.T) {
-	m := NewMeter()
-	if count := m.Count(); 0 != count {
-		t.Errorf("m.Count(): 0 != %v\n", count)
-	}
-}
-
-func TestMeterNonzero(t *testing.T) {
-	m := NewMeter()
-	m.Mark(3)
-	if count := m.Count(); 3 != count {
-		t.Errorf("m.Count(): 3 != %v\n", count)
-	}
-}
-
 func TestMeterDecay(t *testing.T) {
 	m := &StandardMeter{
 		make(chan int64),
@@ -34,3 +19,18 @@ func TestMeterDecay(t *testing.T) {
 		t.Error("m.RateMean() didn't decrease")
 	}
 }
+
+func TestMeterNonzero(t *testing.T) {
+	m := NewMeter()
+	m.Mark(3)
+	if count := m.Count(); 3 != count {
+		t.Errorf("m.Count(): 3 != %v\n", count)
+	}
+}
+
+func TestMeterZero(t *testing.T) {
+	m := NewMeter()
+	if count := m.Count(); 0 != count {
+		t.Errorf("m.Count(): 0 != %v\n", count)
+	}
+}

sample_test.go

@@ -90,24 +90,18 @@ func TestExpDecaySample1000(t *testing.T) {
 // effectively freezing the set of samples until a rescale step happens.
 func TestExpDecaySampleNanosecondRegression(t *testing.T) {
 	s := NewExpDecaySample(100, 0.99)
-
 	for i := 0; i < 100; i++ {
 		s.Update(10)
 	}
-
 	time.Sleep(1 * time.Millisecond)
-
 	for i := 0; i < 100; i++ {
 		s.Update(20)
 	}
-
 	v := s.Values()
 	avg := float64(0)
-
 	for i := 0; i < len(v); i++ {
 		avg += float64(v[i])
 	}
-
 	avg /= float64(len(v))
 	if avg > 16 || avg < 14 {
 		t.Errorf("out of range [14, 16]: %v\n", avg)
@@ -154,12 +148,10 @@ func TestUniformSampleIncludesTail(t *testing.T) {
 }
 
 func benchmarkSample(b *testing.B, s Sample) {
-	b.StopTimer()
 	var memStats runtime.MemStats
-	var pauseTotalNs uint64
 	runtime.ReadMemStats(&memStats)
-	pauseTotalNs = memStats.PauseTotalNs
-	b.StartTimer()
+	pauseTotalNs := memStats.PauseTotalNs
+	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		s.Update(1)
 	}

timer_test.go

@@ -6,6 +6,23 @@ import (
 	"time"
 )
 
+func TestTimerExtremes(t *testing.T) {
+	tm := NewTimer()
+	tm.Update(math.MaxInt64)
+	tm.Update(0)
+	if stdDev := tm.StdDev(); 6.521908912666392e18 != stdDev {
+		t.Errorf("tm.StdDev(): 6.521908912666392e18 != %v\n", stdDev)
+	}
+}
+
+func TestTimerFunc(t *testing.T) {
+	tm := NewTimer()
+	tm.Time(func() { time.Sleep(50e6) })
+	if max := tm.Max(); 45e6 > max || max > 55e6 {
+		t.Errorf("tm.Max(): 45e6 > %v || %v > 55e6\n", max, max)
+	}
+}
+
 func TestTimerZero(t *testing.T) {
 	tm := NewTimer()
 	if count := tm.Count(); 0 != count {
@@ -46,20 +63,3 @@ func TestTimerZero(t *testing.T) {
 		t.Errorf("tm.RateMean(): 0.0 != %v\n", rateMean)
 	}
 }
-
-func TestTimerExtremes(t *testing.T) {
-	tm := NewTimer()
-	tm.Update(math.MaxInt64)
-	tm.Update(0)
-	if stdDev := tm.StdDev(); 6.521908912666392e18 != stdDev {
-		t.Errorf("tm.StdDev(): 6.521908912666392e18 != %v\n", stdDev)
-	}
-}
-
-func TestTimerFunc(t *testing.T) {
-	tm := NewTimer()
-	tm.Time(func() { time.Sleep(50e6) })
-	if max := tm.Max(); 45e6 > max || max > 55e6 {
-		t.Errorf("tm.Max(): 45e6 > %v || %v > 55e6\n", max, max)
-	}
-}