Skip to content

Commit 5305aa7

Browse files
fasaxcfasaxc
committed
Share tests.
1 parent 2999627 commit 5305aa7

File tree

2 files changed

+17
-195
lines changed

2 files changed

+17
-195
lines changed

‎libcalico-go/lib/set/adaptive_test.go

+6-190
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,20 @@
1515
package set_test
1616

1717
import (
18-
"fmt"
1918
"runtime"
2019
"sort"
2120
"testing"
2221

2322
. "github.com/onsi/ginkgo"
24-
. "github.com/onsi/gomega"
25-
2623
"github.com/projectcalico/calico/libcalico-go/lib/set"
2724
)
2825

26+
var _ = Describe("Adaptive set", func() {
27+
describeSetTests(func() set.Set[int] {
28+
return set.NewAdaptive[int]()
29+
})
30+
})
31+
2932
func BenchmarkAdaptive1Items(b *testing.B) {
3033
benchmarkSet(b, makeAdaptive, 1)
3134
}
@@ -162,190 +165,3 @@ func FuzzAdaptiveSet(f *testing.F) {
162165
}
163166
})
164167
}
165-
166-
var _ = Describe("Adaptive set", func() {
167-
var s set.Set[int]
168-
BeforeEach(func() {
169-
s = set.NewAdaptive[int]()
170-
})
171-
172-
It("should be empty", func() {
173-
Expect(s.Len()).To(BeZero())
174-
})
175-
It("should stringify", func() {
176-
Expect(s.String()).To(Equal("set.Set{}"))
177-
})
178-
It("should iterate over no items", func() {
179-
called := false
180-
s.Iter(func(item int) error {
181-
called = true
182-
return nil
183-
})
184-
Expect(called).To(BeFalse())
185-
})
186-
It("should do nothing on clear", func() {
187-
s.Clear()
188-
Expect(s.Len()).To(BeZero())
189-
})
190-
191-
Describe("Set created by FromArray", func() {
192-
BeforeEach(func() {
193-
s = set.FromArray([]int{1, 2})
194-
})
195-
It("should contain 1", func() {
196-
Expect(s.Contains(1)).To(BeTrue())
197-
})
198-
It("should contain 2", func() {
199-
Expect(s.Contains(2)).To(BeTrue())
200-
})
201-
It("should not contain 3", func() {
202-
Expect(s.Contains(3)).To(BeFalse())
203-
})
204-
It("should stringify", func() {
205-
Expect(s.String()).To(Or(
206-
Equal("set.Set{1,2}"),
207-
Equal("set.Set{2,1}")))
208-
})
209-
})
210-
211-
Describe("Set created by From", func() {
212-
BeforeEach(func() {
213-
s = set.From([]int{1, 2}...)
214-
})
215-
It("should contain 1", func() {
216-
Expect(s.Contains(1)).To(BeTrue())
217-
})
218-
It("should contain 2", func() {
219-
Expect(s.Contains(2)).To(BeTrue())
220-
})
221-
It("should not contain 3", func() {
222-
Expect(s.Contains(3)).To(BeFalse())
223-
})
224-
It("should contain all of {1, 2}", func() {
225-
Expect(s.ContainsAll(set.From(1, 2))).To(BeTrue())
226-
})
227-
It("should not contain all of {1, 2, 3}", func() {
228-
Expect(s.ContainsAll(set.From(1, 2, 3))).To(BeFalse())
229-
})
230-
})
231-
232-
Describe("after adding 1 and 2", func() {
233-
BeforeEach(func() {
234-
s.Add(1)
235-
s.Add(2)
236-
s.Add(2) // Duplicate should have no effect
237-
})
238-
It("should contain 1", func() {
239-
Expect(s.Contains(1)).To(BeTrue())
240-
})
241-
It("should contain 2", func() {
242-
Expect(s.Contains(2)).To(BeTrue())
243-
})
244-
It("should not contain 3", func() {
245-
Expect(s.Contains(3)).To(BeFalse())
246-
})
247-
It("should iterate over 1 and 2 in some order", func() {
248-
seen1 := false
249-
seen2 := false
250-
s.Iter(func(item int) error {
251-
if item == 1 {
252-
Expect(seen1).To(BeFalse())
253-
seen1 = true
254-
} else if item == 2 {
255-
Expect(seen2).To(BeFalse())
256-
seen2 = true
257-
} else {
258-
Fail("Unexpected item")
259-
}
260-
return nil
261-
})
262-
Expect(seen1).To(BeTrue())
263-
Expect(seen2).To(BeTrue())
264-
})
265-
It("should allow remove during iteration", func() {
266-
s.Iter(func(item int) error {
267-
if item == 1 {
268-
return set.RemoveItem
269-
}
270-
return nil
271-
})
272-
Expect(s.Contains(1)).To(BeFalse())
273-
Expect(s.Contains(2)).To(BeTrue())
274-
})
275-
It("should support stopping iteration", func() {
276-
iterationStarted := false
277-
s.Iter(func(item int) error {
278-
if iterationStarted {
279-
Fail("Iteration continued after stop")
280-
}
281-
iterationStarted = true
282-
return set.StopIteration
283-
})
284-
Expect(s.Contains(1)).To(BeTrue())
285-
Expect(s.Contains(2)).To(BeTrue())
286-
})
287-
It("can copy a Set", func() {
288-
c := s.Copy()
289-
Expect(c.Len()).To(Equal(s.Len()))
290-
Expect(c).NotTo(BeIdenticalTo(s)) // Check they're not the same object.
291-
Expect(c.ContainsAll(s)).To(BeTrue())
292-
Expect(s.ContainsAll(c)).To(BeTrue())
293-
})
294-
It("should correctly determine set equality", func() {
295-
c := s.Copy()
296-
Expect(c.Equals(s)).To(BeTrue())
297-
Expect(s.Equals(c)).To(BeTrue())
298-
c.Add(3)
299-
Expect(c.Equals(s)).To(BeFalse())
300-
Expect(s.Equals(c)).To(BeFalse())
301-
c.Discard(2)
302-
Expect(c.Equals(s)).To(BeFalse())
303-
Expect(s.Equals(c)).To(BeFalse())
304-
c.Add(2)
305-
c.Discard(3)
306-
Expect(c.Equals(s)).To(BeTrue(), fmt.Sprintf("%s != %s", c, s))
307-
Expect(s.Equals(c)).To(BeTrue())
308-
})
309-
310-
Describe("after removing 2", func() {
311-
BeforeEach(func() {
312-
s.Discard(2)
313-
})
314-
It("should contain 1", func() {
315-
Expect(s.Contains(1)).To(BeTrue())
316-
})
317-
It("should not contain 2", func() {
318-
Expect(s.Contains(2)).To(BeFalse())
319-
})
320-
It("should not contain 3", func() {
321-
Expect(s.Contains(3)).To(BeFalse())
322-
})
323-
})
324-
Describe("after using AddAll to add 2, 3, 4", func() {
325-
BeforeEach(func() {
326-
s.AddAll([]int{2, 3, 4})
327-
})
328-
It("should contain 1", func() {
329-
Expect(s.Contains(1)).To(BeTrue())
330-
})
331-
It("should contain 2", func() {
332-
Expect(s.Contains(2)).To(BeTrue())
333-
})
334-
It("should contain 3", func() {
335-
Expect(s.Contains(3)).To(BeTrue())
336-
})
337-
It("should contain 4", func() {
338-
Expect(s.Contains(4)).To(BeTrue())
339-
})
340-
})
341-
342-
Describe("after Clear()", func() {
343-
BeforeEach(func() {
344-
s.Clear()
345-
})
346-
It("should be empty", func() {
347-
Expect(s.Len()).To(BeZero())
348-
})
349-
})
350-
})
351-
})

