Rename ControlSpy to SignalSequenceSpy

The purpose of this type is to spy a sequence of signals.

Change-Id: I4d4712e5ae3b9ec0cf292a75f86b3d8598ea89f6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

5 files changed, 35 insertions, 35 deletions

diff --git a/tests/auto/controls/data/ControlSpy.qml b/tests/auto/controls/data/SignalSequenceSpy.qml
index 45d603b8..f2729f6f 100644
--- a/tests/auto/controls/data/ControlSpy.qml
+++ b/tests/auto/controls/data/SignalSequenceSpy.qml
@@ -86,7 +86,7 @@ QtObject {
             return;
 
         if (sequenceIndex >= expectedSequence.length) {
-            console.warn("ControlSpy: Received unexpected signal '" + signalName + "' (none expected).")
+            console.warn("SignalSequenceSpy: Received unexpected signal '" + signalName + "' (none expected).")
             sequenceFailure = true
             return
         }
@@ -104,7 +104,7 @@ QtObject {
                 var expectedValues = expectedSignalData[1]
                 for (var p in expectedValues) {
                     if (target[p] != expectedValues[p]) {
-                        console.warn("ControlSpy: Value mismatch for property '" + p + "' after '" + signalName + "' signal." +
+                        console.warn("SignalSequenceSpy: Value mismatch for property '" + p + "' after '" + signalName + "' signal." +
                                      __mismatchValuesFormat(target[p], expectedValues[p]))
                         sequenceFailure = true
                         return
@@ -114,7 +114,7 @@ QtObject {
                 return
             }
         }
-        console.warn("ControlSpy: Received unexpected signal." +
+        console.warn("SignalSequenceSpy: Received unexpected signal." +
                      __mismatchValuesFormat(signalName, expectedSignal))
         sequenceFailure = true
     }
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 978ab3c3..66bb398d 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -55,7 +55,7 @@ TestCase {
         Button {
             id: control
 
-            property ControlSpy spy: ControlSpy {
+            property SignalSequenceSpy spy: SignalSequenceSpy {
                 target: control
                 signals: ["pressed", "released", "canceled", "clicked", "doubleClicked", "pressedChanged"]
             }
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 6b3718e2..315b077d 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -55,7 +55,7 @@ TestCase {
         CheckBox {
             id: control
 
-            property ControlSpy spy: ControlSpy {
+            property SignalSequenceSpy spy: SignalSequenceSpy {
                 target: control
                 signals: ["pressed", "released", "canceled", "clicked", "pressedChanged", "checkedChanged", "checkStateChanged"]
             }
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index 17e3355d..02382189 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -55,7 +55,7 @@ TestCase {
         RadioButton {
             id: control
 
-            property ControlSpy spy: ControlSpy {
+            property SignalSequenceSpy spy: SignalSequenceSpy {
                 target: control
                 signals: ["pressed", "released", "canceled", "clicked", "pressedChanged", "checkedChanged"]
             }
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index de5d7862..93b0c08f 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -214,8 +214,8 @@ TestCase {
         control.destroy();
     }
 
-    ControlSpy {
-        id: mouseEventControlSpy
+    SignalSequenceSpy {
+        id: mouseSignalSequenceSpy
         signals: ["pressed", "released", "canceled", "clicked", "doubleClicked", "pressedChanged"]
     }
 
@@ -225,13 +225,13 @@ TestCase {
 
         var overDragDistance = dragDistance * 1.1;
 
-        mouseEventControlSpy.target = control;
-        mouseEventControlSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
+        mouseSignalSequenceSpy.target = control;
+        mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
         mousePress(control, control.width / 2, control.height / 2);
         verify(control.pressed);
         compare(control.exposure.position, 0.0);
         verify(!control.exposure.active);
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
         verify(!control.exposure.leftItem);
         verify(!control.exposure.rightItem);
 
@@ -280,12 +280,12 @@ TestCase {
         verify(control.exposure.rightItem);
         verify(!control.exposure.rightItem.visible);
 
-        mouseEventControlSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
+        mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
         mouseRelease(control, control.width / 2, control.height / 2);
         verify(!control.pressed);
         compare(control.exposure.position, 1.0);
         verify(control.exposure.active);
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
         verify(control.exposure.leftItem);
         verify(control.exposure.leftItem.visible);
         verify(control.exposure.rightItem);
@@ -293,47 +293,47 @@ TestCase {
         tryCompare(control.contentItem, "x", control.width + control.leftPadding);
 
         // Swiping from the right and releasing early should return position to 1.0.
-        mouseEventControlSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
+        mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
         mousePress(control, control.width / 2, control.height / 2);
         verify(control.pressed);
         compare(control.exposure.position, 1.0);
         // exposed should still be true, because we haven't moved yet, and hence
         // haven't started grabbing behind's mouse events.
         verify(control.exposure.active);
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
 
         mouseMove(control, control.width / 2 - overDragDistance, control.height / 2);
         verify(control.pressed);
         verify(!control.exposure.active);
         compare(control.exposure.position, 1.0 - overDragDistance / control.width);
 
-        mouseEventControlSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
+        mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
         mouseRelease(control, control.width * 0.4, control.height / 2);
         verify(!control.pressed);
         compare(control.exposure.position, 1.0);
         verify(control.exposure.active);
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
         tryCompare(control.contentItem, "x", control.width + control.leftPadding);
 
         // Swiping from the right and releasing should return contents to default position.
-        mouseEventControlSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
+        mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
         mousePress(control, control.width / 2, control.height / 2);
         verify(control.pressed);
         compare(control.exposure.position, 1.0);
         verify(control.exposure.active);
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
 
         mouseMove(control, control.width * -0.1, control.height / 2);
         verify(control.pressed);
         verify(!control.exposure.active);
         compare(control.exposure.position, 0.4);
 
-        mouseEventControlSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
+        mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
         mouseRelease(control, control.width * -0.1, control.height / 2);
         verify(!control.pressed);
         compare(control.exposure.position, 0.0);
         verify(!control.exposure.active);
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
         tryCompare(control.contentItem, "x", control.leftPadding);
 
         control.destroy();
@@ -358,13 +358,13 @@ TestCase {
 
         distance *= data.direction;
 
-        mouseEventControlSpy.target = control;
-        mouseEventControlSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
+        mouseSignalSequenceSpy.target = control;
+        mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
         mousePress(control, control.width / 2, control.height / 2);
         verify(control.pressed);
         compare(control.exposure.position, 0.0);
         verify(!control.exposure.active);
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
         verify(!control.exposure.leftItem);
         verify(!control.exposure.rightItem);
 
@@ -397,14 +397,14 @@ TestCase {
         compare(expectedVisibleItem.objectName, expectedVisibleObjectName);
         verify(!expectedHiddenItem);
 
-        mouseEventControlSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
+        mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
         // Add a delay to ensure that the release event doesn't happen too quickly,
         // and hence that the second timestamp isn't zero (can happen with e.g. release builds).
         mouseRelease(control, control.width / 2 + distance, control.height / 2, Qt.LeftButton, Qt.NoModifier, 30);
         verify(!control.pressed);
         compare(control.exposure.position, data.direction);
         verify(control.exposure.active);
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
         verify(expectedVisibleItem);
         verify(expectedVisibleItem.visible);
         verify(!expectedHiddenItem);
@@ -464,29 +464,29 @@ TestCase {
         verify(control);
 
         // click
-        mouseEventControlSpy.target = control;
-        mouseEventControlSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
+        mouseSignalSequenceSpy.target = control;
+        mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true }], "pressed"];
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton);
         compare(control.pressed, true);
 
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
 
-        mouseEventControlSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
+        mouseSignalSequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false }], "released", "clicked"];
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton);
         compare(control.pressed, false);
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
 
         // right button
-        mouseEventControlSpy.expectedSequence = [];
+        mouseSignalSequenceSpy.expectedSequence = [];
         mousePress(control, control.width / 2, control.height / 2, Qt.RightButton);
         compare(control.pressed, false);
 
         mouseRelease(control, control.width / 2, control.height / 2, Qt.RightButton);
         compare(control.pressed, false);
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
 
         // double click
-        mouseEventControlSpy.expectedSequence = [
+        mouseSignalSequenceSpy.expectedSequence = [
             ["pressedChanged", { "pressed": true }],
             "pressed",
             ["pressedChanged", { "pressed": false }],
@@ -500,7 +500,7 @@ TestCase {
             "clicked"
         ];
         mouseDoubleClickSequence(control, control.width / 2, control.height / 2, Qt.LeftButton);
-        verify(mouseEventControlSpy.success);
+        verify(mouseSignalSequenceSpy.success);
 
         control.destroy();
     }