remove dependency on expect library
This commit is contained in:
@@ -4,49 +4,42 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
. "github.com/karlseguin/expect"
|
||||
"github.com/karlseguin/ccache/v3/assert"
|
||||
)
|
||||
|
||||
type BucketTests struct {
|
||||
}
|
||||
|
||||
func Test_Bucket(t *testing.T) {
|
||||
Expectify(new(BucketTests), t)
|
||||
}
|
||||
|
||||
func (_ *BucketTests) GetMissFromBucket() {
|
||||
func Test_Bucket_GetMissFromBucket(t *testing.T) {
|
||||
bucket := testBucket()
|
||||
Expect(bucket.get("invalid")).To.Equal(nil)
|
||||
assert.Nil(t, bucket.get("invalid"))
|
||||
}
|
||||
|
||||
func (_ *BucketTests) GetHitFromBucket() {
|
||||
func Test_Bucket_GetHitFromBucket(t *testing.T) {
|
||||
bucket := testBucket()
|
||||
item := bucket.get("power")
|
||||
assertValue(item, "9000")
|
||||
assertValue(t, item, "9000")
|
||||
}
|
||||
|
||||
func (_ *BucketTests) DeleteItemFromBucket() {
|
||||
func Test_Bucket_DeleteItemFromBucket(t *testing.T) {
|
||||
bucket := testBucket()
|
||||
bucket.delete("power")
|
||||
Expect(bucket.get("power")).To.Equal(nil)
|
||||
assert.Nil(t, bucket.get("power"))
|
||||
}
|
||||
|
||||
func (_ *BucketTests) SetsANewBucketItem() {
|
||||
func Test_Bucket_SetsANewBucketItem(t *testing.T) {
|
||||
bucket := testBucket()
|
||||
item, existing := bucket.set("spice", "flow", time.Minute, false)
|
||||
assertValue(item, "flow")
|
||||
assertValue(t, item, "flow")
|
||||
item = bucket.get("spice")
|
||||
assertValue(item, "flow")
|
||||
Expect(existing).To.Equal(nil)
|
||||
assertValue(t, item, "flow")
|
||||
assert.Equal(t, existing, nil)
|
||||
}
|
||||
|
||||
func (_ *BucketTests) SetsAnExistingItem() {
|
||||
func Test_Bucket_SetsAnExistingItem(t *testing.T) {
|
||||
bucket := testBucket()
|
||||
item, existing := bucket.set("power", "9001", time.Minute, false)
|
||||
assertValue(item, "9001")
|
||||
assertValue(t, item, "9001")
|
||||
item = bucket.get("power")
|
||||
assertValue(item, "9001")
|
||||
assertValue(existing, "9000")
|
||||
assertValue(t, item, "9001")
|
||||
assertValue(t, existing, "9000")
|
||||
}
|
||||
|
||||
func testBucket() *bucket[string] {
|
||||
@@ -58,6 +51,6 @@ func testBucket() *bucket[string] {
|
||||
return b
|
||||
}
|
||||
|
||||
func assertValue(item *Item[string], expected string) {
|
||||
Expect(item.value).To.Equal(expected)
|
||||
func assertValue(t *testing.T, item *Item[string], expected string) {
|
||||
assert.Equal(t, item.value, expected)
|
||||
}
|
||||
|
Reference in New Issue
Block a user