diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-26 05:13:43 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-26 05:13:43 (GMT) |
commit | 4c1cdb0bf25847a8ebf42cf573faf5b2386000b9 (patch) | |
tree | b496e5e8b8b01a009e7575dfee7734dcdd0d38fd /tests/auto/declarative | |
parent | 478a339bc668611f6e31803e26c502a2aabe7bfe (diff) | |
download | Qt-4c1cdb0bf25847a8ebf42cf573faf5b2386000b9.zip Qt-4c1cdb0bf25847a8ebf42cf573faf5b2386000b9.tar.gz Qt-4c1cdb0bf25847a8ebf42cf573faf5b2386000b9.tar.bz2 |
Ensure tests pass
Diffstat (limited to 'tests/auto/declarative')
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/declarative/qmlparser/failingComponent.errors.txt b/tests/auto/declarative/qmlparser/failingComponent.errors.txt index 0db1271..12fb4e7 100644 --- a/tests/auto/declarative/qmlparser/failingComponent.errors.txt +++ b/tests/auto/declarative/qmlparser/failingComponent.errors.txt @@ -1,2 +1,2 @@ -2:-1:Unknown property "a" -2:-1:Unable to create object of type "FailingComponent" +-1:-1:Unable to create type FailingComponent +2:5:Cannot assign value to non-existant property "a" diff --git a/tests/auto/declarative/qmlparser/fakeDotProperty.errors.txt b/tests/auto/declarative/qmlparser/fakeDotProperty.errors.txt index 6c42157..a94b38e 100644 --- a/tests/auto/declarative/qmlparser/fakeDotProperty.errors.txt +++ b/tests/auto/declarative/qmlparser/fakeDotProperty.errors.txt @@ -1 +1 @@ -2:-1:Cannot set properties on value as it is of unknown type +2:11:Cannot assign value to non-existant property "something" diff --git a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp index 91433ba..0852d35 100644 --- a/tests/auto/declarative/qmlparser/tst_qmlparser.cpp +++ b/tests/auto/declarative/qmlparser/tst_qmlparser.cpp @@ -70,8 +70,8 @@ private: error.description().toUtf8(); \ actual << errorStr; \ } \ - if (qgetenv("DEBUG") != "") \ - qWarning() << expected << actual; \ + if (qgetenv("DEBUG") != "" && expected != actual) \ + qWarning() << "Expected:" << expected << "Actual:" << actual; \ QCOMPARE(expected, actual); \ } @@ -129,12 +129,12 @@ void tst_qmlparser::errors_data() 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("fakeDotProperty") << "fakeDotProperty.txt" << "fakeDotProperty.errors.txt" << false; QTest::newRow("duplicateIDs") << "duplicateIDs.txt" << "duplicateIDs.errors.txt" << false; QTest::newRow("unregisteredObject") << "unregisteredObject.txt" << "unregisteredObject.errors.txt" << false; 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("failingComponent") << "failingComponent.txt" << "failingComponent.errors.txt" << false; QTest::newRow("missingSignal") << "missingSignal.txt" << "missingSignal.errors.txt" << false; } |