Update to pincharea tests

3 files changed, 139 insertions, 7 deletions

diff --git a/Qt/examples/declarative/pincharea/pincharea.qml b/Qt/examples/declarative/pincharea/pincharea.qml
new file mode 100644
index 0000000..2324ace
--- /dev/null
+++ b/Qt/examples/declarative/pincharea/pincharea.qml
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.1
+
+Rectangle {
+    width: 640
+    height: 360
+    color: pinchy.pinch.active ? "blue" : "gray"
+    Rectangle { color: "transparent"; border.color: "black"; x: 150; y: 150; height: 250; width: 250 }
+
+    PinchArea {
+        property int xpoint
+        property int ypoint
+        property int pinchscale
+        property int pinchrotation
+        id: pinchy
+        enabled: false
+        pinch.target: logo
+        anchors.fill: parent
+        pinch.dragAxis: Pinch.XandYAxis
+        pinch.minimumScale: 0.5
+        pinch.maximumScale: 2
+        pinch.minimumX: 50
+        pinch.maximumX: 300
+        pinch.minimumY: 50
+        pinch.maximumY: 300
+        pinch.minimumRotation: -150
+        pinch.maximumRotation: 150
+        onPinchUpdated: { xpoint = pinch.center.x; ypoint = pinch.center.y; pinchrotation = pinch.rotation; pinchscale = pinch.scale }
+    }
+
+    Rectangle {
+        id: logo; width: 200; height: 200
+        x: 100
+        y: 100
+        color: "white"
+        Image {
+            anchors.fill: parent
+            source: "qt-logo.jpg"
+        }
+    }
+
+    Rectangle {
+        id: enabler; height: 100; width: 100; anchors.right: parent.right; color: pinchy.enabled ? "green" : "red"
+        Text {
+            anchors.centerIn: parent; text: pinchy.enabled ? "Disable" : "Enable"
+        }
+        MouseArea {
+            anchors.fill: parent; onClicked: pinchy.enabled = !pinchy.enabled
+        }
+    }
+    Item {
+        Column {
+            Text {
+                text: "Scale: " + pinchy.pinchscale + " (" + pinchy.pinch.minimumScale + "/" + pinchy.pinch.maximumScale + ")"
+            }
+            Text {
+                text: "Coord: " + pinchy.xpoint + "/" + pinchy.ypoint + " (" + pinchy.pinch.minimumX + "/" + pinchy.pinch.maximumX + "," + pinchy.pinch.minimumY + "/" + pinchy.pinch.maximumY + ")"
+            }
+            Text {
+                text: "Rotation: " + pinchy.pinchrotation + " (" + pinchy.pinch.minimumRotation + "/" + pinchy.pinch.maximumRotation + ")"
+            }
+        }
+    }
+    Rectangle {
+        id: exit; height: 100; width: 100; anchors.right: parent.right; anchors.bottom: parent.bottom; color: "red"
+        Text { anchors.centerIn: parent; text: "Exit" }
+        MouseArea { anchors.fill: parent; onClicked: { Qt.quit(); } }
+    }
+    Rectangle {
+        id: reload; height: 100; width: 100; anchors.right: parent.right; anchors.verticalCenter: parent.verticalCenter; color: "green"
+        Text { anchors.centerIn: parent; text: "Reload" }
+        MouseArea { anchors.fill: parent; onClicked: { qmlViewer.reload(); } }
+    }
+}
diff --git a/Qt/examples/declarative/pincharea/qt-logo.jpg b/Qt/examples/declarative/pincharea/qt-logo.jpg
new file mode 100644
index 0000000..4014b46
--- /dev/null
+++ b/Qt/examples/declarative/pincharea/qt-logo.jpg
diff --git a/Qt/examples/declarative/pincharea/sys_pincharea/sys_pincharea.qtt b/Qt/examples/declarative/pincharea/sys_pincharea/sys_pincharea.qtt
index 2643689..a57caf6 100644
--- a/Qt/examples/declarative/pincharea/sys_pincharea/sys_pincharea.qtt
+++ b/Qt/examples/declarative/pincharea/sys_pincharea/sys_pincharea.qtt
@@ -39,18 +39,37 @@
 **
 ****************************************************************************/
 
-
 testcase = {
 
-  pincharea: function()
+  pincharea_resize: function()
   {
-      prompt(twiki('---+++ QTQMLBAT9202 - PinchArea example
-
+      prompt(twiki('Scaling
 | *Step* | *Verification* |
-| Execute examples/declarative/touchinteraction/pincharea/flickresize.qml | |
-| Place two fingers apart on any place in the display, and bring them together | Verify that the qt logo is scaled down (becomes smaller) |
-| Place two fingers close together on any place in the display, and push them apart | Verify that the qt logo is scaled up (becomes larger) |
+| Execute SystemTests/Qt/examples/declarative/pincharea/pincharea.qml | |
+| Press Enable | Enabler button turns green |
+| Place two fingers apart on any place in the display, and bring them together | Verify that the qt logo is scaled down (becomes smaller), no less than 50% |
+| Place two fingers close together on any place in the display, and push them apart | Verify that the qt logo is scaled up (becomes larger), no more than 200% |
 | Place two fingers apart on any place in the display, and bring them together, then push them apart | Verify that the qt logo is scaled down, then up |
 | Evaluate | All scaling of the logo should be done in sync with the movement of the fingers |'));
+  },
+
+  pincharea_rotate: function()
+  {
+      prompt(twiki('Rotation - If the target device is an N8, expect odd behavior when executing this test. The device does not have a multiple touch screen.
+| *Step* | *Verification* |
+| Execute SystemTests/Qt/examples/declarative/pincharea/pincharea.qml | |
+| Press Enable | Enabler button turns green |
+| Place two fingers apart on any place in the display, and turn them in a clockwise circle | The logo rotates with the movement of the fingers |
+| Rotate the logo beyond 180 degrees | The logo stops at 150 degrees and does not invert to -150 degrees |'));
+  },
+
+  pincharea_drag: function()
+  {
+    prompt(twiki('Dragging - If the target device is an N8, expect odd behavior when executing this test. The device does not have a multiple touch screen.
+| Execute SystemTests/Qt/examples/declarative/pincharea/pincharea.qml | |
+| Press Enable | Enabler button turns green |
+| Place two fingers on the display, and drag around the screen | |
+| | The logo moves in sync with the gesture. The logo does not move its center beyond the bounds of the rectangle |'));
   }
+
 }