summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-20 02:03:29 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-20 02:03:29 (GMT)
commit3158bf19bd49f72ca379203ea259e7b2d371f0d4 (patch)
tree19f14965f6c0c14b7b96fbdabd121d0e54c9bdbd /tests
parent73e645e2d0594d31b8e4945469b74bb6e230faed (diff)
downloadQt-3158bf19bd49f72ca379203ea259e7b2d371f0d4.zip
Qt-3158bf19bd49f72ca379203ea259e7b2d371f0d4.tar.gz
Qt-3158bf19bd49f72ca379203ea259e7b2d371f0d4.tar.bz2
Fix some test data
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qmlparser/empty.errors.txt2
-rw-r--r--tests/auto/declarative/qmlparser/missingSignal.errors.txt2
-rw-r--r--tests/auto/declarative/qmlparser/nonexistantProperty.1.errors.txt2
-rw-r--r--tests/auto/declarative/qmlparser/nonexistantProperty.2.errors.txt2
-rw-r--r--tests/auto/declarative/qmlparser/nonexistantProperty.3.errors.txt2
-rw-r--r--tests/auto/declarative/qmlparser/nonexistantProperty.4.errors.txt2
-rw-r--r--tests/auto/declarative/qmlparser/tst_qmlparser.cpp12
-rw-r--r--tests/auto/declarative/qmlparser/unsupportedProperty.errors.txt2
8 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/declarative/qmlparser/empty.errors.txt b/tests/auto/declarative/qmlparser/empty.errors.txt
index 101b6a2..e0ed268 100644
--- a/tests/auto/declarative/qmlparser/empty.errors.txt
+++ b/tests/auto/declarative/qmlparser/empty.errors.txt
@@ -1 +1 @@
-0:0:Syntax error
+0:0:Expected token `identifier'
diff --git a/tests/auto/declarative/qmlparser/missingSignal.errors.txt b/tests/auto/declarative/qmlparser/missingSignal.errors.txt
index 9815b99..5c612cc 100644
--- a/tests/auto/declarative/qmlparser/missingSignal.errors.txt
+++ b/tests/auto/declarative/qmlparser/missingSignal.errors.txt
@@ -1 +1 @@
-2:-1:Unknown property "onClicked"
+2:5:Cannot assign binding to non-existant property "onClicked"
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.1.errors.txt b/tests/auto/declarative/qmlparser/nonexistantProperty.1.errors.txt
index 406ad83..e8f1a91 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.1.errors.txt
+++ b/tests/auto/declarative/qmlparser/nonexistantProperty.1.errors.txt
@@ -1 +1 @@
-1:-1:Unknown property "something"
+1:15:Cannot assign value to non-existant property "something"
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.2.errors.txt b/tests/auto/declarative/qmlparser/nonexistantProperty.2.errors.txt
index b371a0f..c154f91 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.2.errors.txt
+++ b/tests/auto/declarative/qmlparser/nonexistantProperty.2.errors.txt
@@ -1 +1 @@
-2:-1:Unknown property "something"
+2:5:Cannot assign value to non-existant property "something"
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.3.errors.txt b/tests/auto/declarative/qmlparser/nonexistantProperty.3.errors.txt
index b371a0f..a254d7d 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.3.errors.txt
+++ b/tests/auto/declarative/qmlparser/nonexistantProperty.3.errors.txt
@@ -1 +1 @@
-2:-1:Unknown property "something"
+2:5:Cannot assign binding to non-existant property "something"
diff --git a/tests/auto/declarative/qmlparser/nonexistantProperty.4.errors.txt b/tests/auto/declarative/qmlparser/nonexistantProperty.4.errors.txt
index b371a0f..a254d7d 100644
--- a/tests/auto/declarative/qmlparser/nonexistantProperty.4.errors.txt
+++ b/tests/auto/declarative/qmlparser/nonexistantProperty.4.errors.txt
@@ -1 +1 @@
-2:-1:Unknown property "something"
+2:5:Cannot assign binding to non-existant property "something"
diff --git a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
index 089c116..91433ba 100644
--- a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
+++ b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp
@@ -92,10 +92,10 @@ void tst_qmlparser::errors_data()
QTest::addColumn<QString>("errorFile");
QTest::addColumn<bool>("create");
- QTest::newRow("nonExistantProperty.1") << "nonexistantProperty.1.txt" << "nonexistantProperty.1.errors.txt" << true;
- QTest::newRow("nonExistantProperty.2") << "nonexistantProperty.2.txt" << "nonexistantProperty.2.errors.txt" << true;
- QTest::newRow("nonExistantProperty.3") << "nonexistantProperty.3.txt" << "nonexistantProperty.3.errors.txt" << true;
- QTest::newRow("nonExistantProperty.4") << "nonexistantProperty.4.txt" << "nonexistantProperty.4.errors.txt" << true;
+ QTest::newRow("nonExistantProperty.1") << "nonexistantProperty.1.txt" << "nonexistantProperty.1.errors.txt" << false;
+ QTest::newRow("nonExistantProperty.2") << "nonexistantProperty.2.txt" << "nonexistantProperty.2.errors.txt" << false;
+ QTest::newRow("nonExistantProperty.3") << "nonexistantProperty.3.txt" << "nonexistantProperty.3.errors.txt" << false;
+ QTest::newRow("nonExistantProperty.4") << "nonexistantProperty.4.txt" << "nonexistantProperty.4.errors.txt" << false;
QTest::newRow("nonExistantProperty.5") << "nonexistantProperty.5.txt" << "nonexistantProperty.5.errors.txt" << false;
QTest::newRow("nonExistantProperty.6") << "nonexistantProperty.6.txt" << "nonexistantProperty.6.errors.txt" << true;
@@ -127,7 +127,7 @@ void tst_qmlparser::errors_data()
QTest::newRow("invalidID.3") << "invalidID.3.txt" << "invalidID.3.errors.txt" << false;
QTest::newRow("invalidID.4") << "invalidID.4.txt" << "invalidID.4.errors.txt" << false;
- QTest::newRow("unsupportedProperty") << "unsupportedProperty.txt" << "unsupportedProperty.errors.txt" << true;
+ QTest::newRow("unsupportedProperty") << "unsupportedProperty.txt" << "unsupportedProperty.errors.txt" << false;
QTest::newRow("nullDotProperty") << "nullDotProperty.txt" << "nullDotProperty.errors.txt" << true;
QTest::newRow("fakeDotProperty") << "fakeDotProperty.txt" << "fakeDotProperty.errors.txt" << true;
QTest::newRow("duplicateIDs") << "duplicateIDs.txt" << "duplicateIDs.errors.txt" << false;
@@ -135,7 +135,7 @@ void tst_qmlparser::errors_data()
QTest::newRow("empty") << "empty.txt" << "empty.errors.txt" << false;
QTest::newRow("missingObject") << "missingObject.txt" << "missingObject.errors.txt" << false;
QTest::newRow("failingComponent") << "failingComponent.txt" << "failingComponent.errors.txt" << true;
- QTest::newRow("missingSignal") << "missingSignal.txt" << "missingSignal.errors.txt" << true;
+ QTest::newRow("missingSignal") << "missingSignal.txt" << "missingSignal.errors.txt" << false;
}
void tst_qmlparser::errors()
diff --git a/tests/auto/declarative/qmlparser/unsupportedProperty.errors.txt b/tests/auto/declarative/qmlparser/unsupportedProperty.errors.txt
index f396e7e..a067ecb 100644
--- a/tests/auto/declarative/qmlparser/unsupportedProperty.errors.txt
+++ b/tests/auto/declarative/qmlparser/unsupportedProperty.errors.txt
@@ -1 +1 @@
-2:-1:Property matrix is of an unknown type
+2:5:Cannot assign value to property matrix of unknown type