Skip to content

Commit 961982c

Browse files
ldemaillyscalalang2
ldemailly
authored and
scalalang2
committed
reduce dependencies/bloat
1 parent ef5cb24 commit 961982c

File tree

4 files changed

+59
-73
lines changed

4 files changed

+59
-73
lines changed

‎go.mod

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,4 @@ module github.com/scalalang2/golang-fifo
22

33
go 1.22
44

5-
require github.com/stretchr/testify v1.8.4
6-
7-
require (
8-
github.com/davecgh/go-spew v1.1.1 // indirect
9-
github.com/pmezard/go-difflib v1.0.0 // indirect
10-
gopkg.in/yaml.v3 v3.0.1 // indirect
11-
)
5+
require fortio.org/assert v1.2.1

‎go.sum

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,2 @@
1-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
5-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
6-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
7-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
8-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
9-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
10-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1+
fortio.org/assert v1.2.1 h1:48I39urpeDj65RP1KguF7akCjILNeu6vICiYMEysR7Q=
2+
fortio.org/assert v1.2.1/go.mod h1:039mG+/iYDPO8Ibx8TrNuJCm2T2SuhwRI3uL9nHTTls=

‎s3fifo/s3fifo_test.go

+30-30
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/stretchr/testify/require"
8+
"fortio.org/assert"
99
)
1010

1111
const noEvictionTTL = 0
@@ -15,28 +15,28 @@ func TestSetAndGet(t *testing.T) {
1515
cache.Set("hello", "world")
1616

1717
value, ok := cache.Get("hello")
18-
require.True(t, ok)
19-
require.Equal(t, "world", value)
18+
assert.True(t, ok)
19+
assert.Equal(t, "world", value)
2020
}
2121

2222
func TestRemove(t *testing.T) {
2323
cache := New[int, int](10, noEvictionTTL)
2424
cache.Set(1, 10)
2525

2626
val, ok := cache.Get(1)
27-
require.True(t, ok)
28-
require.Equal(t, 10, val)
27+
assert.True(t, ok)
28+
assert.Equal(t, 10, val)
2929

3030
// After removing the key, it should not be found
3131
removed := cache.Remove(1)
32-
require.True(t, removed)
32+
assert.True(t, removed)
3333

3434
_, ok = cache.Get(1)
35-
require.False(t, ok)
35+
assert.False(t, ok)
3636

3737
// This should not panic
3838
removed = cache.Remove(-1)
39-
require.False(t, removed)
39+
assert.False(t, removed)
4040
}
4141

