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

io/router, internal/ops: minor refactoring

Browse Source 
Rename the assertEventSequence helper to assertEventPointerTypeSequence.
Fix typos.

Signed-off-by: Pierre Curto <pierre.curto@gmail.com>
This commit is contained in:
Pierre Curto
2021-11-24 09:52:14 +01:00
committed by Elias Naur
parent 5fd4ecb011
commit 218a9588d6
2 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ops/ops.go
+2 -2
View File
@@ -269,7 +269,7 @@ func Save(o *Ops) StateOp {
return s return s
} }
// load a previously saved operations state given // Load a previously saved operations state given
// its ID. // its ID.
func (s StateOp) Load() { func (s StateOp) Load() {
bo := binary.LittleEndian bo := binary.LittleEndian
@@ -427,6 +427,6 @@ func (t OpType) String() string {
case TypeStroke: case TypeStroke:
return "Stroke" return "Stroke"
default: default:
panic("unnkown OpType") panic("unknown OpType")
} }
} }
io/router/pointer_test.go
+58 -58
View File
@@ -28,7 +28,7 @@ func TestPointerWakeup(t *testing.T) {
t.Errorf("adding pointer.InputOp triggered a redraw") t.Errorf("adding pointer.InputOp triggered a redraw")
} }
// However, adding a handler queues a Cancel event. // However, adding a handler queues a Cancel event.
assertEventSequence(t, r.Events(handler), pointer.Cancel) assertEventPointerTypeSequence(t, r.Events(handler), pointer.Cancel)
// Verify that r.Events does trigger a redraw. // Verify that r.Events does trigger a redraw.
r.Frame(&ops) r.Frame(&ops)
if _, wake := r.WakeupTime(); !wake { if _, wake := r.WakeupTime(); !wake {
@@ -55,7 +55,7 @@ func TestPointerDrag(t *testing.T) {
Position: f32.Pt(150, 150), Position: f32.Pt(150, 150),
}, },
) )
assertEventSequence(t, r.Events(handler), pointer.Cancel, pointer.Enter, pointer.Press, pointer.Leave, pointer.Drag) assertEventPointerTypeSequence(t, r.Events(handler), pointer.Cancel, pointer.Enter, pointer.Press, pointer.Leave, pointer.Drag)
} }
func TestPointerDragNegative(t *testing.T) { func TestPointerDragNegative(t *testing.T) {
@@ -77,7 +77,7 @@ func TestPointerDragNegative(t *testing.T) {
Position: f32.Pt(-150, -150), Position: f32.Pt(-150, -150),
}, },
) )
assertEventSequence(t, r.Events(handler), pointer.Cancel, pointer.Enter, pointer.Press, pointer.Leave, pointer.Drag) assertEventPointerTypeSequence(t, r.Events(handler), pointer.Cancel, pointer.Enter, pointer.Press, pointer.Leave, pointer.Drag)
} }
func TestPointerGrab(t *testing.T) { func TestPointerGrab(t *testing.T) {
@@ -100,9 +100,9 @@ func TestPointerGrab(t *testing.T) {
Position: f32.Pt(50, 50), Position: f32.Pt(50, 50),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Cancel, pointer.Press) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Cancel, pointer.Press)
assertEventSequence(t, r.Events(handler2), pointer.Cancel, pointer.Press) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Cancel, pointer.Press)
assertEventSequence(t, r.Events(handler3), pointer.Cancel, pointer.Press) assertEventPointerTypeSequence(t, r.Events(handler3), pointer.Cancel, pointer.Press)
r.Frame(&ops) r.Frame(&ops)
r.Queue( r.Queue(
pointer.Event{ pointer.Event{
@@ -110,9 +110,9 @@ func TestPointerGrab(t *testing.T) {
Position: f32.Pt(50, 50), Position: f32.Pt(50, 50),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Release) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Release)
assertEventSequence(t, r.Events(handler2), pointer.Cancel) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Cancel)
assertEventSequence(t, r.Events(handler3), pointer.Cancel) assertEventPointerTypeSequence(t, r.Events(handler3), pointer.Cancel)
} }
func TestPointerGrabSameHandlerTwice(t *testing.T) { func TestPointerGrabSameHandlerTwice(t *testing.T) {
@@ -134,8 +134,8 @@ func TestPointerGrabSameHandlerTwice(t *testing.T) {
Position: f32.Pt(50, 50), Position: f32.Pt(50, 50),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Cancel, pointer.Press) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Cancel, pointer.Press)
assertEventSequence(t, r.Events(handler2), pointer.Cancel, pointer.Press) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Cancel, pointer.Press)
r.Frame(&ops) r.Frame(&ops)
r.Queue( r.Queue(
pointer.Event{ pointer.Event{
@@ -143,8 +143,8 @@ func TestPointerGrabSameHandlerTwice(t *testing.T) {
Position: f32.Pt(50, 50), Position: f32.Pt(50, 50),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Release) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Release)
assertEventSequence(t, r.Events(handler2), pointer.Cancel) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Cancel)
} }
func TestPointerMove(t *testing.T) { func TestPointerMove(t *testing.T) {
@@ -185,8 +185,8 @@ func TestPointerMove(t *testing.T) {
Type: pointer.Cancel, Type: pointer.Cancel,
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Move, pointer.Leave, pointer.Cancel) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Move, pointer.Leave, pointer.Cancel)
assertEventSequence(t, r.Events(handler2), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Leave, pointer.Cancel) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Leave, pointer.Cancel)
} }
func TestPointerTypes(t *testing.T) { func TestPointerTypes(t *testing.T) {
@@ -215,7 +215,7 @@ func TestPointerTypes(t *testing.T) {
Position: f32.Pt(150, 150), Position: f32.Pt(150, 150),
}, },
) )
assertEventSequence(t, r.Events(handler), pointer.Cancel, pointer.Press, pointer.Release) assertEventPointerTypeSequence(t, r.Events(handler), pointer.Cancel, pointer.Press, pointer.Release)
} }
func TestPointerPriority(t *testing.T) { func TestPointerPriority(t *testing.T) {
@@ -279,9 +279,9 @@ func TestPointerPriority(t *testing.T) {
hev1 := r.Events(handler1) hev1 := r.Events(handler1)
hev2 := r.Events(handler2) hev2 := r.Events(handler2)
hev3 := r.Events(handler3) hev3 := r.Events(handler3)
assertEventSequence(t, hev1, pointer.Cancel, pointer.Scroll, pointer.Scroll) assertEventPointerTypeSequence(t, hev1, pointer.Cancel, pointer.Scroll, pointer.Scroll)
assertEventSequence(t, hev2, pointer.Cancel, pointer.Scroll) assertEventPointerTypeSequence(t, hev2, pointer.Cancel, pointer.Scroll)
assertEventSequence(t, hev3, pointer.Cancel, pointer.Scroll) assertEventPointerTypeSequence(t, hev3, pointer.Cancel, pointer.Scroll)
assertEventPriorities(t, hev1, pointer.Shared, pointer.Shared, pointer.Foremost) assertEventPriorities(t, hev1, pointer.Shared, pointer.Shared, pointer.Foremost)
assertEventPriorities(t, hev2, pointer.Shared, pointer.Foremost) assertEventPriorities(t, hev2, pointer.Shared, pointer.Foremost)
assertEventPriorities(t, hev3, pointer.Shared, pointer.Foremost) assertEventPriorities(t, hev3, pointer.Shared, pointer.Foremost)
@@ -314,8 +314,8 @@ func TestPointerEnterLeave(t *testing.T) {
// First event for a handler is always a Cancel. // First event for a handler is always a Cancel.
// Only handler2 should receive the enter/move events because it is on top // Only handler2 should receive the enter/move events because it is on top
// and handler1 is not an ancestor in the hit tree. // and handler1 is not an ancestor in the hit tree.
assertEventSequence(t, r.Events(handler1), pointer.Cancel) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Cancel)
assertEventSequence(t, r.Events(handler2), pointer.Cancel, pointer.Enter, pointer.Move) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Cancel, pointer.Enter, pointer.Move)
// Leave the second area by moving into the first. // Leave the second area by moving into the first.
r.Queue( r.Queue(
@@ -325,8 +325,8 @@ func TestPointerEnterLeave(t *testing.T) {
}, },
) )
// The cursor leaves handler2 and enters handler1. // The cursor leaves handler2 and enters handler1.
assertEventSequence(t, r.Events(handler1), pointer.Enter, pointer.Move) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Enter, pointer.Move)
assertEventSequence(t, r.Events(handler2), pointer.Leave) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Leave)
// Move, but stay within the same hit area. // Move, but stay within the same hit area.
r.Queue( r.Queue(
@@ -335,8 +335,8 @@ func TestPointerEnterLeave(t *testing.T) {
Position: f32.Pt(40, 40), Position: f32.Pt(40, 40),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Move) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Move)
assertEventSequence(t, r.Events(handler2)) assertEventPointerTypeSequence(t, r.Events(handler2))
// Move outside of both inputs. // Move outside of both inputs.
r.Queue( r.Queue(
@@ -345,8 +345,8 @@ func TestPointerEnterLeave(t *testing.T) {
Position: f32.Pt(300, 300), Position: f32.Pt(300, 300),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Leave) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Leave)
assertEventSequence(t, r.Events(handler2)) assertEventPointerTypeSequence(t, r.Events(handler2))
// Check that a Press event generates Enter Events. // Check that a Press event generates Enter Events.
r.Queue( r.Queue(
@@ -355,8 +355,8 @@ func TestPointerEnterLeave(t *testing.T) {
Position: f32.Pt(125, 125), Position: f32.Pt(125, 125),
}, },
) )
assertEventSequence(t, r.Events(handler1)) assertEventPointerTypeSequence(t, r.Events(handler1))
assertEventSequence(t, r.Events(handler2), pointer.Enter, pointer.Press) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Enter, pointer.Press)
// Check that a drag only affects the participating handlers. // Check that a drag only affects the participating handlers.
r.Queue( r.Queue(
@@ -371,8 +371,8 @@ func TestPointerEnterLeave(t *testing.T) {
Position: f32.Pt(50, 50), Position: f32.Pt(50, 50),
}, },
) )
assertEventSequence(t, r.Events(handler1)) assertEventPointerTypeSequence(t, r.Events(handler1))
assertEventSequence(t, r.Events(handler2), pointer.Leave, pointer.Drag, pointer.Enter, pointer.Drag) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Leave, pointer.Drag, pointer.Enter, pointer.Drag)
// Check that a Release event generates Enter/Leave Events. // Check that a Release event generates Enter/Leave Events.
r.Queue( r.Queue(
@@ -382,9 +382,9 @@ func TestPointerEnterLeave(t *testing.T) {
25), 25),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Enter) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Enter)
// The second handler gets the release event because the press started inside it. // The second handler gets the release event because the press started inside it.
assertEventSequence(t, r.Events(handler2), pointer.Release, pointer.Leave) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Release, pointer.Leave)
} }
@@ -417,7 +417,7 @@ func TestMultipleAreas(t *testing.T) {
Position: f32.Pt(50, 50), Position: f32.Pt(50, 50),
}, },
) )
assertEventSequence(t, r.Events(handler), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Move, pointer.Move) assertEventPointerTypeSequence(t, r.Events(handler), pointer.Cancel, pointer.Enter, pointer.Move, pointer.Move, pointer.Move)
} }
func TestPointerEnterLeaveNested(t *testing.T) { func TestPointerEnterLeaveNested(t *testing.T) {
@@ -448,8 +448,8 @@ func TestPointerEnterLeaveNested(t *testing.T) {
) )
// First event for a handler is always a Cancel. // First event for a handler is always a Cancel.
// Both handlers should receive the Enter and Move events because handler2 is a child of handler1. // Both handlers should receive the Enter and Move events because handler2 is a child of handler1.
assertEventSequence(t, r.Events(handler1), pointer.Cancel, pointer.Enter, pointer.Move) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Cancel, pointer.Enter, pointer.Move)
assertEventSequence(t, r.Events(handler2), pointer.Cancel, pointer.Enter, pointer.Move) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Cancel, pointer.Enter, pointer.Move)
// Leave the second area by moving into the first. // Leave the second area by moving into the first.
r.Queue( r.Queue(
@@ -458,8 +458,8 @@ func TestPointerEnterLeaveNested(t *testing.T) {
Position: f32.Pt(20, 20), Position: f32.Pt(20, 20),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Move) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Move)
assertEventSequence(t, r.Events(handler2), pointer.Leave) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Leave)
// Move, but stay within the same hit area. // Move, but stay within the same hit area.
r.Queue( r.Queue(
@@ -468,8 +468,8 @@ func TestPointerEnterLeaveNested(t *testing.T) {
Position: f32.Pt(10, 10), Position: f32.Pt(10, 10),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Move) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Move)
assertEventSequence(t, r.Events(handler2)) assertEventPointerTypeSequence(t, r.Events(handler2))
// Move outside of both inputs. // Move outside of both inputs.
r.Queue( r.Queue(
@@ -478,8 +478,8 @@ func TestPointerEnterLeaveNested(t *testing.T) {
Position: f32.Pt(200, 200), Position: f32.Pt(200, 200),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Leave) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Leave)
assertEventSequence(t, r.Events(handler2)) assertEventPointerTypeSequence(t, r.Events(handler2))
// Check that a Press event generates Enter Events. // Check that a Press event generates Enter Events.
r.Queue( r.Queue(
@@ -488,8 +488,8 @@ func TestPointerEnterLeaveNested(t *testing.T) {
Position: f32.Pt(50, 50), Position: f32.Pt(50, 50),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Enter, pointer.Press) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Enter, pointer.Press)
assertEventSequence(t, r.Events(handler2), pointer.Enter, pointer.Press) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Enter, pointer.Press)
// Check that a Release event generates Enter/Leave Events. // Check that a Release event generates Enter/Leave Events.
r.Queue( r.Queue(
@@ -498,8 +498,8 @@ func TestPointerEnterLeaveNested(t *testing.T) {
Position: f32.Pt(20, 20), Position: f32.Pt(20, 20),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Release) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Release)
assertEventSequence(t, r.Events(handler2), pointer.Release, pointer.Leave) assertEventPointerTypeSequence(t, r.Events(handler2), pointer.Release, pointer.Leave)
} }
func TestPointerActiveInputDisappears(t *testing.T) { func TestPointerActiveInputDisappears(t *testing.T) {
@@ -517,7 +517,7 @@ func TestPointerActiveInputDisappears(t *testing.T) {
Position: f32.Pt(25, 25), Position: f32.Pt(25, 25),
}, },
) )
assertEventSequence(t, r.Events(handler1), pointer.Cancel, pointer.Enter, pointer.Move) assertEventPointerTypeSequence(t, r.Events(handler1), pointer.Cancel, pointer.Enter, pointer.Move)
// Re-render with handler missing. // Re-render with handler missing.
ops.Reset() ops.Reset()
@@ -528,7 +528,7 @@ func TestPointerActiveInputDisappears(t *testing.T) {
Position: f32.Pt(25, 25), Position: f32.Pt(25, 25),
}, },
) )
assertEventSequence(t, r.Events(handler1)) assertEventPointerTypeSequence(t, r.Events(handler1))
} }
func TestMultitouch(t *testing.T) { func TestMultitouch(t *testing.T) {
@@ -565,8 +565,8 @@ func TestMultitouch(t *testing.T) {
PointerID: p2, PointerID: p2,
}, },
) )
assertEventSequence(t, r.Events(h1), pointer.Cancel, pointer.Enter, pointer.Press) assertEventPointerTypeSequence(t, r.Events(h1), pointer.Cancel, pointer.Enter, pointer.Press)
assertEventSequence(t, r.Events(h2), pointer.Cancel, pointer.Enter, pointer.Press, pointer.Release) assertEventPointerTypeSequence(t, r.Events(h2), pointer.Cancel, pointer.Enter, pointer.Press, pointer.Release)
} }
func TestCursorNameOp(t *testing.T) { func TestCursorNameOp(t *testing.T) {
@@ -712,10 +712,10 @@ func TestPassOp(t *testing.T) {
Type: pointer.Press, Type: pointer.Press,
}, },
) )
assertEventSequence(t, r.Events(h1), pointer.Cancel, pointer.Press) assertEventPointerTypeSequence(t, r.Events(h1), pointer.Cancel, pointer.Press)
assertEventSequence(t, r.Events(h2), pointer.Cancel, pointer.Press) assertEventPointerTypeSequence(t, r.Events(h2), pointer.Cancel, pointer.Press)
assertEventSequence(t, r.Events(h3), pointer.Cancel, pointer.Press) assertEventPointerTypeSequence(t, r.Events(h3), pointer.Cancel, pointer.Press)
assertEventSequence(t, r.Events(h4), pointer.Cancel, pointer.Press) assertEventPointerTypeSequence(t, r.Events(h4), pointer.Cancel, pointer.Press)
} }
func TestAreaPassthrough(t *testing.T) { func TestAreaPassthrough(t *testing.T) {
@@ -731,7 +731,7 @@ func TestAreaPassthrough(t *testing.T) {
Type: pointer.Press, Type: pointer.Press,
}, },
) )
assertEventSequence(t, r.Events(h), pointer.Cancel, pointer.Press) assertEventPointerTypeSequence(t, r.Events(h), pointer.Cancel, pointer.Press)
} }
func TestEllipse(t *testing.T) { func TestEllipse(t *testing.T) {
@@ -758,7 +758,7 @@ func TestEllipse(t *testing.T) {
Type: pointer.Press, Type: pointer.Press,
}, },
) )
assertEventSequence(t, r.Events(h), pointer.Cancel, pointer.Press) assertEventPointerTypeSequence(t, r.Events(h), pointer.Cancel, pointer.Press)
} }
// addPointerHandler adds a pointer.InputOp for the tag in a // addPointerHandler adds a pointer.InputOp for the tag in a
@@ -784,9 +784,9 @@ func pointerTypes(events []event.Event) []pointer.Type {
return types return types
} }
// assertEventSequence checks that the provided events match the expected pointer event types // assertEventPointerTypeSequence checks that the provided events match the expected pointer event types
// in the provided order. // in the provided order.
func assertEventSequence(t *testing.T, events []event.Event, expected ...pointer.Type) { func assertEventPointerTypeSequence(t *testing.T, events []event.Event, expected ...pointer.Type) {
t.Helper() t.Helper()
got := pointerTypes(events) got := pointerTypes(events)
if !reflect.DeepEqual(got, expected) { if !reflect.DeepEqual(got, expected) {