simplify TimeClock

timeclock.go

@@ -20,19 +20,13 @@ import "time"
 
 // TimeClock implements the jwt.Clock interface, allowing control over
 // the interpretation of 'current time' used during validating and signing.
-// If NowTime is let unset (0), time.Now() return value will be used.
-// Unix time (in seconds).
 //
 // This is included to help test expiration and use before inception.
 type TimeClock struct {
 	NowTime int64
 }
 
-// Now returns either the specific time used at context creation, or
-// time.Now().
+// Now returns the point in time stored in NowTime.
 func (tc *TimeClock) Now() time.Time {
-	if tc.NowTime != 0 {
-		return time.Unix(tc.NowTime, 0)
-	}
-	return time.Now()
+	return time.Unix(tc.NowTime, 0)
 }

timeclock_test.go

@@ -19,11 +19,9 @@ package jwtregistry
 import (
 	"testing"
 	"time"
-)
 
-func timeEqualsEpislion(want time.Time, got time.Time, fudge time.Duration) bool {
-	return got.Unix() >= want.Add(-fudge).Unix() && got.Unix() <= want.Add(fudge).Unix()
-}
+	"github.com/stretchr/testify/assert"
+)
 
 func TestTimeClock_Now(t *testing.T) {
 	type fields struct {
@@ -37,7 +35,7 @@ func TestTimeClock_Now(t *testing.T) {
 		{
 			"default",
 			fields{},
-			time.Now(),
+			time.Unix(0, 0),
 		},
 		{
 			"locked clock to 50",
@@ -51,9 +49,7 @@ func TestTimeClock_Now(t *testing.T) {
 				NowTime: tt.fields.NowTime,
 			}
 			got := tc.Now()
-			if !timeEqualsEpislion(tt.want, got, 1*time.Second) {
-				t.Errorf("TimeClock.Now() = %v, want %v", got, tt.want)
-			}
+			assert.Equal(t, tt.want, got)
 		})
 	}
 }