4242
func TestEvictOneHitWonders(t *testing.T) {
@@ -55,14 +55,14 @@ func TestEvictOneHitWonders(t *testing.T) {
5555
// hit one-hit wonders only once
5656
for _, v := range oneHitWonders {
5757
_, ok := cache.Get(v)
58-
require.True(t, ok)
58+
assert.True(t, ok)
5959
}
6060

6161
// hit the popular objects
6262
for i := 0; i < 3; i++ {
6363
for _, v := range popularObjects {
6464
_, ok := cache.Get(v)
65-
require.True(t, ok)
65+
assert.True(t, ok)
6666
}
6767
}
6868

@@ -74,13 +74,13 @@ func TestEvictOneHitWonders(t *testing.T) {
7474

7575
for _, v := range oneHitWonders {
7676
_, ok := cache.Get(v)
77-
require.False(t, ok)
77+
assert.False(t, ok)
7878
}
7979

8080
// popular objects should still be in the cache
8181
for _, v := range popularObjects {
8282
_, ok := cache.Get(v)
83-
require.True(t, ok)
83+
assert.True(t, ok)
8484
}
8585
}
8686

@@ -97,8 +97,8 @@ func TestPeek(t *testing.T) {
9797
for i := 0; i < 10; i++ {
9898
for _, v := range entries {
9999
value, exist := cache.Peek(v)
100-
require.True(t, exist)
101-
require.Equal(t, v*10, value)
100+
assert.True(t, exist)
101+
assert.Equal(t, v*10, value)
102102
}
103103
}
104104

@@ -112,7 +112,7 @@ func TestPeek(t *testing.T) {
112112
// they should not exist in the cache
113113
for _, v := range entries {
114114
_, exist := cache.Peek(v)
115-
require.False(t, exist)
115+
assert.False(t, exist)
116116
}
117117
}
118118

@@ -126,27 +126,27 @@ func TestContains(t *testing.T) {
126126

127127
// check if each entry exists in the cache
128128
for _, v := range entries {
129-
require.True(t, cache.Contains(v))
129+
assert.True(t, cache.Contains(v))
130130
}
131131

132132
for i := 6; i <= 10; i++ {
133-
require.False(t, cache.Contains(i))
133+
assert.False(t, cache.Contains(i))
134134
}
135135
}
136136

137137
func TestLength(t *testing.T) {
138138
cache := New[string, string](10, noEvictionTTL)
139139

140140
cache.Set("hello", "world")
141-
require.Equal(t, 1, cache.Len())
141+
assert.Equal(t, 1, cache.Len())
142142

143143
cache.Set("hello2", "world")
144144
cache.Set("hello", "changed")
145-
require.Equal(t, 2, cache.Len())
145+
assert.Equal(t, 2, cache.Len())
146146

147147
value, ok := cache.Get("hello")
148-
require.True(t, ok)
149-
require.Equal(t, "changed", value)
148+
assert.True(t, ok)
149+
assert.Equal(t, "changed", value)
150150
}
151151

152152
func TestClean(t *testing.T) {
@@ -156,15 +156,15 @@ func TestClean(t *testing.T) {
156156
for _, v := range entries {
157157
cache.Set(v, v*10)
158158
}
159-
require.Equal(t, 5, cache.Len())
159+
assert.Equal(t, 5, cache.Len())
160160
cache.Purge()
161161

162162
// check if each entry exists in the cache
163163
for _, v := range entries {
164164
_, exist := cache.Peek(v)
165-
require.False(t, exist)
165+
assert.False(t, exist)
166166
}
167-
require.Equal(t, 0, cache.Len())
167+
assert.Equal(t, 0, cache.Len())
168168
}
169169

170170
func TestTimeToLive(t *testing.T) {
@@ -175,16 +175,16 @@ func TestTimeToLive(t *testing.T) {
175175
for num := 1; num <= numberOfEntries; num++ {
176176
cache.Set(num, num)
177177
val, ok := cache.Get(num)
178-
require.True(t, ok)
179-
require.Equal(t, num, val)
178+
assert.True(t, ok)
179+
assert.Equal(t, num, val)
180180
}
181181

182182
time.Sleep(ttl * 2)
183183

184184
// check all entries are evicted
185185
for num := 1; num <= numberOfEntries; num++ {
186186
_, ok := cache.Get(num)
187-
require.False(t, ok)
187+
assert.False(t, ok)
188188
}
189189
}
190190

@@ -206,8 +206,8 @@ func TestEvictionCallback(t *testing.T) {
206206

207207
// check the first object is evicted
208208
_, ok := cache.Get(1)
209-
require.False(t, ok)
210-
require.Equal(t, 1, evicted[1])
209+
assert.False(t, ok)
210+
assert.Equal(t, 1, evicted[1])
211211

212212
cache.Close()
213213
}
@@ -237,7 +237,7 @@ func TestEvictionCallbackWithTTL(t *testing.T) {
237237
mu.Lock()
238238
if len(evicted) == 10 {
239239
for i := 1; i <= 10; i++ {
240-
require.Equal(t, i, evicted[i])
240+
assert.Equal(t, i, evicted[i])
241241
}
242242
return
243243
}

‎sieve/sieve_test.go

+26-26
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/stretchr/testify/require"
8+
"fortio.org/assert"
99
)
1010

1111
const noEvictionTTL = 0
@@ -20,8 +20,8 @@ func TestGetAndSet(t *testing.T) {
2020

2121
for _, v := range items {
2222
val, ok := cache.Get(v)
23-
require.True(t, ok)
24-
require.Equal(t, v*10, val)
23+
assert.True(t, ok)
24+
assert.Equal(t, v*10, val)
2525
}
2626

2727
cache.Close()
@@ -32,19 +32,19 @@ func TestRemove(t *testing.T) {
3232
cache.Set(1, 10)
3333

3434
val, ok := cache.Get(1)
35-
require.True(t, ok)
36-
require.Equal(t, 10, val)
35+
assert.True(t, ok)
36+
assert.Equal(t, 10, val)
3737

3838
// After removing the key, it should not be found
3939
removed := cache.Remove(1)
40-
require.True(t, removed)
40+
assert.True(t, removed)
4141

4242
_, ok = cache.Get(1)
43-
require.False(t, ok)
43+
assert.False(t, ok)
4444

4545
// This should not panic
4646
removed = cache.Remove(-1)
47-
require.False(t, removed)
47+
assert.False(t, removed)
4848

4949
cache.Close()
5050
}
@@ -65,7 +65,7 @@ func TestSievePolicy(t *testing.T) {
6565
// hit popular objects
6666
for _, v := range popularObjects {
6767
_, ok := cache.Get(v)
68-
require.True(t, ok)
68+
assert.True(t, ok)
6969
}
7070

7171
// add another objects to the cache
@@ -76,35 +76,35 @@ func TestSievePolicy(t *testing.T) {
7676
// check popular objects are not evicted
7777
for _, v := range popularObjects {
7878
_, ok := cache.Get(v)
79-
require.True(t, ok)
79+
assert.True(t, ok)
8080
}
8181

8282
cache.Close()
8383
}
8484

8585
func TestContains(t *testing.T) {
8686
cache := New[string, string](10, noEvictionTTL)
87-
require.False(t, cache.Contains("hello"))
87+
assert.False(t, cache.Contains("hello"))
8888

8989
cache.Set("hello", "world")
90-
require.True(t, cache.Contains("hello"))
90+
assert.True(t, cache.Contains("hello"))
9191

9292
cache.Close()
9393
}
9494

9595
func TestLen(t *testing.T) {
9696
cache := New[int, int](10, noEvictionTTL)
97-
require.Equal(t, 0, cache.Len())
97+
assert.Equal(t, 0, cache.Len())
9898

9999
cache.Set(1, 1)
100-
require.Equal(t, 1, cache.Len())
100+
assert.Equal(t, 1, cache.Len())
101101

102102
// duplicated keys only update the recent-ness of the key and value
103103
cache.Set(1, 1)
104-
require.Equal(t, 1, cache.Len())
104+
assert.Equal(t, 1, cache.Len())
105105

106106
cache.Set(2, 2)
107-
require.Equal(t, 2, cache.Len())
107+
assert.Equal(t, 2, cache.Len())
108108

109109
cache.Close()
110110
}
@@ -113,10 +113,10 @@ func TestPurge(t *testing.T) {
113113
cache := New[int, int](10, noEvictionTTL)
114114
cache.Set(1, 1)
115115
cache.Set(2, 2)
116-
require.Equal(t, 2, cache.Len())
116+
assert.Equal(t, 2, cache.Len())
117117

118118
cache.Purge()
119-
require.Equal(t, 0, cache.Len())
119+
assert.Equal(t, 0, cache.Len())
120120

121121
cache.Close()
122122
}
@@ -129,16 +129,16 @@ func TestTimeToLive(t *testing.T) {
129129
for num := 1; num <= numberOfEntries; num++ {
130130
cache.Set(num, num)
131131
val, ok := cache.Get(num)
132-
require.True(t, ok)
133-
require.Equal(t, num, val)
132+
assert.True(t, ok)
133+
assert.Equal(t, num, val)
134134
}
135135

136136
time.Sleep(ttl * 2)
137137

138138
// check all entries are evicted
139139
for num := 1; num <= numberOfEntries; num++ {
140140
_, ok := cache.Get(num)
141-
require.False(t, ok)
141+
assert.False(t, ok)
142142
}
143143
}
144144

@@ -160,8 +160,8 @@ func TestEvictionCallback(t *testing.T) {
160160

161161
// check the first object is evicted
162162
_, ok := cache.Get(1)
163-
require.False(t, ok)
164-
require.Equal(t, 1, evicted[1])
163+
assert.False(t, ok)
164+
assert.Equal(t, 1, evicted[1])
165165

166166
cache.Close()
167167
}
@@ -191,7 +191,7 @@ func TestEvictionCallbackWithTTL(t *testing.T) {
191191
mu.Lock()
192192
if len(evicted) == 10 {
193193
for i := 1; i <= 10; i++ {
194-
require.Equal(t, i, evicted[i])
194+
assert.Equal(t, i, evicted[i])
195195
}
196196
return
197197
}
@@ -214,7 +214,7 @@ func TestLargerWorkloadsThanCacheSize(t *testing.T) {
214214
cache.Set(i, val)
215215

216216
v, ok := cache.Get(i)
217-
require.True(t, ok)
218-
require.Equal(t, v, val)
217+
assert.True(t, ok)
218+
assert.Equal(t, v, val)
219219
}
220220
}

0 commit comments

Comments
 (0)