aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qtquick1/qdeclarativeanimations
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qtquick1/qdeclarativeanimations')
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/Double.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/attached.qml34
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badproperty1.qml21
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badproperty2.qml21
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badtype1.qml12
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badtype2.qml12
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badtype3.qml12
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badtype4.qml27
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/dontAutoStart.qml18
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/dontStart.qml19
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/dontStart2.qml19
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/dotproperty.qml24
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/doubleRegistrationBug.qml8
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/mixedtype1.qml25
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/mixedtype2.qml25
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/nonTransitionBug.qml30
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/pauseBug.qml7
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/properties.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/properties2.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/properties3.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/properties4.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/properties5.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition2.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition3.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition4.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition5.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition6.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition7.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/registrationBug.qml18
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/rotation.qml48
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/runningTrueBug.qml30
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/transitionAssignmentBug.qml12
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/valuesource.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/valuesource2.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro8
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/tst_qdeclarativeanimations.cpp877
37 files changed, 0 insertions, 1622 deletions
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/Double.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/Double.qml
deleted file mode 100644
index b247fcee5f..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/Double.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: container
- property bool on: false
- border.color: "#ffffff"
- color: "green"
- width: 50
- height: 50
- NumberAnimation on x {
- objectName: "animation"
- running: container.on; from: 0; to: 600; loops: Animation.Infinite; duration: 2000
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/attached.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/attached.qml
deleted file mode 100644
index c5d5535bb7..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/attached.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 180; height: 200;
-
- Component {
- id: delegate
- Rectangle {
- id: wrapper
- width: 180; height: 200
- color: "blue"
-
- states: State {
- name: "otherState"
- PropertyChanges { target: wrapper; color: "green" }
- }
-
- transitions: Transition {
- PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
- ScriptAction { script: console.log(wrapper.ListView.delayRemove ? "on" : "off") }
- }
-
- Component.onCompleted: {
- console.log(ListView.delayRemove ? "on" : "off");
- wrapper.state = "otherState"
- }
- }
- }
-
- ListView {
- model: 1
- delegate: delegate
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/badproperty1.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/badproperty1.qml
deleted file mode 100644
index 3e7ebe7440..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/badproperty1.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: wrapper
- width: 240
- height: 320
- Rectangle {
- id: myRect
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- }
- states: State {
- name: "state1"
- PropertyChanges { target: myRect; border.color: "blue" }
- }
- transitions: Transition {
- ColorAnimation { target: myRect; to: "red"; property: "border.colr"; duration: 1000 }
- }
- Component.onCompleted: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/badproperty2.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/badproperty2.qml
deleted file mode 100644
index 40235eee15..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/badproperty2.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: wrapper
- width: 240
- height: 320
- Rectangle {
- id: myRect
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- }
- states: State {
- name: "state1"
- PropertyChanges { target: myRect; border.color: "blue" }
- }
- transitions: Transition {
- ColorAnimation { target: myRect; to: "red"; property: "border"; duration: 1000 }
- }
- Component.onCompleted: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/badtype1.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/badtype1.qml
deleted file mode 100644
index 0a8a7ea7f9..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/badtype1.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 240
- height: 320
- Rectangle {
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- PropertyAnimation on x { from: "blue"; to: "green"; }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/badtype2.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/badtype2.qml
deleted file mode 100644
index 118bbbc889..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/badtype2.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 240
- height: 320
- Rectangle {
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- NumberAnimation on x { from: "blue"; to: "green"; }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/badtype3.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/badtype3.qml
deleted file mode 100644
index 2599e70cc9..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/badtype3.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 240
- height: 320
- Rectangle {
- color: "red"
- ColorAnimation on color { from: 10; to: 15; }
- width: 50; height: 50
- x: 100; y: 100
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/badtype4.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/badtype4.qml
deleted file mode 100644
index 5dafb0e344..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/badtype4.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: wrapper
- width: 240
- height: 320
- Rectangle {
- id: myRect
- objectName: "MyRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- MouseArea {
- anchors.fill: parent
- onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
- }
- }
- states: State {
- name: "state1"
- PropertyChanges { target: myRect; x: 200; color: "blue" }
- }
- transitions: Transition {
- //comment out each in turn to make sure each only animates the relevant property
- ColorAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color
- NumberAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/dontAutoStart.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/dontAutoStart.qml
deleted file mode 100644
index e2ce07fbfc..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/dontAutoStart.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: wrapper
- width: 600
- height: 400
-
- Rectangle {
- id: redRect
- width: 100; height: 100
- color: Qt.rgba(1,0,0)
- Behavior on x {
- NumberAnimation { id: myAnim; objectName: "MyAnim"; target: redRect; property: "y"; to: 300; loops: Animation.Infinite}
- }
-
- }
-
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/dontStart.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/dontStart.qml
deleted file mode 100644
index 6b8031769f..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/dontStart.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: wrapper
- width: 600
- height: 400
-
- Rectangle {
- id: redRect
- width: 100; height: 100
- color: Qt.rgba(1,0,0)
- SequentialAnimation on x {
- running: false
- NumberAnimation { objectName: "MyAnim"; running: true }
- }
-
- }
-
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/dontStart2.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/dontStart2.qml
deleted file mode 100644
index 2563c01d4f..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/dontStart2.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: wrapper
- width: 600
- height: 400
-
- Rectangle {
- id: redRect
- width: 100; height: 100
- color: Qt.rgba(1,0,0)
-
- transitions: Transition {
- SequentialAnimation {
- NumberAnimation { id: myAnim; objectName: "MyAnim"; running: true }
- }
- }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/dotproperty.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/dotproperty.qml
deleted file mode 100644
index aff69e5c12..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/dotproperty.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: wrapper
- width: 240
- height: 320
- Rectangle {
- id: myRect
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- MouseArea {
- anchors.fill: parent
- onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
- }
- }
- states: State {
- name: "state1"
- PropertyChanges { target: myRect; border.color: "blue" }
- }
- transitions: Transition {
- ColorAnimation { properties: "border.color"; duration: 1000 }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/doubleRegistrationBug.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/doubleRegistrationBug.qml
deleted file mode 100644
index f0fdf9cfb5..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/doubleRegistrationBug.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400; height: 400
-
- Double { id: dub; on: parent.width < 800 }
- Component.onCompleted: dub.on = false
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/mixedtype1.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/mixedtype1.qml
deleted file mode 100644
index a97b3fd5bf..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/mixedtype1.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: wrapper
- width: 240
- height: 320
- Rectangle {
- id: myRect
- objectName: "MyRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- MouseArea {
- anchors.fill: parent
- onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
- }
- }
- states: State {
- name: "state1"
- PropertyChanges { target: myRect; x: 200; border.width: 10 }
- }
- transitions: Transition {
- PropertyAnimation { properties: "x,border.width"; duration: 1000 } //x is real, border.width is int
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/mixedtype2.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/mixedtype2.qml
deleted file mode 100644
index 9a77467820..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/mixedtype2.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: wrapper
- width: 240
- height: 320
- Rectangle {
- id: myRect
- objectName: "MyRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- MouseArea {
- anchors.fill: parent
- onClicked: if (wrapper.state == "state1") wrapper.state = ""; else wrapper.state = "state1";
- }
- }
- states: State {
- name: "state1"
- PropertyChanges { target: myRect; x: 200; color: "blue" }
- }
- transitions: Transition {
- PropertyAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/nonTransitionBug.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/nonTransitionBug.qml
deleted file mode 100644
index 04741ff348..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/nonTransitionBug.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: root
- width: 200
- height: 200
-
- Rectangle {
- id: mover
- objectName: "mover"
- }
-
- states: [
- State {
- name: "free"
- },
- State {
- name: "left"
- PropertyChanges {
- restoreEntryValues: false
- target: mover
- x: 0
- }
- }
- ]
-
- transitions: Transition {
- PropertyAnimation { properties: "x"; duration: 50 }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/pauseBug.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/pauseBug.qml
deleted file mode 100644
index d514cf7c43..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/pauseBug.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 1.1
-
-SequentialAnimation {
- id: animation
- running: true
- ScriptAction { script: animation.paused = true }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/properties.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/properties.qml
deleted file mode 100644
index e6af9acc93..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/properties.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- NumberAnimation on x { to: 200 }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/properties2.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/properties2.qml
deleted file mode 100644
index 60ec456c71..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/properties2.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- NumberAnimation on x { targets: theRect; properties: "x"; to: 200; }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/properties3.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/properties3.qml
deleted file mode 100644
index e86eca1316..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/properties3.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- NumberAnimation on x { target: theRect; property: "x"; to: 300; }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/properties4.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/properties4.qml
deleted file mode 100644
index 04d41c64c1..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/properties4.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- NumberAnimation on x { target: theRect; property: "y"; to: 200; }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/properties5.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/properties5.qml
deleted file mode 100644
index e139f8c6c0..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/properties5.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- NumberAnimation on x { targets: theRect; properties: "y"; to: 200; }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition.qml
deleted file mode 100644
index 8e2b41db6c..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- }
-
- states: State {
- name: "moved"
- PropertyChanges {
- target: theRect
- x: 200
- }
- }
- transitions: Transition {
- NumberAnimation { targets: theRect; properties: "x" }
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked: parent.state = "moved"
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition2.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition2.qml
deleted file mode 100644
index 6b846852ff..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition2.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- }
-
- states: State {
- name: "moved"
- PropertyChanges {
- target: theRect
- x: 200
- }
- }
- transitions: Transition {
- NumberAnimation { target: theRect; property: "y"; to: 200 }
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked: parent.state = "moved"
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition3.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition3.qml
deleted file mode 100644
index c9d8e95bd3..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition3.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- }
-
- states: State {
- name: "moved"
- PropertyChanges {
- target: theRect
- x: 200
- }
- }
- transitions: Transition {
- NumberAnimation { targets: theRect; properties: "y" }
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked: parent.state = "moved"
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition4.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition4.qml
deleted file mode 100644
index 61e8a96788..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition4.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- }
-
- states: State {
- name: "moved"
- PropertyChanges {
- target: theRect
- x: 200
- }
- }
- transitions: Transition {
- NumberAnimation { target: theRect; properties: "x" }
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked: parent.state = "moved"
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition5.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition5.qml
deleted file mode 100644
index b023943007..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition5.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- }
-
- states: State {
- name: "moved"
- PropertyChanges {
- target: theRect
- x: 200
- }
- }
- transitions: Transition {
- NumberAnimation { targets: theRect; property: "x" }
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked: parent.state = "moved"
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition6.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition6.qml
deleted file mode 100644
index 7c88a7f038..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition6.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- }
-
- states: State {
- name: "moved"
- PropertyChanges {
- target: theRect
- x: 200
- }
- }
- transitions: Transition {
- NumberAnimation { targets: theItem; properties: "x" }
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked: parent.state = "moved"
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition7.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition7.qml
deleted file mode 100644
index fbef95e572..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition7.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: theRect
- objectName: "TheRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- }
-
- states: State {
- name: "moved"
- PropertyChanges {
- target: theRect
- x: 200
- }
- }
- transitions: Transition {
- SpringAnimation { targets: theRect; properties: "x"; velocity: 10000 }
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked: parent.state = "moved"
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/registrationBug.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/registrationBug.qml
deleted file mode 100644
index 7dc29f9315..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/registrationBug.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- id: rect
- width: 200
- height: 200
-
- property bool animating: true
- property int value: 0
-
- NumberAnimation {
- target: rect
- property: "value"
- running: rect.animating
- to: 100
- duration: 50
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/rotation.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/rotation.qml
deleted file mode 100644
index ac158df719..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/rotation.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 600; height: 200
-
- Row {
- spacing: 5
- Rectangle {
- id: rr
- objectName: "rr"
- color: "red"
- width: 100; height: 100
- }
- Rectangle {
- id: rr2
- objectName: "rr2"
- color: "red"
- width: 100; height: 100
- }
- Rectangle {
- id: rr3
- objectName: "rr3"
- color: "red"
- width: 100; height: 100
- }
- Rectangle {
- id: rr4
- objectName: "rr4"
- color: "red"
- width: 100; height: 100
- }
- }
-
- states: State {
- name: "state1"
- PropertyChanges { target: rr; rotation: 370 }
- PropertyChanges { target: rr2; rotation: 370 }
- PropertyChanges { target: rr3; rotation: 370 }
- PropertyChanges { target: rr4; rotation: 370 }
- }
-
- transitions: Transition {
- RotationAnimation { target: rr; direction: RotationAnimation.Numerical; duration: 1000 }
- RotationAnimation { target: rr2; direction: RotationAnimation.Clockwise; duration: 1000 }
- RotationAnimation { target: rr3; direction: RotationAnimation.Counterclockwise; duration: 1000 }
- RotationAnimation { target: rr4; direction: RotationAnimation.Shortest; duration: 1000 }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/runningTrueBug.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/runningTrueBug.qml
deleted file mode 100644
index 7d33ed7175..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/runningTrueBug.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import QtQuick 1.0
-Rectangle {
- color: "skyblue"
- width: 500
- height: 200
- Rectangle {
- objectName: "cloud"
- color: "white"
- y: 50
- width: 100
- height: 100
-
- SequentialAnimation on x {
- loops: Animation.Infinite
- running: true
- NumberAnimation {
- id: firstAnimation
- from: 0
- to: 500
- duration: 5000
- }
- NumberAnimation {
- id: secondAnimation
- from: -100
- to: 0
- duration: 1000
- }
- }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/transitionAssignmentBug.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/transitionAssignmentBug.qml
deleted file mode 100644
index 99b9ac57d4..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/transitionAssignmentBug.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
-
- property bool nullObject
- Component.onCompleted: nullObject = transitions.length > 0 && transitions[0] === null
-
- property list<Transition> myTransitions: [Transition {}, Transition {}]
- transitions: myTransitions
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/valuesource.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/valuesource.qml
deleted file mode 100644
index fa9cd400ac..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/valuesource.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: rect
- objectName: "MyRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- NumberAnimation on x { id: anim; objectName: "MyAnim"; to: 200 }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/data/valuesource2.qml b/tests/auto/qtquick1/qdeclarativeanimations/data/valuesource2.qml
deleted file mode 100644
index f6343a1bff..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/data/valuesource2.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 1.0
-
-Rectangle {
- width: 400
- height: 400
- Rectangle {
- id: rect
- objectName: "MyRect"
- color: "red"
- width: 50; height: 50
- x: 100; y: 100
- NumberAnimation on x { id: anim; objectName: "MyAnim"; running: false; to: 200 }
- }
-}
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro
deleted file mode 100644
index 7998a069b6..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qdeclarativeanimations
-SOURCES += tst_qdeclarativeanimations.cpp
-macx:CONFIG -= app_bundle
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-CONFIG += parallel_test
-
-QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib
diff --git a/tests/auto/qtquick1/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/qtquick1/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
deleted file mode 100644
index 8e51361baa..0000000000
--- a/tests/auto/qtquick1/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ /dev/null
@@ -1,877 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <qtest.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtQuick1/qdeclarativeview.h>
-#include <QtQuick1/private/qdeclarativerectangle_p.h>
-#include <QtQuick1/private/qdeclarativeanimation_p.h>
-#include <QtQuick1/private/qdeclarativeitem_p.h>
-#include <QVariantAnimation>
-#include <QEasingCurve>
-
-class tst_qdeclarativeanimations : public QObject
-{
- Q_OBJECT
-public:
- tst_qdeclarativeanimations() {}
-
-private slots:
- void initTestCase() { QDeclarativeEngine engine; } // ensure types are registered
-
- void simpleProperty();
- void simpleNumber();
- void simpleColor();
- void simpleRotation();
- void alwaysRunToEnd();
- void complete();
- void resume();
- void dotProperty();
- void badTypes();
- void badProperties();
- void mixedTypes();
- void properties();
- void propertiesTransition();
- void invalidDuration();
- void attached();
- void propertyValueSourceDefaultStart();
- void dontStart();
- void easingProperties();
- void rotation();
- void runningTrueBug();
- void nonTransitionBug();
- void registrationBug();
- void doubleRegistrationBug();
- void alwaysRunToEndRestartBug();
- void transitionAssignmentBug();
- void pauseBug();
-};
-
-#define QTIMED_COMPARE(lhs, rhs) do { \
- for (int ii = 0; ii < 5; ++ii) { \
- if (lhs == rhs) \
- break; \
- QTest::qWait(50); \
- } \
- QCOMPARE(lhs, rhs); \
-} while (false)
-
-void tst_qdeclarativeanimations::simpleProperty()
-{
- QDeclarative1Rectangle rect;
- QDeclarative1PropertyAnimation animation;
- animation.setTarget(&rect);
- animation.setProperty("pos");
- animation.setTo(QPointF(200,200));
- QVERIFY(animation.target() == &rect);
- QVERIFY(animation.property() == "pos");
- QVERIFY(animation.to().toPointF() == QPointF(200,200));
- animation.start();
- QVERIFY(animation.isRunning());
- QTest::qWait(animation.duration());
- QTIMED_COMPARE(rect.pos(), QPointF(200,200));
-
- rect.setPos(0,0);
- animation.start();
- animation.pause();
- QVERIFY(animation.isRunning());
- QVERIFY(animation.isPaused());
- animation.setCurrentTime(125);
- QVERIFY(animation.currentTime() == 125);
- QCOMPARE(rect.pos(), QPointF(100,100));
-}
-
-void tst_qdeclarativeanimations::simpleNumber()
-{
- QDeclarative1Rectangle rect;
- QDeclarative1NumberAnimation animation;
- animation.setTarget(&rect);
- animation.setProperty("x");
- animation.setTo(200);
- QVERIFY(animation.target() == &rect);
- QVERIFY(animation.property() == "x");
- QVERIFY(animation.to() == 200);
- animation.start();
- QVERIFY(animation.isRunning());
- QTest::qWait(animation.duration());
- QTIMED_COMPARE(rect.x(), qreal(200));
-
- rect.setX(0);
- animation.start();
- animation.pause();
- QVERIFY(animation.isRunning());
- QVERIFY(animation.isPaused());
- animation.setCurrentTime(125);
- QVERIFY(animation.currentTime() == 125);
- QCOMPARE(rect.x(), qreal(100));
-}
-
-void tst_qdeclarativeanimations::simpleColor()
-{
- QDeclarative1Rectangle rect;
- QDeclarative1ColorAnimation animation;
- animation.setTarget(&rect);
- animation.setProperty("color");
- animation.setTo(QColor("red"));
- QVERIFY(animation.target() == &rect);
- QVERIFY(animation.property() == "color");
- QVERIFY(animation.to() == QColor("red"));
- animation.start();
- QVERIFY(animation.isRunning());
- QTest::qWait(animation.duration());
- QTIMED_COMPARE(rect.color(), QColor("red"));
-
- rect.setColor(QColor("blue"));
- animation.start();
- animation.pause();
- QVERIFY(animation.isRunning());
- QVERIFY(animation.isPaused());
- animation.setCurrentTime(125);
- QVERIFY(animation.currentTime() == 125);
- QCOMPARE(rect.color(), QColor::fromRgbF(0.498039, 0, 0.498039, 1));
-
- rect.setColor(QColor("green"));
- animation.setFrom(QColor("blue"));
- QVERIFY(animation.from() == QColor("blue"));
- animation.restart();
- QCOMPARE(rect.color(), QColor("blue"));
- QVERIFY(animation.isRunning());
- animation.setCurrentTime(125);
- QCOMPARE(rect.color(), QColor::fromRgbF(0.498039, 0, 0.498039, 1));
-}
-
-void tst_qdeclarativeanimations::simpleRotation()
-{
- QDeclarative1Rectangle rect;
- QDeclarative1RotationAnimation animation;
- animation.setTarget(&rect);
- animation.setProperty("rotation");
- animation.setTo(270);
- QVERIFY(animation.target() == &rect);
- QVERIFY(animation.property() == "rotation");
- QVERIFY(animation.to() == 270);
- QVERIFY(animation.direction() == QDeclarative1RotationAnimation::Numerical);
- animation.start();
- QVERIFY(animation.isRunning());
- QTest::qWait(animation.duration());
- QTIMED_COMPARE(rect.rotation(), qreal(270));
-
- rect.setRotation(0);
- animation.start();
- animation.pause();
- QVERIFY(animation.isRunning());
- QVERIFY(animation.isPaused());
- animation.setCurrentTime(125);
- QVERIFY(animation.currentTime() == 125);
- QCOMPARE(rect.rotation(), qreal(135));
-}
-
-void tst_qdeclarativeanimations::alwaysRunToEnd()
-{
- QDeclarative1Rectangle rect;
- QDeclarative1PropertyAnimation animation;
- animation.setTarget(&rect);
- animation.setProperty("x");
- animation.setTo(200);
- animation.setDuration(1000);
- animation.setLoops(-1);
- animation.setAlwaysRunToEnd(true);
- QVERIFY(animation.loops() == -1);
- QVERIFY(animation.alwaysRunToEnd() == true);
- animation.start();
- QTest::qWait(1500);
- animation.stop();
- QVERIFY(rect.x() != qreal(200));
- QTest::qWait(500);
- QTIMED_COMPARE(rect.x(), qreal(200));
-}
-
-void tst_qdeclarativeanimations::complete()
-{
- QDeclarative1Rectangle rect;
- QDeclarative1PropertyAnimation animation;
- animation.setTarget(&rect);
- animation.setProperty("x");
- animation.setFrom(1);
- animation.setTo(200);
- animation.setDuration(500);
- QVERIFY(animation.from() == 1);
- animation.start();
- QTest::qWait(50);
- animation.stop();
- QVERIFY(rect.x() != qreal(200));
- animation.start();
- QTest::qWait(50);
- QVERIFY(animation.isRunning());
- animation.complete();
- QCOMPARE(rect.x(), qreal(200));
-}
-
-void tst_qdeclarativeanimations::resume()
-{
- QDeclarative1Rectangle rect;
- QDeclarative1PropertyAnimation animation;
- animation.setTarget(&rect);
- animation.setProperty("x");
- animation.setFrom(10);
- animation.setTo(200);
- animation.setDuration(1000);
- QVERIFY(animation.from() == 10);
-
- animation.start();
- QTest::qWait(400);
- animation.pause();
- qreal x = rect.x();
- QVERIFY(x != qreal(200) && x != qreal(10));
- QVERIFY(animation.isRunning());
- QVERIFY(animation.isPaused());
-
- animation.resume();
- QVERIFY(animation.isRunning());
- QVERIFY(!animation.isPaused());
- QTest::qWait(400);
- animation.stop();
- QVERIFY(rect.x() > x);
-}
-
-void tst_qdeclarativeanimations::dotProperty()
-{
- QDeclarativeEngine engine;
- QString componentStr = "import QtQuick 1.0\nRectangle{ id: rect; NumberAnimation{ objectName: \"anim\"; target: rect; property: \"border.width\"; to: 10 }}";
- QDeclarativeComponent animationComponent(&engine);
- animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(animationComponent.create());
- QVERIFY(rect);
- QDeclarative1NumberAnimation *animation = rect->findChild<QDeclarative1NumberAnimation*>("anim");
- QVERIFY(animation);
-
- animation->start();
- QTest::qWait(animation->duration()+50);
- QTIMED_COMPARE(rect->border()->width(), 10);
-
- rect->border()->setWidth(0);
- animation->start();
- animation->pause();
- animation->setCurrentTime(125);
- QVERIFY(animation->currentTime() == 125);
- QCOMPARE(rect->border()->width(), 5);
-
- delete rect;
-}
-
-void tst_qdeclarativeanimations::badTypes()
-{
- //don't crash
- {
- QDeclarativeView *view = new QDeclarativeView;
- view->setSource(QUrl::fromLocalFile(SRCDIR "/data/badtype1.qml"));
-
- qApp->processEvents();
-
- delete view;
- }
-
- //make sure we get a compiler error
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype2.qml"));
- QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready");
- c.create();
-
- QVERIFY(c.errors().count() == 1);
- QCOMPARE(c.errors().at(0).description(), QLatin1String("Invalid property assignment: number expected"));
- }
-
- //make sure we get a compiler error
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype3.qml"));
- QTest::ignoreMessage(QtWarningMsg, "QDeclarativeComponent: Component is not ready");
- c.create();
-
- QVERIFY(c.errors().count() == 1);
- QCOMPARE(c.errors().at(0).description(), QLatin1String("Invalid property assignment: color expected"));
- }
-
- //don't crash
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/badtype4.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarativeItemPrivate::get(rect)->setState("state1");
- QTest::qWait(1000 + 50);
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("MyRect");
- QVERIFY(myRect);
- QCOMPARE(myRect->x(),qreal(200));
- }
-}
-
-void tst_qdeclarativeanimations::badProperties()
-{
- //make sure we get a runtime error
- {
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c1(&engine, QUrl::fromLocalFile(SRCDIR "/data/badproperty1.qml"));
- QByteArray message = QUrl::fromLocalFile(SRCDIR "/data/badproperty1.qml").toString().toUtf8() + ":18:9: QML ColorAnimation: Cannot animate non-existent property \"border.colr\"";
- QTest::ignoreMessage(QtWarningMsg, message);
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c1.create());
- QVERIFY(rect);
-
- QDeclarativeComponent c2(&engine, QUrl::fromLocalFile(SRCDIR "/data/badproperty2.qml"));
- message = QUrl::fromLocalFile(SRCDIR "/data/badproperty2.qml").toString().toUtf8() + ":18:9: QML ColorAnimation: Cannot animate read-only property \"border\"";
- QTest::ignoreMessage(QtWarningMsg, message);
- rect = qobject_cast<QDeclarative1Rectangle*>(c2.create());
- QVERIFY(rect);
-
- //### should we warn here are well?
- //rect->setState("state1");
- }
-}
-
-//test animating mixed types with property animation in a transition
-//for example, int + real; color + real; etc
-void tst_qdeclarativeanimations::mixedTypes()
-{
- //assumes border.width stays a real -- not real robust
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/mixedtype1.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarativeItemPrivate::get(rect)->setState("state1");
- QTest::qWait(500);
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("MyRect");
- QVERIFY(myRect);
-
- //rather inexact -- is there a better way?
- QVERIFY(myRect->x() > 100 && myRect->x() < 200);
- QVERIFY(myRect->border()->width() > 1 && myRect->border()->width() < 10);
- }
-
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/mixedtype2.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarativeItemPrivate::get(rect)->setState("state1");
- QTest::qWait(500);
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("MyRect");
- QVERIFY(myRect);
-
- //rather inexact -- is there a better way?
- QVERIFY(myRect->x() > 100 && myRect->x() < 200);
- QVERIFY(myRect->color() != QColor("red") && myRect->color() != QColor("blue"));
- }
-}
-
-void tst_qdeclarativeanimations::properties()
-{
- const int waitDuration = 300;
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QTest::qWait(waitDuration);
- QTIMED_COMPARE(myRect->x(),qreal(200));
- }
-
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties2.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QTest::qWait(waitDuration);
- QTIMED_COMPARE(myRect->x(),qreal(200));
- }
-
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties3.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QTest::qWait(waitDuration);
- QTIMED_COMPARE(myRect->x(),qreal(300));
- }
-
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties4.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QTest::qWait(waitDuration);
- QTIMED_COMPARE(myRect->y(),qreal(200));
- QTIMED_COMPARE(myRect->x(),qreal(100));
- }
-
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/properties5.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QTest::qWait(waitDuration);
- QTIMED_COMPARE(myRect->x(),qreal(100));
- QTIMED_COMPARE(myRect->y(),qreal(200));
- }
-}
-
-void tst_qdeclarativeanimations::propertiesTransition()
-{
- const int waitDuration = 300;
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarativeItemPrivate::get(rect)->setState("moved");
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QTest::qWait(waitDuration);
- QTIMED_COMPARE(myRect->x(),qreal(200));
- }
-
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition2.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QDeclarativeItemPrivate::get(rect)->setState("moved");
- QCOMPARE(myRect->x(),qreal(200));
- QCOMPARE(myRect->y(),qreal(100));
- QTest::qWait(waitDuration);
- QTIMED_COMPARE(myRect->y(),qreal(200));
- }
-
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition3.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QDeclarativeItemPrivate::get(rect)->setState("moved");
- QCOMPARE(myRect->x(),qreal(200));
- QCOMPARE(myRect->y(),qreal(100));
- }
-
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition4.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QDeclarativeItemPrivate::get(rect)->setState("moved");
- QCOMPARE(myRect->x(),qreal(100));
- QTest::qWait(waitDuration);
- QTIMED_COMPARE(myRect->x(),qreal(200));
- }
-
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition5.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QDeclarativeItemPrivate::get(rect)->setState("moved");
- QCOMPARE(myRect->x(),qreal(100));
- QTest::qWait(waitDuration);
- QTIMED_COMPARE(myRect->x(),qreal(200));
- }
-
- /*{
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition6.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QDeclarativeItemPrivate::get(rect)->setState("moved");
- QCOMPARE(myRect->x(),qreal(100));
- QTest::qWait(waitDuration);
- QTIMED_COMPARE(myRect->x(),qreal(100));
- }*/
-
- {
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertiesTransition7.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarativeItemPrivate::get(rect)->setState("moved");
- QDeclarative1Rectangle *myRect = rect->findChild<QDeclarative1Rectangle*>("TheRect");
- QVERIFY(myRect);
- QTest::qWait(waitDuration);
- QTIMED_COMPARE(myRect->x(),qreal(200));
- }
-
-}
-
-void tst_qdeclarativeanimations::invalidDuration()
-{
- QDeclarative1PropertyAnimation *animation = new QDeclarative1PropertyAnimation;
- QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML PropertyAnimation: Cannot set a duration of < 0");
- animation->setDuration(-1);
- QCOMPARE(animation->duration(), 250);
-
- QDeclarative1PauseAnimation *pauseAnimation = new QDeclarative1PauseAnimation;
- QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML PauseAnimation: Cannot set a duration of < 0");
- pauseAnimation->setDuration(-1);
- QCOMPARE(pauseAnimation->duration(), 250);
-}
-
-void tst_qdeclarativeanimations::attached()
-{
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/attached.qml"));
- QTest::ignoreMessage(QtDebugMsg, "off");
- QTest::ignoreMessage(QtDebugMsg, "on");
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-}
-
-void tst_qdeclarativeanimations::propertyValueSourceDefaultStart()
-{
- {
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/valuesource.qml"));
-
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1AbstractAnimation *myAnim = rect->findChild<QDeclarative1AbstractAnimation*>("MyAnim");
- QVERIFY(myAnim);
- QVERIFY(myAnim->isRunning());
- }
-
- {
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/valuesource2.qml"));
-
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1AbstractAnimation *myAnim = rect->findChild<QDeclarative1AbstractAnimation*>("MyAnim");
- QVERIFY(myAnim);
- QVERIFY(myAnim->isRunning() == false);
- }
-
- {
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontAutoStart.qml"));
-
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1AbstractAnimation *myAnim = rect->findChild<QDeclarative1AbstractAnimation*>("MyAnim");
- QVERIFY(myAnim && myAnim->qtAnimation());
- QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
- }
-}
-
-
-void tst_qdeclarativeanimations::dontStart()
-{
- {
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart.qml"));
-
- QString warning = c.url().toString() + ":14:13: QML NumberAnimation: setRunning() cannot be used on non-root animation nodes.";
- QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1AbstractAnimation *myAnim = rect->findChild<QDeclarative1AbstractAnimation*>("MyAnim");
- QVERIFY(myAnim && myAnim->qtAnimation());
- QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
- }
-
- {
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/dontStart2.qml"));
-
- QString warning = c.url().toString() + ":15:17: QML NumberAnimation: setRunning() cannot be used on non-root animation nodes.";
- QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1AbstractAnimation *myAnim = rect->findChild<QDeclarative1AbstractAnimation*>("MyAnim");
- QVERIFY(myAnim && myAnim->qtAnimation());
- QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimation::Stopped);
- }
-}
-
-void tst_qdeclarativeanimations::easingProperties()
-{
- {
- QDeclarativeEngine engine;
- QString componentStr = "import QtQuick 1.0\nNumberAnimation { easing.type: \"InOutQuad\" }";
- QDeclarativeComponent animationComponent(&engine);
- animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
- QDeclarative1PropertyAnimation *animObject = qobject_cast<QDeclarative1PropertyAnimation*>(animationComponent.create());
-
- QVERIFY(animObject != 0);
- QCOMPARE(animObject->easing().type(), QEasingCurve::InOutQuad);
- }
-
- {
- QDeclarativeEngine engine;
- QString componentStr = "import QtQuick 1.0\nPropertyAnimation { easing.type: \"OutBounce\"; easing.amplitude: 5.0 }";
- QDeclarativeComponent animationComponent(&engine);
- animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
- QDeclarative1PropertyAnimation *animObject = qobject_cast<QDeclarative1PropertyAnimation*>(animationComponent.create());
-
- QVERIFY(animObject != 0);
- QCOMPARE(animObject->easing().type(), QEasingCurve::OutBounce);
- QCOMPARE(animObject->easing().amplitude(), 5.0);
- }
-
- {
- QDeclarativeEngine engine;
- QString componentStr = "import QtQuick 1.0\nPropertyAnimation { easing.type: \"OutElastic\"; easing.amplitude: 5.0; easing.period: 3.0}";
- QDeclarativeComponent animationComponent(&engine);
- animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
- QDeclarative1PropertyAnimation *animObject = qobject_cast<QDeclarative1PropertyAnimation*>(animationComponent.create());
-
- QVERIFY(animObject != 0);
- QCOMPARE(animObject->easing().type(), QEasingCurve::OutElastic);
- QCOMPARE(animObject->easing().amplitude(), 5.0);
- QCOMPARE(animObject->easing().period(), 3.0);
- }
-
- {
- QDeclarativeEngine engine;
- QString componentStr = "import QtQuick 1.0\nPropertyAnimation { easing.type: \"InOutBack\"; easing.overshoot: 2 }";
- QDeclarativeComponent animationComponent(&engine);
- animationComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
- QDeclarative1PropertyAnimation *animObject = qobject_cast<QDeclarative1PropertyAnimation*>(animationComponent.create());
-
- QVERIFY(animObject != 0);
- QCOMPARE(animObject->easing().type(), QEasingCurve::InOutBack);
- QCOMPARE(animObject->easing().overshoot(), 2.0);
- }
-}
-
-void tst_qdeclarativeanimations::rotation()
-{
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/rotation.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *rr = rect->findChild<QDeclarative1Rectangle*>("rr");
- QDeclarative1Rectangle *rr2 = rect->findChild<QDeclarative1Rectangle*>("rr2");
- QDeclarative1Rectangle *rr3 = rect->findChild<QDeclarative1Rectangle*>("rr3");
- QDeclarative1Rectangle *rr4 = rect->findChild<QDeclarative1Rectangle*>("rr4");
-
- QDeclarativeItemPrivate::get(rect)->setState("state1");
- QTest::qWait(800);
- qreal r1 = rr->rotation();
- qreal r2 = rr2->rotation();
- qreal r3 = rr3->rotation();
- qreal r4 = rr4->rotation();
-
- QVERIFY(r1 > qreal(0) && r1 < qreal(370));
- QVERIFY(r2 > qreal(0) && r2 < qreal(370));
- QVERIFY(r3 < qreal(0) && r3 > qreal(-350));
- QVERIFY(r4 > qreal(0) && r4 < qreal(10));
- QCOMPARE(r1,r2);
- QVERIFY(r4 < r2);
-
- QTest::qWait(800);
- QTIMED_COMPARE(rr->rotation() + rr2->rotation() + rr3->rotation() + rr4->rotation(), qreal(370*4));
-}
-
-void tst_qdeclarativeanimations::runningTrueBug()
-{
- //ensure we start correctly when "running: true" is explicitly set
- QDeclarativeEngine engine;
- QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/runningTrueBug.qml"));
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect);
-
- QDeclarative1Rectangle *cloud = rect->findChild<QDeclarative1Rectangle*>("cloud");
- QVERIFY(cloud);
- QTest::qWait(1000);
- QVERIFY(cloud->x() > qreal(0));
-}
-
-//QTBUG-12805
-void tst_qdeclarativeanimations::nonTransitionBug()
-{
- //tests that the animation values from the previous transition are properly cleared
- //in the case where an animation in the transition doesn't match anything (but previously did)
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, SRCDIR "/data/nonTransitionBug.qml");
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect != 0);
- QDeclarativeItemPrivate *rectPrivate = QDeclarativeItemPrivate::get(rect);
- QDeclarative1Rectangle *mover = rect->findChild<QDeclarative1Rectangle*>("mover");
-
- mover->setX(100);
- QCOMPARE(mover->x(), qreal(100));
-
- rectPrivate->setState("left");
- QTRY_COMPARE(mover->x(), qreal(0));
-
- mover->setX(100);
- QCOMPARE(mover->x(), qreal(100));
-
- //make sure we don't try to animate back to 0
- rectPrivate->setState("free");
- QTest::qWait(300);
- QCOMPARE(mover->x(), qreal(100));
-}
-
-//QTBUG-14042
-void tst_qdeclarativeanimations::registrationBug()
-{
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, SRCDIR "/data/registrationBug.qml");
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect != 0);
- QTRY_COMPARE(rect->property("value"), QVariant(int(100)));
-}
-
-void tst_qdeclarativeanimations::doubleRegistrationBug()
-{
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, SRCDIR "/data/doubleRegistrationBug.qml");
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect != 0);
-
- QDeclarative1AbstractAnimation *anim = rect->findChild<QDeclarative1AbstractAnimation*>("animation");
- QVERIFY(anim != 0);
- QTRY_COMPARE(anim->qtAnimation()->state(), QAbstractAnimation::Stopped);
-}
-
-//QTBUG-16736
-void tst_qdeclarativeanimations::alwaysRunToEndRestartBug()
-{
- QDeclarative1Rectangle rect;
- QDeclarative1PropertyAnimation animation;
- animation.setTarget(&rect);
- animation.setProperty("x");
- animation.setTo(200);
- animation.setDuration(1000);
- animation.setLoops(-1);
- animation.setAlwaysRunToEnd(true);
- QVERIFY(animation.loops() == -1);
- QVERIFY(animation.alwaysRunToEnd() == true);
- animation.start();
- animation.stop();
- animation.start();
- animation.stop();
- QTest::qWait(500);
- QVERIFY(rect.x() != qreal(200));
- QTest::qWait(800);
- QTIMED_COMPARE(rect.x(), qreal(200));
- QCOMPARE(static_cast<QDeclarative1AbstractAnimation*>(&animation)->qtAnimation()->state(), QAbstractAnimation::Stopped);
-}
-
-//QTBUG-20227
-void tst_qdeclarativeanimations::transitionAssignmentBug()
-{
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, SRCDIR "/data/transitionAssignmentBug.qml");
- QDeclarative1Rectangle *rect = qobject_cast<QDeclarative1Rectangle*>(c.create());
- QVERIFY(rect != 0);
-
- QCOMPARE(rect->property("nullObject").toBool(), false);
-}
-
-//QTBUG-13598
-void tst_qdeclarativeanimations::pauseBug()
-{
- QDeclarativeEngine engine;
-
- QDeclarativeComponent c(&engine, SRCDIR "/data/pauseBug.qml");
- QDeclarative1AbstractAnimation *anim = qobject_cast<QDeclarative1AbstractAnimation*>(c.create());
- QVERIFY(anim != 0);
- QCOMPARE(anim->qtAnimation()->state(), QAbstractAnimation::Paused);
- QCOMPARE(anim->isPaused(), true);
- QCOMPARE(anim->isRunning(), true);
-
- delete anim;
-}
-
-QTEST_MAIN(tst_qdeclarativeanimations)
-
-#include "tst_qdeclarativeanimations.moc"