Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve unit test for caching #26185

Merged
merged 3 commits into from
Jul 27, 2023
Merged

improve unit test for caching #26185

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21d0d9d
improve unit test for caching
Gusted Jul 3, 2023
d002391
setting.CacheService.TTL = 24 * time.Hour
earl-warren Jul 27, 2023
8f79987
Merge branch 'main' into wip-gitea-test-2
GiteaBot Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 37 additions & 39 deletions modules/cache/cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ func createTestCache() {
Adapter: "memory",
TTL: time.Minute,
})
setting.CacheService.TTL = 24 * time.Hour
}

func TestNewContext(t *testing.T) {
Expand Down Expand Up @@ -54,26 +55,25 @@ func TestGetString(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, "", data)

// data, err = GetString("key", func() (string, error) {
// return "some data", nil
// })
// assert.NoError(t, err)
// assert.Equal(t, "", data)
// Remove("key")
data, err = GetString("key", func() (string, error) {
return "some data", nil
})
assert.NoError(t, err)
assert.Equal(t, "", data)
Remove("key")

data, err = GetString("key", func() (string, error) {
return "some data", nil
})
assert.NoError(t, err)
assert.Equal(t, "some data", data)

// data, err = GetString("key", func() (string, error) {
// return "", fmt.Errorf("some error")
// })
// assert.NoError(t, err)
// assert.Equal(t, "some data", data)

// TODO: uncommented code works in IDE but not with go test
data, err = GetString("key", func() (string, error) {
return "", fmt.Errorf("some error")
})
assert.NoError(t, err)
assert.Equal(t, "some data", data)
Remove("key")
earl-warren marked this conversation as resolved.
Show resolved Hide resolved
}

func TestGetInt(t *testing.T) {
Expand All @@ -91,26 +91,25 @@ func TestGetInt(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, 0, data)

// data, err = GetInt("key", func() (int, error) {
// return 100, nil
// })
// assert.NoError(t, err)
// assert.Equal(t, 0, data)
// Remove("key")
data, err = GetInt("key", func() (int, error) {
return 100, nil
})
assert.NoError(t, err)
assert.Equal(t, 0, data)
Remove("key")

data, err = GetInt("key", func() (int, error) {
return 100, nil
})
assert.NoError(t, err)
assert.Equal(t, 100, data)

// data, err = GetInt("key", func() (int, error) {
// return 0, fmt.Errorf("some error")
// })
// assert.NoError(t, err)
// assert.Equal(t, 100, data)

// TODO: uncommented code works in IDE but not with go test
data, err = GetInt("key", func() (int, error) {
return 0, fmt.Errorf("some error")
})
assert.NoError(t, err)
assert.Equal(t, 100, data)
Remove("key")
}

func TestGetInt64(t *testing.T) {
Expand All @@ -128,24 +127,23 @@ func TestGetInt64(t *testing.T) {
assert.NoError(t, err)
assert.EqualValues(t, 0, data)

// data, err = GetInt64("key", func() (int64, error) {
// return 100, nil
// })
// assert.NoError(t, err)
// assert.EqualValues(t, 0, data)
// Remove("key")
data, err = GetInt64("key", func() (int64, error) {
return 100, nil
})
assert.NoError(t, err)
assert.EqualValues(t, 0, data)
Remove("key")

data, err = GetInt64("key", func() (int64, error) {
return 100, nil
})
assert.NoError(t, err)
assert.EqualValues(t, 100, data)

// data, err = GetInt64("key", func() (int, error) {
// return 0, fmt.Errorf("some error")
// })
// assert.NoError(t, err)
// assert.EqualValues(t, 100, data)

// TODO: uncommented code works in IDE but not with go test
data, err = GetInt64("key", func() (int64, error) {
return 0, fmt.Errorf("some error")
})
assert.NoError(t, err)
assert.EqualValues(t, 100, data)
Remove("key")
}