clean up TestValue

This commit is contained in:
Karl Seguin
2013-10-19 20:45:30 +08:00
parent b3cbd19186
commit 7a8102e166

View File

@@ -25,7 +25,7 @@ func TestRemovesItemFromBucket(t *testing.T) {
func TestSetsANewBucketItem(t *testing.T) { func TestSetsANewBucketItem(t *testing.T) {
bucket := testBucket() bucket := testBucket()
item := bucket.set("spice", newTestValue("flow")) item := bucket.set("spice", TestValue("flow"))
assertValue(t, item, "flow") assertValue(t, item, "flow")
item = bucket.get("spice") item = bucket.get("spice")
assertValue(t, item, "flow") assertValue(t, item, "flow")
@@ -33,7 +33,7 @@ func TestSetsANewBucketItem(t *testing.T) {
func TestSetsAnExistingItem(t *testing.T) { func TestSetsAnExistingItem(t *testing.T) {
bucket := testBucket() bucket := testBucket()
item := bucket.set("power", newTestValue("9002")) item := bucket.set("power", TestValue("9002"))
assertValue(t, item, "9002") assertValue(t, item, "9002")
item = bucket.get("power") item = bucket.get("power")
assertValue(t, item, "9002") assertValue(t, item, "9002")
@@ -43,24 +43,18 @@ func testBucket() *Bucket {
b := &Bucket{lookup: make(map[string]*Item),} b := &Bucket{lookup: make(map[string]*Item),}
b.lookup["power"] = &Item{ b.lookup["power"] = &Item{
key: "power", key: "power",
value: newTestValue("9000"), value: TestValue("9000"),
} }
return b return b
} }
func assertValue(t *testing.T, item *Item, expected string) { func assertValue(t *testing.T, item *Item, expected string) {
value := item.value.(*TestValue) value := item.value.(TestValue)
gspec.New(t).Expect(value.v).ToEqual(expected) gspec.New(t).Expect(value).ToEqual(TestValue(expected))
} }
type TestValue struct { type TestValue string
v string
}
func newTestValue(v string) *TestValue { func (v TestValue) Expires() time.Time {
return &TestValue{v: v,}
}
func (v *TestValue) Expires() time.Time {
return time.Now() return time.Now()
} }