joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-07 18:35:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

io/router: remove countPointerEvents

Browse Source 
assertEventSequence is shorter and clearer and more precise.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-06-03 10:03:01 +02:00
parent d489c20b84
commit 275a91f26a
1 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/router/pointer_test.go
+3 -30
View File
@@ -39,10 +39,7 @@ func TestPointerDrag(t *testing.T) {
}, },
}, },
) )
ev := r.Events(handler) assertEventSequence(t, r.Events(handler), pointer.Cancel, pointer.Enter, pointer.Press, pointer.Leave, pointer.Move)
if moves := countPointerEvents(pointer.Move, ev); moves != 1 {
t.Errorf("got %d move events, expected 1", moves)
}
} }
func TestPointerMove(t *testing.T) { func TestPointerMove(t *testing.T) {
@@ -85,32 +82,8 @@ func TestPointerMove(t *testing.T) {
}, },
}, },
) )
ev1 := r.Events(handler1) assertEventSequence(t, r.Events(handler1), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Move, pointer.Leave)
if cancels := countPointerEvents(pointer.Cancel, ev1); cancels != 1 { assertEventSequence(t, r.Events(handler2), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Leave)
t.Errorf("got %d cancel events, expected 1", cancels)
}
ev2 := r.Events(handler2)
if cancels := countPointerEvents(pointer.Cancel, ev2); cancels != 1 {
t.Errorf("got %d cancel events, expected 1", cancels)
}
if moves := countPointerEvents(pointer.Move, ev1); moves != 2 {
t.Errorf("got %d move events, expected 2", moves)
}
if moves := countPointerEvents(pointer.Move, ev2); moves != 1 {
t.Errorf("got %d move events, expected 1", moves)
}
}
func countPointerEvents(typ pointer.Type, events []event.Event) int {
c := 0
for _, e := range events {
if e, ok := e.(pointer.Event); ok {
if e.Type == typ {
c++
}
}
}
return c
} }
func TestPointerEnterLeave(t *testing.T) { func TestPointerEnterLeave(t *testing.T) {