diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-01-07 13:32:33 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-01-07 14:44:05 +0100 |
| commit | 353e43cb6d73ee97ebff1a8c737b2c133b135ab8 (patch) | |
| tree | e2ebd8f500fffd5b6c4c828a95ae08a59608fe3b /tests/auto/qml/qqmldirparser | |
| parent | fae16f9d2fca773276eba150d0414fb2f303d179 (diff) | |
Unify QQmlDirParser version parsing and error reporting
Add a parseVersion() helper function to avoid duplicating
the same version parsing logic three times.
Change-Id: I4e5b6a8c86ee3a26c4eb91c660a81176ac0346cf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmldirparser')
3 files changed, 21 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmldirparser/data/invalid-versioned-dependency/qmldir b/tests/auto/qml/qqmldirparser/data/invalid-versioned-dependency/qmldir new file mode 100644 index 0000000000..4aa5c729da --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/invalid-versioned-dependency/qmldir @@ -0,0 +1 @@ +depends bar 100 diff --git a/tests/auto/qml/qqmldirparser/data/invalid-versioned-script/qmldir b/tests/auto/qml/qqmldirparser/data/invalid-versioned-script/qmldir new file mode 100644 index 0000000000..19b65e394f --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/invalid-versioned-script/qmldir @@ -0,0 +1 @@ +foo 100 bar.js diff --git a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp index 615df08d5c..5b60ba2487 100644 --- a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp +++ b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp @@ -247,7 +247,7 @@ void tst_qqmldirparser::parse_data() QTest::newRow("invalid-versioned-component") << "invalid-versioned-component/qmldir" - << (QStringList() << "qmldir:1: expected '.'") + << (QStringList() << "qmldir:1: invalid version 100, expected <major>.<minor>") << QStringList() << QStringList() << QStringList() @@ -263,6 +263,15 @@ void tst_qqmldirparser::parse_data() << QStringList() << false; + QTest::newRow("invalid-versioned-script") + << "invalid-versioned-script/qmldir" + << (QStringList() << "qmldir:1: invalid version 100, expected <major>.<minor>") + << QStringList() + << QStringList() + << QStringList() + << QStringList() + << false; + QTest::newRow("versioned-script") << "versioned-script/qmldir" << QStringList() @@ -301,6 +310,15 @@ void tst_qqmldirparser::parse_data() << QStringList() << false; + QTest::newRow("invalid-versioned-dependency") + << "invalid-versioned-dependency/qmldir" + << (QStringList() << "qmldir:1: invalid version 100, expected <major>.<minor>") + << QStringList() + << QStringList() + << QStringList() + << QStringList() + << false; + QTest::newRow("dependency") << "dependency/qmldir" << QStringList() |