Skip to content

Commit

Permalink
Fixed linter issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrz1836
mrz1836 committed Dec 5, 2023
1 parent ed2148a commit f95c855
Show file tree
Hide file tree
Showing 7 changed files with 119 additions and 120 deletions.
86 changes: 43 additions & 43 deletions cachestore_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ func TestClient_SetRedis(t *testing.T) {
setCmd := conn.Command(cache.SetCommand, testKey, exampleString).Expect(exampleString)
err := client.Set(ctx, testKey, exampleString)
require.NoError(t, err)
assert.Equal(t, true, setCmd.Called)
assert.True(t, setCmd.Called)

// Get command
getCmd := conn.Command(cache.GetCommand, testKey).Expect(exampleString)
getExample, err2 := client.Get(ctx, testKey)
require.NoError(t, err2)
assert.Equal(t, true, getCmd.Called)
assert.True(t, getCmd.Called)

assert.Equal(t, exampleString, getExample)
})
Expand Down Expand Up @@ -155,8 +155,8 @@ func TestClient_SetModelRedis(t *testing.T) {
getExample := new(genericStruct)
err = c.GetModel(ctx, testKey, getExample)
require.NoError(t, err)
assert.Equal(t, true, getExample.BoolField)
assert.Equal(t, 123.123, getExample.FloatField)
assert.True(t, getExample.BoolField)
assert.InDelta(t, 123.123, getExample.FloatField, 0)
assert.Equal(t, 123, getExample.IntField)
assert.Equal(t, "string", getExample.StringField)
})
Expand All @@ -173,8 +173,8 @@ func TestClient_Get(t *testing.T) {
require.NoError(t, err)

_, err = c.Get(context.Background(), "")
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run(testCase.name+" - just spaces", func(t *testing.T) {
Expand All @@ -183,8 +183,8 @@ func TestClient_Get(t *testing.T) {
require.NoError(t, err)

_, err = c.Get(context.Background(), " ")
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run(testCase.name+" - key not found (nil)", func(t *testing.T) {
Expand Down Expand Up @@ -229,7 +229,7 @@ func TestClient_Get(t *testing.T) {

_, err := c.Get(context.Background(), "")
require.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run("["+Redis.String()+"] [mock] - valid key", func(t *testing.T) {
Expand All @@ -241,7 +241,7 @@ func TestClient_Get(t *testing.T) {
err := c.Set(context.Background(), testKey, testValue)
require.NoError(t, err)

assert.Equal(t, true, setCmd.Called)
assert.True(t, setCmd.Called)

// The main command to test
getCmd := conn.Command(cache.GetCommand, testKey).Expect(testValue)
Expand All @@ -251,7 +251,7 @@ func TestClient_Get(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, testValue, val.(string))

assert.Equal(t, true, getCmd.Called)
assert.True(t, getCmd.Called)
})
}

Expand All @@ -266,8 +266,8 @@ func TestClient_Set(t *testing.T) {
require.NoError(t, err)

err = c.Set(context.Background(), "", "")
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run(testCase.name+" - just spaces", func(t *testing.T) {
Expand All @@ -276,8 +276,8 @@ func TestClient_Set(t *testing.T) {
require.NoError(t, err)

err = c.Set(context.Background(), " ", "")
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run(testCase.name+" - valid key", func(t *testing.T) {
Expand Down Expand Up @@ -316,8 +316,8 @@ func TestClient_Set(t *testing.T) {
c, _ := newMockRedisClient(t)

err := c.Set(context.Background(), "", "")
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run("["+Redis.String()+"] [mock] - valid key", func(t *testing.T) {
Expand All @@ -329,7 +329,7 @@ func TestClient_Set(t *testing.T) {
err := c.Set(context.Background(), testKey, testValue)
require.NoError(t, err)

assert.Equal(t, true, setCmd.Called)
assert.True(t, setCmd.Called)
})
}

Expand All @@ -344,8 +344,8 @@ func TestClient_Delete(t *testing.T) {
require.NoError(t, err)

err = c.Delete(context.Background(), "")
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run(testCase.name+" - just spaces", func(t *testing.T) {
Expand All @@ -354,8 +354,8 @@ func TestClient_Delete(t *testing.T) {
require.NoError(t, err)

err = c.Delete(context.Background(), " ")
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run(testCase.name+" - valid key", func(t *testing.T) {
Expand Down Expand Up @@ -405,8 +405,8 @@ func TestClient_Delete(t *testing.T) {
c, _ := newMockRedisClient(t)

err := c.Delete(context.Background(), "")
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run("["+Redis.String()+"] [mock] - valid key", func(t *testing.T) {
Expand All @@ -418,7 +418,7 @@ func TestClient_Delete(t *testing.T) {
err := c.Delete(context.Background(), testKey)
require.NoError(t, err)

assert.Equal(t, true, delCmd.Called)
assert.True(t, delCmd.Called)
})
}

Expand All @@ -441,8 +441,8 @@ func TestClient_GetModel(t *testing.T) {
require.NoError(t, err)

err = c.GetModel(context.Background(), "", testModelEmpty)
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run(testCase.name+" - just spaces", func(t *testing.T) {
Expand All @@ -452,8 +452,8 @@ func TestClient_GetModel(t *testing.T) {
require.NoError(t, err)

err = c.GetModel(context.Background(), " ", testModelEmpty)
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run(testCase.name+" - valid key", func(t *testing.T) {
Expand All @@ -474,7 +474,7 @@ func TestClient_GetModel(t *testing.T) {
assert.Equal(t, testModel.StringField, testModelEmpty.StringField)
assert.Equal(t, testModel.IntField, testModelEmpty.IntField)
assert.Equal(t, testModel.BoolField, testModelEmpty.BoolField)
assert.Equal(t, testModel.FloatField, testModelEmpty.FloatField)
assert.InDelta(t, testModel.FloatField, testModelEmpty.FloatField, 0)
})

t.Run(testCase.name+" - record does not exist", func(t *testing.T) {
Expand All @@ -485,7 +485,7 @@ func TestClient_GetModel(t *testing.T) {

err = c.GetModel(context.Background(), testKey, testModelEmpty)
require.Error(t, err)
assert.ErrorIs(t, err, ErrKeyNotFound)
require.ErrorIs(t, err, ErrKeyNotFound)
assert.NotEqual(t, testModel.StringField, testModelEmpty.StringField)
})
}
Expand All @@ -495,8 +495,8 @@ func TestClient_GetModel(t *testing.T) {
c, _ := newMockRedisClient(t)

err := c.GetModel(context.Background(), "", testModelEmpty)
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run("["+Redis.String()+"] [mock] - record does not exist", func(t *testing.T) {
Expand All @@ -506,9 +506,9 @@ func TestClient_GetModel(t *testing.T) {
getCmd := conn.Command(cache.GetCommand, testKey).Expect(nil)

err := c.GetModel(context.Background(), testKey, testModelEmpty)
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyNotFound)
assert.Equal(t, true, getCmd.Called)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyNotFound)
assert.True(t, getCmd.Called)
})

t.Run("["+Redis.String()+"] [mock] - record exists", func(t *testing.T) {
Expand All @@ -522,13 +522,13 @@ func TestClient_GetModel(t *testing.T) {

err = c.SetModel(context.Background(), testKey, testModel, 0)
require.NoError(t, err)
assert.Equal(t, true, setCmd.Called)
assert.True(t, setCmd.Called)

getCmd := conn.Command(cache.GetCommand, testKey).Expect(responseBytes)

err = c.GetModel(context.Background(), testKey, testModelEmpty)
require.NoError(t, err)
assert.Equal(t, true, getCmd.Called)
assert.True(t, getCmd.Called)

assert.Equal(t, testModel.StringField, testModelEmpty.StringField)
})
Expand All @@ -552,8 +552,8 @@ func TestClient_SetModel(t *testing.T) {
require.NoError(t, err)

err = c.SetModel(context.Background(), "", testModel, 0)
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run(testCase.name+" - just spaces", func(t *testing.T) {
Expand All @@ -562,8 +562,8 @@ func TestClient_SetModel(t *testing.T) {
require.NoError(t, err)

err = c.Set(context.Background(), " ", testModel)
assert.Error(t, err)
assert.ErrorIs(t, err, ErrKeyRequired)
require.Error(t, err)
require.ErrorIs(t, err, ErrKeyRequired)
})

t.Run(testCase.name+" - valid key", func(t *testing.T) {
Expand Down Expand Up @@ -591,7 +591,7 @@ func TestClient_SetModel(t *testing.T) {
err = c.SetModel(context.Background(), testKey, testModel, 0)
require.NoError(t, err)

assert.Equal(t, true, setCmd.Called)
assert.True(t, setCmd.Called)
})
}

Expand Down
10 changes: 5 additions & 5 deletions client_options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestDefaultClientOptions(t *testing.T) {
defaults := defaultClientOptions()
require.NotNil(t, defaults)
assert.Equal(t, Empty, defaults.engine)
assert.Equal(t, false, defaults.newRelicEnabled)
assert.False(t, defaults.newRelicEnabled)
assert.Nil(t, defaults.redis)
require.NotNil(t, defaults.redisConfig)
})
Expand Down Expand Up @@ -60,7 +60,7 @@ func TestWithNewRelic(t *testing.T) {
require.NotNil(t, c)
require.NoError(t, err)

assert.Equal(t, true, c.IsNewRelicEnabled())
assert.True(t, c.IsNewRelicEnabled())
})
}

Expand All @@ -78,7 +78,7 @@ func TestWithDebugging(t *testing.T) {
require.NotNil(t, c)
require.NoError(t, err)

assert.Equal(t, true, c.IsDebug())
assert.True(t, c.IsDebug())
})
}

Expand All @@ -95,7 +95,7 @@ func TestWithRedis(t *testing.T) {
opts := []ClientOps{WithDebugging(), WithRedis(config)}
c, err := NewClient(context.Background(), opts...)
assert.Nil(t, c)
assert.Error(t, err)
require.Error(t, err)
})

t.Run("apply basic local config", func(t *testing.T) {
Expand Down Expand Up @@ -169,7 +169,7 @@ func TestWithRedisConnection(t *testing.T) {
opts := []ClientOps{WithDebugging(), WithRedisConnection(nil)}
c, err := NewClient(context.Background(), opts...)
assert.NotNil(t, c)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, FreeCache, c.Engine())
})

Expand Down
Loading

0 comments on commit f95c855

Please sign in to comment.