From a84980d2cde1f62e574446729d48dd0b29804933 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 28 Sep 2017 15:14:58 +0200 Subject: democompositor: Add a mandatory "Id" to the app specification Add a manodatory appId, expose it to QML, add a simple find by id method and update the testcases. Change-Id: I4f80a97e5f31e972694dd61eff0166f9de2f5d51 Reviewed-by: Paul Olav Tvete --- wayland/democompositor/tests/apps/tst_appparser.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'wayland/democompositor/tests/apps/tst_appparser.cpp') diff --git a/wayland/democompositor/tests/apps/tst_appparser.cpp b/wayland/democompositor/tests/apps/tst_appparser.cpp index a71c123..38a459c 100644 --- a/wayland/democompositor/tests/apps/tst_appparser.cpp +++ b/wayland/democompositor/tests/apps/tst_appparser.cpp @@ -71,15 +71,16 @@ void tst_AppParser::testValidVersion1_data() QTest::addColumn("input"); QTest::addColumn("icon"); QTest::addColumn("name"); + QTest::addColumn("id"); QTest::addColumn("exec"); QTest::addColumn("path"); QTest::addRow("clock") - << QByteArray("{\"Type\":\"Application\", \"Version\":1, \"Icon\":\"icon\", \"Name\":\"Clocks\",\"Exec\":\"clocks\"}") - << QStringLiteral("icon") << QStringLiteral("Clocks") << QStringLiteral("clocks") << QString(); + << QByteArray("{\"Type\":\"Application\", \"Version\":1, \"Icon\":\"icon\", \"Name\":\"Clocks\",\"Id\":\"io.qt.clocks\",\"Exec\":\"clocks\"}") + << QStringLiteral("icon") << QStringLiteral("Clocks") << QStringLiteral("io.qt.clocks") << QStringLiteral("clocks") << QString(); QTest::addRow("path") - << QByteArray("{\"Type\":\"Application\", \"Version\":1, \"Icon\":\"icon\", \"Name\":\"Clocks\",\"Exec\":\"clocks\",\"Path\":\"P\"}") - << QStringLiteral("icon") << QStringLiteral("Clocks") << QStringLiteral("clocks") << QStringLiteral("P"); + << QByteArray("{\"Type\":\"Application\", \"Version\":1, \"Icon\":\"icon\", \"Name\":\"Clocks\",\"Id\":\"io.qt.clocks\",\"Exec\":\"clocks\",\"Path\":\"P\"}") + << QStringLiteral("icon") << QStringLiteral("Clocks") << QStringLiteral("io.qt.clocks") << QStringLiteral("clocks") << QStringLiteral("P"); } void tst_AppParser::testValidVersion1() -- cgit v1.2.3