aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMaximilian Goldstein <max.goldstein@qt.io>2020-10-07 10:24:29 +0200
committerMaximilian Goldstein <max.goldstein@qt.io>2020-10-07 10:43:17 +0200
commit49391fcc41d871836868452b8300938d0b94f00e (patch)
tree4838e309dbad1a223f3d2754be0e49d7bebe0648 /tests
parente7e04656696d144e57c9bec1b6ca7d30d237ee70 (diff)
qmlformat: Fix computed property names
Fixes: QTBUG-87222 Pick-to: 5.15 Change-Id: If1da02d503041009b82651e1087fb4a1bdd79d59 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/qmlformat/data/propertyNames.formatted.qml14
-rw-r--r--tests/auto/qml/qmlformat/data/propertyNames.qml13
-rw-r--r--tests/auto/qml/qmlformat/tst_qmlformat.cpp2
3 files changed, 29 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlformat/data/propertyNames.formatted.qml b/tests/auto/qml/qmlformat/data/propertyNames.formatted.qml
new file mode 100644
index 0000000000..c7d50abb32
--- /dev/null
+++ b/tests/auto/qml/qmlformat/data/propertyNames.formatted.qml
@@ -0,0 +1,14 @@
+Item {
+ function x() {
+ var copiedItem = "copied value";
+ var computedItem = "computedName";
+ var obj = {
+ "identifierName": "identifier value",
+ "string name": "string value",
+ "Infinity": "numeric value",
+ [computedItem]: "computed value",
+ "copiedItem": copiedItem
+ };
+ }
+
+}
diff --git a/tests/auto/qml/qmlformat/data/propertyNames.qml b/tests/auto/qml/qmlformat/data/propertyNames.qml
new file mode 100644
index 0000000000..9214014889
--- /dev/null
+++ b/tests/auto/qml/qmlformat/data/propertyNames.qml
@@ -0,0 +1,13 @@
+Item {
+ function x() {
+ var copiedItem = "copied value";
+ var computedItem = "computedName";
+ var obj = {
+ identifierName: "identifier value",
+ "string name": "string value",
+ Infinity: "numeric value",
+ [computedItem]: "computed value",
+ copiedItem
+ };
+ }
+}
diff --git a/tests/auto/qml/qmlformat/tst_qmlformat.cpp b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
index 34ce8597e3..6f2410854a 100644
--- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp
+++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp
@@ -233,6 +233,8 @@ void TestQmlformat::testFormat_data()
<< "multilineComment.formatted.qml" << false << true;
QTest::newRow("for of") << "forOf.qml"
<< "forOf.formatted.qml" << false << true;
+ QTest::newRow("property names") << "propertyNames.qml"
+ << "propertyNames.formatted.qml" << false << true;
}
void TestQmlformat::testFormat()