Commit 16ee6060 authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys

Make TestTimedCache() prettier.

parent 0e90317c
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
var _ = fmt.Print var _ = fmt.Print
var _ = log.Print var _ = log.Print
func TestTimedIntCache(t *testing.T) { func TestTimedCache(t *testing.T) {
fetchCount := 0 fetchCount := 0
fetch := func(n string) interface{} { fetch := func(n string) interface{} {
fetchCount++ fetchCount++
...@@ -24,10 +24,10 @@ func TestTimedIntCache(t *testing.T) { ...@@ -24,10 +24,10 @@ func TestTimedIntCache(t *testing.T) {
cache := NewTimedCache(fetch, ttl) cache := NewTimedCache(fetch, ttl)
v := cache.Get("n").(*int) v := cache.Get("n").(*int)
if *v != int('n') { if *v != int('n') {
t.Error("value mismatch", v) t.Errorf("value mismatch: got %d, want %d", *v, int('n'))
} }
if fetchCount != 1 { if fetchCount != 1 {
t.Error("fetch count mismatch", fetchCount) t.Errorf("fetch count mismatch: got %d want 1", fetchCount)
} }
// The cache update is async. // The cache update is async.
...@@ -35,11 +35,11 @@ func TestTimedIntCache(t *testing.T) { ...@@ -35,11 +35,11 @@ func TestTimedIntCache(t *testing.T) {
w := cache.Get("n") w := cache.Get("n")
if v != w { if v != w {
t.Error("Huh, inconsistent.") t.Errorf("Huh, inconsistent: 1st = %v != 2nd = %v", v, w)
} }
if fetchCount > 1 { if fetchCount > 1 {
t.Error("fetch count fail.", fetchCount) t.Errorf("fetch count fail: %d > 1", fetchCount)
} }
time.Sleep(ttl * 2) time.Sleep(ttl * 2)
...@@ -47,6 +47,6 @@ func TestTimedIntCache(t *testing.T) { ...@@ -47,6 +47,6 @@ func TestTimedIntCache(t *testing.T) {
w = cache.Get("n") w = cache.Get("n")
if fetchCount == 1 { if fetchCount == 1 {
t.Error("did not fetch again. Purge unsuccessful?") t.Error("Did not fetch again. Purge unsuccessful?")
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment