Skip to content

Commit

Permalink
✅ add cache test (#576)
Browse files Browse the repository at this point in the history
* add cache test

* Update internal/cache/cache_test.go

Co-authored-by: Kiichiro YUKAWA <kyukawa315@gmail.com>

* fix

Co-authored-by: Kiichiro YUKAWA <kyukawa315@gmail.com>
  • Loading branch information
kevindiu and vankichi authored Jul 15, 2020
1 parent 78db9e2 commit 380c99e
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 49 deletions.
7 changes: 3 additions & 4 deletions internal/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/vdaas/vald/internal/errors"
)

// Cache represent the cache interface to store cache
type Cache interface {
Start(context.Context)
Get(string) (interface{}, bool)
Expand All @@ -41,13 +42,11 @@ type cache struct {
expiredHook func(context.Context, string)
}

// New returns the Cache instance or error
func New(opts ...Option) (cc Cache, err error) {
c := new(cache)
for _, opt := range append(defaultOpts, opts...) {
err = opt(c)
if err != nil {
return nil, err
}
opt(c)
}
switch c.cacher {
case cacher.GACHE:
Expand Down
82 changes: 57 additions & 25 deletions internal/cache/cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ import (
"go.uber.org/goleak"
)

var (
// Goroutine leak is detected by `fastime`, but it should be ignored in the test because it is an external package.
goleakIgnoreOptions = []goleak.Option{
goleak.IgnoreTopFunction("github.com/kpango/fastime.(*Fastime).StartTimerD.func1"),
}
)

func TestNew(t *testing.T) {
type args struct {
opts []Option
Expand All @@ -52,36 +59,61 @@ func TestNew(t *testing.T) {
return nil
}
tests := []test{
// TODO test cases
/*
{
name: "test_case_1",
args: args {
opts: nil,
},
want: want{},
checkFunc: defaultCheckFunc,
},
*/
{
name: "return gache cacher",
args: args{
opts: []Option{WithType("gache")},
},
checkFunc: func(w want, got Cache, err error) error {
if err != nil {
return err
}
if got == nil {
return errors.New("got cache is nil")
}

return nil
},
},
{
name: "return unknown error when type is unknown",
args: args{
opts: []Option{WithType("unknown")},
},
want: want{
err: errors.ErrInvalidCacherType,
},
},
{
name: "return cache when type is empty",
args: args{
opts: []Option{WithType("")},
},
checkFunc: func(w want, got Cache, err error) error {
if err != nil {
return err
}
if got == nil {
return errors.New("got cache is nil")
}

// TODO test cases
/*
func() test {
return test {
name: "test_case_2",
args: args {
opts: nil,
},
want: want{},
checkFunc: defaultCheckFunc,
}
}(),
*/
return nil
},
},
{
name: "return unknown error when type is dummy string",
args: args{
opts: []Option{WithType("dummy")},
},
want: want{
err: errors.ErrInvalidCacherType,
},
},
}

for _, test := range tests {
t.Run(test.name, func(tt *testing.T) {
defer goleak.VerifyNone(t)
defer goleak.VerifyNone(tt, goleakIgnoreOptions...)
if test.beforeFunc != nil {
test.beforeFunc(test.args)
}
Expand Down
32 changes: 12 additions & 20 deletions internal/cache/option.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ import (
"context"

"github.com/vdaas/vald/internal/cache/cacher"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/timeutil"
)

type Option func(*cache) error
type Option func(*cache)

var (
defaultOpts = []Option{
Expand All @@ -36,52 +35,45 @@ var (
)

func WithExpiredHook(f func(context.Context, string)) Option {
return func(c *cache) error {
return func(c *cache) {
if f != nil {
c.expiredHook = f
}
return nil
}
}

func WithType(mo string) Option {
return func(c *cache) error {
return func(c *cache) {
if len(mo) == 0 {
return nil
return
}
m := cacher.ToType(mo)
if m == cacher.Unknown {
return errors.ErrInvalidCacherType
}
c.cacher = m
return nil

c.cacher = cacher.ToType(mo)
}
}

func WithExpireDuration(dur string) Option {
return func(c *cache) error {
return func(c *cache) {
if len(dur) == 0 {
return nil
return
}
d, err := timeutil.Parse(dur)
if err != nil {
return nil
return
}
c.expireDur = d
return nil
}
}

func WithExpireCheckDuration(dur string) Option {
return func(c *cache) error {
return func(c *cache) {
if len(dur) == 0 {
return nil
return
}
d, err := timeutil.Parse(dur)
if err != nil {
return nil
return
}
c.expireCheckDur = d
return nil
}
}

0 comments on commit 380c99e

Please sign in to comment.