‎libcalico-go/lib/set/set_test.go

+11-5
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,21 @@
1515
package set_test
1616

1717
import (
18+
"fmt"
1819
. "github.com/onsi/ginkgo"
1920
. "github.com/onsi/gomega"
2021

2122
"github.com/projectcalico/calico/libcalico-go/lib/set"
2223
)
2324

24-
var _ = Describe("Typed set", func() {
25+
var _ = Describe("Set", func() {
26+
describeSetTests(func() set.Set[int] { return set.New[int]() })
27+
})
28+
29+
func describeSetTests(setFactory func() set.Set[int]) {
2530
var s set.Set[int]
2631
BeforeEach(func() {
27-
s = set.New[int]()
32+
s = setFactory()
2833
})
2934

3035
It("should be empty", func() {
@@ -146,7 +151,8 @@ var _ = Describe("Typed set", func() {
146151
c := s.Copy()
147152
Expect(c.Len()).To(Equal(s.Len()))
148153
Expect(c).NotTo(BeIdenticalTo(s)) // Check they're not the same object.
149-
Expect(c).To(Equal(s)) // DeepEquals, will check the contents.
154+
Expect(c.ContainsAll(s)).To(BeTrue())
155+
Expect(s.ContainsAll(c)).To(BeTrue())
150156
})
151157
It("should correctly determine set equality", func() {
152158
c := s.Copy()
@@ -160,7 +166,7 @@ var _ = Describe("Typed set", func() {
160166
Expect(s.Equals(c)).To(BeFalse())
161167
c.Add(2)
162168
c.Discard(3)
163-
Expect(c.Equals(s)).To(BeTrue())
169+
Expect(c.Equals(s)).To(BeTrue(), fmt.Sprintf("%s != %s", c, s))
164170
Expect(s.Equals(c)).To(BeTrue())
165171
})
166172

@@ -205,7 +211,7 @@ var _ = Describe("Typed set", func() {
205211
})
206212
})
207213
})
208-
})
214+
}
209215

210216
var _ = Describe("EmptySet", func() {
211217
var empty set.Set[any]

0 commit comments

Comments
 (0)