Skip to content

Commit 494ee56

Browse files
earl-warrenGusted
andauthored
improve unit test for caching (#26185)
- Configure `setting.CacheService.TTL` which will force the code to go trough the caching mechanism. - Remove the TODO and uncomment the test code. (cherry picked from commit a201f2f1896c1a086f3e37f86b1306d44c07f2e4) Refs: https://codeberg.org/forgejo/forgejo/pulls/974 --------- Co-authored-by: Gusted <[email protected]>
1 parent eaea530 commit 494ee56

File tree

1 file changed

+37
-39
lines changed

1 file changed

+37
-39
lines changed

modules/cache/cache_test.go

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ func createTestCache() {
1818
Adapter: "memory",
1919
TTL: time.Minute,
2020
})
21+
setting.CacheService.TTL = 24 * time.Hour
2122
}
2223

2324
func TestNewContext(t *testing.T) {
@@ -54,26 +55,25 @@ func TestGetString(t *testing.T) {
5455
assert.NoError(t, err)
5556
assert.Equal(t, "", data)
5657

57-
// data, err = GetString("key", func() (string, error) {
58-
// return "some data", nil
59-
// })
60-
// assert.NoError(t, err)
61-
// assert.Equal(t, "", data)
62-
// Remove("key")
58+
data, err = GetString("key", func() (string, error) {
59+
return "some data", nil
60+
})
61+
assert.NoError(t, err)
62+
assert.Equal(t, "", data)
63+
Remove("key")
6364

6465
data, err = GetString("key", func() (string, error) {
6566
return "some data", nil
6667
})
6768
assert.NoError(t, err)
6869
assert.Equal(t, "some data", data)
6970

70-
// data, err = GetString("key", func() (string, error) {
71-
// return "", fmt.Errorf("some error")
72-
// })
73-
// assert.NoError(t, err)
74-
// assert.Equal(t, "some data", data)
75-
76-
// TODO: uncommented code works in IDE but not with go test
71+
data, err = GetString("key", func() (string, error) {
72+
return "", fmt.Errorf("some error")
73+
})
74+
assert.NoError(t, err)
75+
assert.Equal(t, "some data", data)
76+
Remove("key")
7777
}
7878

7979
func TestGetInt(t *testing.T) {
@@ -91,26 +91,25 @@ func TestGetInt(t *testing.T) {
9191
assert.NoError(t, err)
9292
assert.Equal(t, 0, data)
9393

94-
// data, err = GetInt("key", func() (int, error) {
95-
// return 100, nil
96-
// })
97-
// assert.NoError(t, err)
98-
// assert.Equal(t, 0, data)
99-
// Remove("key")
94+
data, err = GetInt("key", func() (int, error) {
95+
return 100, nil
96+
})
97+
assert.NoError(t, err)
98+
assert.Equal(t, 0, data)
99+
Remove("key")
100100

101101
data, err = GetInt("key", func() (int, error) {
102102
return 100, nil
103103
})
104104
assert.NoError(t, err)
105105
assert.Equal(t, 100, data)
106106

107-
// data, err = GetInt("key", func() (int, error) {
108-
// return 0, fmt.Errorf("some error")
109-
// })
110-
// assert.NoError(t, err)
111-
// assert.Equal(t, 100, data)
112-
113-
// TODO: uncommented code works in IDE but not with go test
107+
data, err = GetInt("key", func() (int, error) {
108+
return 0, fmt.Errorf("some error")
109+
})
110+
assert.NoError(t, err)
111+
assert.Equal(t, 100, data)
112+
Remove("key")
114113
}
115114

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

131-
// data, err = GetInt64("key", func() (int64, error) {
132-
// return 100, nil
133-
// })
134-
// assert.NoError(t, err)
135-
// assert.EqualValues(t, 0, data)
136-
// Remove("key")
130+
data, err = GetInt64("key", func() (int64, error) {
131+
return 100, nil
132+
})
133+
assert.NoError(t, err)
134+
assert.EqualValues(t, 0, data)
135+
Remove("key")
137136

138137
data, err = GetInt64("key", func() (int64, error) {
139138
return 100, nil
140139
})
141140
assert.NoError(t, err)
142141
assert.EqualValues(t, 100, data)
143142

144-
// data, err = GetInt64("key", func() (int, error) {
145-
// return 0, fmt.Errorf("some error")
146-
// })
147-
// assert.NoError(t, err)
148-
// assert.EqualValues(t, 100, data)
149-
150-
// TODO: uncommented code works in IDE but not with go test
143+
data, err = GetInt64("key", func() (int64, error) {
144+
return 0, fmt.Errorf("some error")
145+
})
146+
assert.NoError(t, err)
147+
assert.EqualValues(t, 100, data)
148+
Remove("key")
151149
}

0 commit comments

Comments
 (0)