Skip to content

Commit

Permalink
Remove unecessary package
Browse files Browse the repository at this point in the history 
The assert package was removed because it inside of suite package.
  • Loading branch information
@faabiosr
faabiosr committed Jan 21, 2020
1 parent eee6d59 commit a503f29
Show file tree
Hide file tree
Showing 9 changed files with 179 additions and 211 deletions.
51 changes: 24 additions & 27 deletions bolt_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ import (
"time"

bolt "github.com/coreos/bbolt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
)

type BoltTestSuite struct {
suite.Suite

assert *assert.Assertions
cache Cache
db *bolt.DB
directory string
Expand All @@ -33,15 +31,14 @@ func (s *BoltTestSuite) SetupTest() {

s.db = db
s.cache = NewBolt(s.db)
s.assert = assert.New(s.T())
}

func (s *BoltTestSuite) TearDownTest() {
s.db.Close()
}

func (s *BoltTestSuite) TestSave() {
s.assert.Nil(s.cache.Save("foo", "bar", 0))
s.Assert().Nil(s.cache.Save("foo", "bar", 0))
}

func (s *BoltTestSuite) TestSaveThrowError() {
Expand All @@ -59,17 +56,17 @@ func (s *BoltTestSuite) TestSaveThrowError() {
cache := NewBolt(db)
err = cache.Save("foo", "bar", 0)

s.assert.Error(err)
s.assert.Contains(err.Error(), ErrBoltSave)
s.Assert().Error(err)
s.Assert().Contains(err.Error(), ErrBoltSave)
}

func (s *BoltTestSuite) TestFetchThrowErrorWhenBucketNotFound() {
s.cache.Flush()

result, err := s.cache.Fetch("foo")

s.assert.Empty(result)
s.assert.EqualError(err, ErrBoltBucketNotFound.Error())
s.Assert().Empty(result)
s.Assert().EqualError(err, ErrBoltBucketNotFound.Error())
}

func (s *BoltTestSuite) TestFetchThrowErrorWhenExpired() {
Expand All @@ -82,8 +79,8 @@ func (s *BoltTestSuite) TestFetchThrowErrorWhenExpired() {

result, err := s.cache.Fetch(key)

s.assert.Empty(result)
s.assert.EqualError(err, ErrBoltCacheExpired.Error())
s.Assert().Empty(result)
s.Assert().EqualError(err, ErrBoltCacheExpired.Error())
}

func (s *BoltTestSuite) TestFetch() {
Expand All @@ -93,8 +90,8 @@ func (s *BoltTestSuite) TestFetch() {
_ = s.cache.Save(key, value, 0)
result, err := s.cache.Fetch(key)

s.assert.Nil(err)
s.assert.Equal(value, result)
s.Assert().Nil(err)
s.Assert().Equal(value, result)
}

func (s *BoltTestSuite) TestFetchLongCacheDuration() {
Expand All @@ -104,52 +101,52 @@ func (s *BoltTestSuite) TestFetchLongCacheDuration() {
_ = s.cache.Save(key, value, 10*time.Second)
result, err := s.cache.Fetch(key)

s.assert.Nil(err)
s.assert.Equal(value, result)
s.Assert().Nil(err)
s.Assert().Equal(value, result)
}

func (s *BoltTestSuite) TestContains() {
_ = s.cache.Save("foo", "bar", 0)

s.assert.True(s.cache.Contains("foo"))
s.assert.False(s.cache.Contains("bar"))
s.Assert().True(s.cache.Contains("foo"))
s.Assert().False(s.cache.Contains("bar"))
}

func (s *BoltTestSuite) TestDeleteThrowErrorWhenBucketNotFound() {
s.cache.Flush()

err := s.cache.Delete("foo")

s.assert.EqualError(err, ErrBoltBucketNotFound.Error())
s.Assert().EqualError(err, ErrBoltBucketNotFound.Error())
}

func (s *BoltTestSuite) TestDelete() {
_ = s.cache.Save("foo", "bar", 0)

s.assert.Nil(s.cache.Delete("foo"))
s.assert.False(s.cache.Contains("foo"))
s.assert.Nil(s.cache.Delete("bar"))
s.Assert().Nil(s.cache.Delete("foo"))
s.Assert().False(s.cache.Contains("foo"))
s.Assert().Nil(s.cache.Delete("bar"))
}

func (s *BoltTestSuite) TestFlushThrowErrorWhenBucketNotFound() {
err := s.cache.Flush()

s.assert.Error(err)
s.assert.Contains(err.Error(), ErrBoltFlush)
s.Assert().Error(err)
s.Assert().Contains(err.Error(), ErrBoltFlush)
}

func (s *BoltTestSuite) TestFlush() {
_ = s.cache.Save("foo", "bar", 0)

s.assert.Nil(s.cache.Flush())
s.assert.False(s.cache.Contains("foo"))
s.Assert().Nil(s.cache.Flush())
s.Assert().False(s.cache.Contains("foo"))
}

func (s *BoltTestSuite) TestFetchMultiReturnNoItemsWhenThrowError() {
s.cache.Flush()
result := s.cache.FetchMulti([]string{"foo"})

s.assert.Len(result, 0)
s.Assert().Len(result, 0)
}

func (s *BoltTestSuite) TestFetchMulti() {
Expand All @@ -158,15 +155,15 @@ func (s *BoltTestSuite) TestFetchMulti() {

result := s.cache.FetchMulti([]string{"foo", "john"})

s.assert.Len(result, 2)
s.Assert().Len(result, 2)
}

func (s *BoltTestSuite) TestFetchMultiWhenOnlyOneOfKeysExists() {
_ = s.cache.Save("foo", "bar", 0)

result := s.cache.FetchMulti([]string{"foo", "alice"})

s.assert.Len(result, 1)
s.Assert().Len(result, 1)
}

func TestBoltRunSuite(t *testing.T) {
Expand Down
38 changes: 17 additions & 21 deletions chain_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,17 @@ import (
"time"

"github.com/bradfitz/gomemcache/memcache"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
)

type ChainTestSuite struct {
suite.Suite

assert *assert.Assertions
cache Cache
cache Cache
}

func (s *ChainTestSuite) SetupTest() {
s.cache = NewChain(NewMap())

s.assert = assert.New(s.T())
}

func (s *ChainTestSuite) TestSaveThrowErrorWhenOneOfDriverFail() {
Expand All @@ -28,11 +24,11 @@ func (s *ChainTestSuite) TestSaveThrowErrorWhenOneOfDriverFail() {
NewMemcached(memcache.New("127.0.0.1:22222")),
)

s.assert.Error(cache.Save("foo", "bar", 0))
s.Assert().Error(cache.Save("foo", "bar", 0))
}

func (s *ChainTestSuite) TestSave() {
s.assert.Nil(s.cache.Save("foo", "bar", 0))
s.Assert().Nil(s.cache.Save("foo", "bar", 0))
}

func (s *ChainTestSuite) TestFetchThrowErrorWhenExpired() {
Expand All @@ -45,8 +41,8 @@ func (s *ChainTestSuite) TestFetchThrowErrorWhenExpired() {

result, err := s.cache.Fetch(key)

s.assert.Regexp("^Key not found in cache chain", err)
s.assert.Empty(result)
s.Assert().Regexp("^Key not found in cache chain", err)
s.Assert().Empty(result)
}

func (s *ChainTestSuite) TestFetch() {
Expand All @@ -57,15 +53,15 @@ func (s *ChainTestSuite) TestFetch() {

result, err := s.cache.Fetch(key)

s.assert.Nil(err)
s.assert.Equal(value, result)
s.Assert().Nil(err)
s.Assert().Equal(value, result)
}

func (s *ChainTestSuite) TestContains() {
_ = s.cache.Save("foo", "bar", 0)

s.assert.True(s.cache.Contains("foo"))
s.assert.False(s.cache.Contains("bar"))
s.Assert().True(s.cache.Contains("foo"))
s.Assert().False(s.cache.Contains("bar"))
}

func (s *ChainTestSuite) TestDeleteThrowErrorWhenOneOfDriverFail() {
Expand All @@ -74,14 +70,14 @@ func (s *ChainTestSuite) TestDeleteThrowErrorWhenOneOfDriverFail() {
NewMemcached(memcache.New("127.0.0.1:22222")),
)

s.assert.Error(cache.Delete("foo"))
s.Assert().Error(cache.Delete("foo"))
}

func (s *ChainTestSuite) TestDelete() {
_ = s.cache.Save("foo", "bar", 0)

s.assert.Nil(s.cache.Delete("foo"))
s.assert.False(s.cache.Contains("foo"))
s.Assert().Nil(s.cache.Delete("foo"))
s.Assert().False(s.cache.Contains("foo"))
}

func (s *ChainTestSuite) TestFlushThrowErrorWhenOneOfDriverFail() {
Expand All @@ -90,14 +86,14 @@ func (s *ChainTestSuite) TestFlushThrowErrorWhenOneOfDriverFail() {
NewMemcached(memcache.New("127.0.0.1:22222")),
)

s.assert.Error(cache.Flush())
s.Assert().Error(cache.Flush())
}

func (s *ChainTestSuite) TestFlush() {
_ = s.cache.Save("foo", "bar", 0)

s.assert.Nil(s.cache.Flush())
s.assert.False(s.cache.Contains("foo"))
s.Assert().Nil(s.cache.Flush())
s.Assert().False(s.cache.Contains("foo"))
}

func (s *ChainTestSuite) TestFetchMulti() {
Expand All @@ -106,15 +102,15 @@ func (s *ChainTestSuite) TestFetchMulti() {

result := s.cache.FetchMulti([]string{"foo", "john"})

s.assert.Len(result, 2)
s.Assert().Len(result, 2)
}

func (s *ChainTestSuite) TestFetchMultiWhenOnlyOneOfKeysExists() {
_ = s.cache.Save("foo", "bar", 0)

result := s.cache.FetchMulti([]string{"foo", "alice"})

s.assert.Len(result, 1)
s.Assert().Len(result, 1)
}

func TestChainRunSuite(t *testing.T) {
Expand Down
Loading

0 comments on commit a503f29

Please sign in to comment.