From a24183cc1df3f13b7ec7b4005a36bb58bcfeedb7 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 23 Sep 2009 12:41:27 +1000 Subject: Move test data into data/ subdir --- tests/auto/declarative/qmlbindengine/bindingLoop.txt | 14 -------------- .../qmlbindengine/boolPropertiesEvaluateAsBool.1.txt | 5 ----- .../qmlbindengine/boolPropertiesEvaluateAsBool.2.txt | 5 ----- .../declarative/qmlbindengine/data/bindingLoop.txt | 14 ++++++++++++++ .../data/boolPropertiesEvaluateAsBool.1.txt | 5 +++++ .../data/boolPropertiesEvaluateAsBool.2.txt | 5 +++++ .../qmlbindengine/data/deferredProperties.txt | 7 +++++++ .../auto/declarative/qmlbindengine/data/enums.1.qml | 20 ++++++++++++++++++++ .../qmlbindengine/data/extensionObjects.txt | 10 ++++++++++ .../qmlbindengine/data/idShortcutInvalidates.1.txt | 13 +++++++++++++ .../qmlbindengine/data/idShortcutInvalidates.txt | 12 ++++++++++++ .../declarative/qmlbindengine/data/methods.1.txt | 6 ++++++ .../declarative/qmlbindengine/data/methods.2.txt | 6 ++++++ .../qmlbindengine/data/signalAssignment.1.txt | 5 +++++ .../qmlbindengine/data/signalAssignment.2.txt | 5 +++++ .../declarative/qmlbindengine/deferredProperties.txt | 7 ------- tests/auto/declarative/qmlbindengine/enums.1.qml | 20 -------------------- .../declarative/qmlbindengine/extensionObjects.txt | 10 ---------- .../qmlbindengine/idShortcutInvalidates.1.txt | 13 ------------- .../qmlbindengine/idShortcutInvalidates.txt | 12 ------------ tests/auto/declarative/qmlbindengine/methods.1.txt | 6 ------ tests/auto/declarative/qmlbindengine/methods.2.txt | 6 ------ .../declarative/qmlbindengine/signalAssignment.1.txt | 5 ----- .../declarative/qmlbindengine/signalAssignment.2.txt | 5 ----- .../declarative/qmlbindengine/tst_qmlbindengine.cpp | 2 +- 25 files changed, 109 insertions(+), 109 deletions(-) delete mode 100644 tests/auto/declarative/qmlbindengine/bindingLoop.txt delete mode 100644 tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt delete mode 100644 tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt create mode 100644 tests/auto/declarative/qmlbindengine/data/bindingLoop.txt create mode 100644 tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.txt create mode 100644 tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.txt create mode 100644 tests/auto/declarative/qmlbindengine/data/deferredProperties.txt create mode 100644 tests/auto/declarative/qmlbindengine/data/enums.1.qml create mode 100644 tests/auto/declarative/qmlbindengine/data/extensionObjects.txt create mode 100644 tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.txt create mode 100644 tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.txt create mode 100644 tests/auto/declarative/qmlbindengine/data/methods.1.txt create mode 100644 tests/auto/declarative/qmlbindengine/data/methods.2.txt create mode 100644 tests/auto/declarative/qmlbindengine/data/signalAssignment.1.txt create mode 100644 tests/auto/declarative/qmlbindengine/data/signalAssignment.2.txt delete mode 100644 tests/auto/declarative/qmlbindengine/deferredProperties.txt delete mode 100644 tests/auto/declarative/qmlbindengine/enums.1.qml delete mode 100644 tests/auto/declarative/qmlbindengine/extensionObjects.txt delete mode 100644 tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt delete mode 100644 tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt delete mode 100644 tests/auto/declarative/qmlbindengine/methods.1.txt delete mode 100644 tests/auto/declarative/qmlbindengine/methods.2.txt delete mode 100644 tests/auto/declarative/qmlbindengine/signalAssignment.1.txt delete mode 100644 tests/auto/declarative/qmlbindengine/signalAssignment.2.txt diff --git a/tests/auto/declarative/qmlbindengine/bindingLoop.txt b/tests/auto/declarative/qmlbindengine/bindingLoop.txt deleted file mode 100644 index 8b22dd1..0000000 --- a/tests/auto/declarative/qmlbindengine/bindingLoop.txt +++ /dev/null @@ -1,14 +0,0 @@ -import Qt.test 1.0 - -MyQmlContainer { - children : [ - MyQmlObject { - id: Object1 - stringProperty: "hello" + Object2.stringProperty - }, - MyQmlObject { - id: Object2 - stringProperty: "hello" + Object1.stringProperty - } - ] -} diff --git a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt b/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt deleted file mode 100644 index 3147f63..0000000 --- a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.1.txt +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - stringProperty: trueProperty?'pass':'fail' -} diff --git a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt b/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt deleted file mode 100644 index c89bb49..0000000 --- a/tests/auto/declarative/qmlbindengine/boolPropertiesEvaluateAsBool.2.txt +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - stringProperty: falseProperty?'fail':'pass' -} diff --git a/tests/auto/declarative/qmlbindengine/data/bindingLoop.txt b/tests/auto/declarative/qmlbindengine/data/bindingLoop.txt new file mode 100644 index 0000000..8b22dd1 --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/bindingLoop.txt @@ -0,0 +1,14 @@ +import Qt.test 1.0 + +MyQmlContainer { + children : [ + MyQmlObject { + id: Object1 + stringProperty: "hello" + Object2.stringProperty + }, + MyQmlObject { + id: Object2 + stringProperty: "hello" + Object1.stringProperty + } + ] +} diff --git a/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.txt b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.txt new file mode 100644 index 0000000..3147f63 --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.1.txt @@ -0,0 +1,5 @@ +import Qt.test 1.0 + +MyQmlObject { + stringProperty: trueProperty?'pass':'fail' +} diff --git a/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.txt b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.txt new file mode 100644 index 0000000..c89bb49 --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/boolPropertiesEvaluateAsBool.2.txt @@ -0,0 +1,5 @@ +import Qt.test 1.0 + +MyQmlObject { + stringProperty: falseProperty?'fail':'pass' +} diff --git a/tests/auto/declarative/qmlbindengine/data/deferredProperties.txt b/tests/auto/declarative/qmlbindengine/data/deferredProperties.txt new file mode 100644 index 0000000..9dabafe --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/deferredProperties.txt @@ -0,0 +1,7 @@ +import Qt.test 1.0 + +MyDeferredObject { + value: 10 + objectProperty: MyQmlObject {} + objectProperty2: MyQmlObject { id: blah } +} diff --git a/tests/auto/declarative/qmlbindengine/data/enums.1.qml b/tests/auto/declarative/qmlbindengine/data/enums.1.qml new file mode 100644 index 0000000..6351823 --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/enums.1.qml @@ -0,0 +1,20 @@ +import Qt.test 1.0 +import Qt.test 1.0 as Namespace + +MyQmlObject { + // Enums from non-namespaced type + property int a: MyQmlObject.EnumValue1 + property int b: MyQmlObject.EnumValue2 + property int c: MyQmlObject.EnumValue3 + property int d: MyQmlObject.EnumValue4 + + // Enums from namespaced type + property int e: Namespace.MyQmlObject.EnumValue1 + property int f: Namespace.MyQmlObject.EnumValue2 + property int g: Namespace.MyQmlObject.EnumValue3 + property int h: Namespace.MyQmlObject.EnumValue4 + + // Test that enums don't mask attached properties + property int i: MyQmlObject.value + property int j: Namespace.MyQmlObject.value +} diff --git a/tests/auto/declarative/qmlbindengine/data/extensionObjects.txt b/tests/auto/declarative/qmlbindengine/data/extensionObjects.txt new file mode 100644 index 0000000..a902312 --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/extensionObjects.txt @@ -0,0 +1,10 @@ +import Qt.test 1.0 + +MyExtendedObject +{ + baseProperty: baseExtendedProperty + baseExtendedProperty: 13 + + coreProperty: extendedProperty + extendedProperty: 9 +} diff --git a/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.txt b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.txt new file mode 100644 index 0000000..ccb3a22 --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.1.txt @@ -0,0 +1,13 @@ +import Qt.test 1.0 +import Qt 4.6 + +MyQmlObject { + objectProperty: if(1) OtherObject + + property var obj + + obj: Object { + id: OtherObject + } +} + diff --git a/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.txt b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.txt new file mode 100644 index 0000000..6c1fca6 --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/idShortcutInvalidates.txt @@ -0,0 +1,12 @@ +import Qt.test 1.0 +import Qt 4.6 + +MyQmlObject { + objectProperty: OtherObject + + property var obj + + obj: Object { + id: OtherObject + } +} diff --git a/tests/auto/declarative/qmlbindengine/data/methods.1.txt b/tests/auto/declarative/qmlbindengine/data/methods.1.txt new file mode 100644 index 0000000..8ba300f --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/methods.1.txt @@ -0,0 +1,6 @@ +import Qt.test 1.0 + +MyQmlObject { + id: MyObject + onBasicSignal: MyObject.method() +} diff --git a/tests/auto/declarative/qmlbindengine/data/methods.2.txt b/tests/auto/declarative/qmlbindengine/data/methods.2.txt new file mode 100644 index 0000000..70911f7 --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/methods.2.txt @@ -0,0 +1,6 @@ +import Qt.test 1.0 + +MyQmlObject { + id: MyObject + onBasicSignal: MyObject.method(163) +} diff --git a/tests/auto/declarative/qmlbindengine/data/signalAssignment.1.txt b/tests/auto/declarative/qmlbindengine/data/signalAssignment.1.txt new file mode 100644 index 0000000..fbd0914 --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/signalAssignment.1.txt @@ -0,0 +1,5 @@ +import Qt.test 1.0 + +MyQmlObject { + onBasicSignal: setString('pass') +} diff --git a/tests/auto/declarative/qmlbindengine/data/signalAssignment.2.txt b/tests/auto/declarative/qmlbindengine/data/signalAssignment.2.txt new file mode 100644 index 0000000..8addcb9 --- /dev/null +++ b/tests/auto/declarative/qmlbindengine/data/signalAssignment.2.txt @@ -0,0 +1,5 @@ +import Qt.test 1.0 + +MyQmlObject { + onArgumentSignal: setString('pass ' + a + ' ' + b + ' ' + c) +} diff --git a/tests/auto/declarative/qmlbindengine/deferredProperties.txt b/tests/auto/declarative/qmlbindengine/deferredProperties.txt deleted file mode 100644 index 9dabafe..0000000 --- a/tests/auto/declarative/qmlbindengine/deferredProperties.txt +++ /dev/null @@ -1,7 +0,0 @@ -import Qt.test 1.0 - -MyDeferredObject { - value: 10 - objectProperty: MyQmlObject {} - objectProperty2: MyQmlObject { id: blah } -} diff --git a/tests/auto/declarative/qmlbindengine/enums.1.qml b/tests/auto/declarative/qmlbindengine/enums.1.qml deleted file mode 100644 index 6351823..0000000 --- a/tests/auto/declarative/qmlbindengine/enums.1.qml +++ /dev/null @@ -1,20 +0,0 @@ -import Qt.test 1.0 -import Qt.test 1.0 as Namespace - -MyQmlObject { - // Enums from non-namespaced type - property int a: MyQmlObject.EnumValue1 - property int b: MyQmlObject.EnumValue2 - property int c: MyQmlObject.EnumValue3 - property int d: MyQmlObject.EnumValue4 - - // Enums from namespaced type - property int e: Namespace.MyQmlObject.EnumValue1 - property int f: Namespace.MyQmlObject.EnumValue2 - property int g: Namespace.MyQmlObject.EnumValue3 - property int h: Namespace.MyQmlObject.EnumValue4 - - // Test that enums don't mask attached properties - property int i: MyQmlObject.value - property int j: Namespace.MyQmlObject.value -} diff --git a/tests/auto/declarative/qmlbindengine/extensionObjects.txt b/tests/auto/declarative/qmlbindengine/extensionObjects.txt deleted file mode 100644 index a902312..0000000 --- a/tests/auto/declarative/qmlbindengine/extensionObjects.txt +++ /dev/null @@ -1,10 +0,0 @@ -import Qt.test 1.0 - -MyExtendedObject -{ - baseProperty: baseExtendedProperty - baseExtendedProperty: 13 - - coreProperty: extendedProperty - extendedProperty: 9 -} diff --git a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt b/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt deleted file mode 100644 index ccb3a22..0000000 --- a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.1.txt +++ /dev/null @@ -1,13 +0,0 @@ -import Qt.test 1.0 -import Qt 4.6 - -MyQmlObject { - objectProperty: if(1) OtherObject - - property var obj - - obj: Object { - id: OtherObject - } -} - diff --git a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt b/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt deleted file mode 100644 index 6c1fca6..0000000 --- a/tests/auto/declarative/qmlbindengine/idShortcutInvalidates.txt +++ /dev/null @@ -1,12 +0,0 @@ -import Qt.test 1.0 -import Qt 4.6 - -MyQmlObject { - objectProperty: OtherObject - - property var obj - - obj: Object { - id: OtherObject - } -} diff --git a/tests/auto/declarative/qmlbindengine/methods.1.txt b/tests/auto/declarative/qmlbindengine/methods.1.txt deleted file mode 100644 index 8ba300f..0000000 --- a/tests/auto/declarative/qmlbindengine/methods.1.txt +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - id: MyObject - onBasicSignal: MyObject.method() -} diff --git a/tests/auto/declarative/qmlbindengine/methods.2.txt b/tests/auto/declarative/qmlbindengine/methods.2.txt deleted file mode 100644 index 70911f7..0000000 --- a/tests/auto/declarative/qmlbindengine/methods.2.txt +++ /dev/null @@ -1,6 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - id: MyObject - onBasicSignal: MyObject.method(163) -} diff --git a/tests/auto/declarative/qmlbindengine/signalAssignment.1.txt b/tests/auto/declarative/qmlbindengine/signalAssignment.1.txt deleted file mode 100644 index fbd0914..0000000 --- a/tests/auto/declarative/qmlbindengine/signalAssignment.1.txt +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - onBasicSignal: setString('pass') -} diff --git a/tests/auto/declarative/qmlbindengine/signalAssignment.2.txt b/tests/auto/declarative/qmlbindengine/signalAssignment.2.txt deleted file mode 100644 index 8addcb9..0000000 --- a/tests/auto/declarative/qmlbindengine/signalAssignment.2.txt +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.test 1.0 - -MyQmlObject { - onArgumentSignal: setString('pass ' + a + ' ' + b + ' ' + c) -} diff --git a/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp b/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp index 80373fe..2f2bb43 100644 --- a/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp +++ b/tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp @@ -11,7 +11,7 @@ inline QUrl TEST_FILE(const QString &filename) { QFileInfo fileInfo(__FILE__); - return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(filename)); + return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath("data/" + filename)); } inline QUrl TEST_FILE(const char *filename) -- cgit v0.12