aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
diff options
context:
space:
mode:
authorMaximilian Goldstein <max.goldstein@qt.io>2020-05-06 12:22:50 +0200
committerMaximilian Goldstein <max.goldstein@qt.io>2020-05-19 08:10:11 +0200
commitd29f3d7a62780d74f62330b0e3a0703a72155852 (patch)
tree8c1b520890827c059ba93d1e15f579a1bf011437 /tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
parent98277a1e8f7bc7a32035e9ade9a55a4f51d8dd80 (diff)
Allow using lowercase enum names
Fixes: QTBUG-83395 Change-Id: I98dd953497c6e28a1cfb5228095f05547e49b11d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp')
-rw-r--r--tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp17
1 files changed, 6 insertions, 11 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 3dbaa2ec4e..b4888f6fa7 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -4073,40 +4073,35 @@ void tst_qqmllanguage::globalEnums()
void tst_qqmllanguage::lowercaseEnumRuntime_data()
{
QTest::addColumn<QString>("file");
- QTest::addColumn<QString>("errorMessage");
- QTest::newRow("enum from normal type") << "lowercaseEnumRuntime.1.qml" << ":8: TypeError: Cannot access enum value 'lowercaseEnumVal' of 'MyTypeObject', enum values need to start with an uppercase letter.";
- QTest::newRow("enum from singleton type") << "lowercaseEnumRuntime.2.qml" << ":8: TypeError: Cannot access enum value 'lowercaseEnumVal' of 'MyTypeObjectSingleton', enum values need to start with an uppercase letter.";
+ QTest::newRow("enum from normal type") << "lowercaseEnumRuntime.1.qml";
+ QTest::newRow("enum from singleton type") << "lowercaseEnumRuntime.2.qml";
}
void tst_qqmllanguage::lowercaseEnumRuntime()
{
QFETCH(QString, file);
- QFETCH(QString, errorMessage);
QQmlComponent component(&engine, testFileUrl(file));
VERIFY_ERRORS(0);
- QString warning = component.url().toString() + errorMessage;
- QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
delete component.create();
}
void tst_qqmllanguage::lowercaseEnumCompileTime_data()
{
QTest::addColumn<QString>("file");
- QTest::addColumn<QString>("errorFile");
- QTest::newRow("assignment to int property") << "lowercaseEnumCompileTime.1.qml" << "lowercaseEnumCompileTime.1.errors.txt";
- QTest::newRow("assignment to enum property") << "lowercaseEnumCompileTime.2.qml" << "lowercaseEnumCompileTime.2.errors.txt";
+ QTest::newRow("assignment to int property") << "lowercaseEnumCompileTime.1.qml";
+ QTest::newRow("assignment to enum property") << "lowercaseEnumCompileTime.2.qml";
}
void tst_qqmllanguage::lowercaseEnumCompileTime()
{
QFETCH(QString, file);
- QFETCH(QString, errorFile);
QQmlComponent component(&engine, testFileUrl(file));
- VERIFY_ERRORS(qPrintable(errorFile));
+ VERIFY_ERRORS(0);
+ delete component.create();
}
void tst_qqmllanguage::scopedEnum()