a0a5ba1538
Commit fdfec2c07a seqmap: refactor seqmap to use slice instead of map
introduced a regression to imap sorting (if supported). The slice passed
to seqmap was being sorted in place by UID, thus breaking any sort order
sent by the server.
Create a copy of the slice to retain the sort order reported to the UI
while also keeping a correct map for seqnum -> UID in the worker.
Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>
85 lines
1.6 KiB
Go
85 lines
1.6 KiB
Go
package imap
|
|
|
|
import (
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestSeqMap(t *testing.T) {
|
|
var seqmap SeqMap
|
|
var uid uint32
|
|
var found bool
|
|
assert := assert.New(t)
|
|
|
|
assert.Equal(0, seqmap.Size())
|
|
|
|
_, found = seqmap.Get(42)
|
|
assert.Equal(false, found)
|
|
|
|
_, found = seqmap.Pop(0)
|
|
assert.Equal(false, found)
|
|
|
|
uids := []uint32{1337, 42, 1107}
|
|
seqmap.Initialize(uids)
|
|
assert.Equal(3, seqmap.Size())
|
|
// Original list should remain unsorted
|
|
assert.Equal([]uint32{1337, 42, 1107}, uids)
|
|
|
|
_, found = seqmap.Pop(0)
|
|
assert.Equal(false, found)
|
|
|
|
uid, found = seqmap.Get(1)
|
|
assert.Equal(42, int(uid))
|
|
assert.Equal(true, found)
|
|
|
|
uid, found = seqmap.Pop(1)
|
|
assert.Equal(42, int(uid))
|
|
assert.Equal(true, found)
|
|
assert.Equal(2, seqmap.Size())
|
|
|
|
uid, found = seqmap.Get(1)
|
|
assert.Equal(1107, int(uid))
|
|
|
|
// Repeated puts of the same UID shouldn't change the size
|
|
seqmap.Put(1231)
|
|
assert.Equal(3, seqmap.Size())
|
|
seqmap.Put(1231)
|
|
assert.Equal(3, seqmap.Size())
|
|
|
|
uid, found = seqmap.Get(2)
|
|
assert.Equal(1231, int(uid))
|
|
|
|
_, found = seqmap.Pop(1)
|
|
assert.Equal(true, found)
|
|
assert.Equal(2, seqmap.Size())
|
|
|
|
seqmap.Initialize(nil)
|
|
assert.Equal(0, seqmap.Size())
|
|
|
|
var wg sync.WaitGroup
|
|
wg.Add(1)
|
|
go func() {
|
|
defer wg.Done()
|
|
seqmap.Initialize([]uint32{42, 1337})
|
|
}()
|
|
wg.Add(1)
|
|
go func() {
|
|
defer wg.Done()
|
|
for _, found := seqmap.Pop(1); !found; _, found = seqmap.Pop(1) {
|
|
time.Sleep(1 * time.Millisecond)
|
|
}
|
|
}()
|
|
wg.Add(1)
|
|
go func() {
|
|
defer wg.Done()
|
|
for _, found := seqmap.Pop(1); !found; _, found = seqmap.Pop(1) {
|
|
time.Sleep(1 * time.Millisecond)
|
|
}
|
|
}()
|
|
wg.Wait()
|
|
|
|
assert.Equal(0, seqmap.Size())
|
|
}
|