From c09aa96a136dd841e75b459d78ea27ad2bc4474c Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 12 Jul 2017 19:10:58 +0200 Subject: democompositor: Add parsing of entries and testcode Implement parsing of the json definition. Initially be strict to parse the file correctly. Add some basic tests for checking how data and file parsing is working and feed some invalid input into the parser and check the result. Use macro for checking the JSON type and doing the conversion to allow an early return and to avoid having to write the same code over and over again. Change-Id: I8c4301bac1b6226f94c8fc0004a313487b73c21a Reviewed-by: Paul Olav Tvete --- wayland/democompositor/apps/appentry.cpp | 57 ++++++++ wayland/democompositor/apps/appentry.h | 66 +++++++++ wayland/democompositor/apps/applog.h | 55 ++++++++ wayland/democompositor/apps/appparser.cpp | 156 +++++++++++++++++++++ wayland/democompositor/apps/appparser.h | 62 ++++++++ wayland/democompositor/apps/apps.pri | 9 ++ wayland/democompositor/democompositor.pro | 3 + wayland/democompositor/tests/apps/apps.pro | 12 ++ wayland/democompositor/tests/apps/apps.qrc | 5 + .../democompositor/tests/apps/tst_appparser.cpp | 133 ++++++++++++++++++ 10 files changed, 558 insertions(+) create mode 100644 wayland/democompositor/apps/appentry.cpp create mode 100644 wayland/democompositor/apps/appentry.h create mode 100644 wayland/democompositor/apps/applog.h create mode 100644 wayland/democompositor/apps/appparser.cpp create mode 100644 wayland/democompositor/apps/appparser.h create mode 100644 wayland/democompositor/apps/apps.pri create mode 100644 wayland/democompositor/tests/apps/apps.pro create mode 100644 wayland/democompositor/tests/apps/apps.qrc create mode 100644 wayland/democompositor/tests/apps/tst_appparser.cpp (limited to 'wayland') diff --git a/wayland/democompositor/apps/appentry.cpp b/wayland/democompositor/apps/appentry.cpp new file mode 100644 index 0000000..6cd813a --- /dev/null +++ b/wayland/democompositor/apps/appentry.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of Qt for Device Creation. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "appentry.h" + +AppEntry AppEntry::empty() +{ + QString empty; + return AppEntry{empty, empty, empty, empty}; +} diff --git a/wayland/democompositor/apps/appentry.h b/wayland/democompositor/apps/appentry.h new file mode 100644 index 0000000..6de410c --- /dev/null +++ b/wayland/democompositor/apps/appentry.h @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of Qt for Device Creation. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#pragma once + +#include + +/** + * A const representatation of an application entry. Members include + * executable name, path, icon and other information in the future. + */ +struct AppEntry { + const QString iconName; + const QString appName; + const QString executableName; + const QString executablePath; + + static AppEntry empty(); +}; diff --git a/wayland/democompositor/apps/applog.h b/wayland/democompositor/apps/applog.h new file mode 100644 index 0000000..b116530 --- /dev/null +++ b/wayland/democompositor/apps/applog.h @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of Qt for Device Creation. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#pragma once + +#include + +Q_DECLARE_LOGGING_CATEGORY(apps) diff --git a/wayland/democompositor/apps/appparser.cpp b/wayland/democompositor/apps/appparser.cpp new file mode 100644 index 0000000..18d2d22 --- /dev/null +++ b/wayland/democompositor/apps/appparser.cpp @@ -0,0 +1,156 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of Qt for Device Creation. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "appparser.h" +#include "applog.h" + +#include +#include +#include + +Q_LOGGING_CATEGORY(apps, "launcher.apps") + + +static QString doReadString(const QJsonValue& value, bool *ok) +{ + if (value.type() != QJsonValue::String) { + *ok = false; + return QString(); + } + return value.toString(); +} + +static int doReadInt(const QJsonValue& value, bool *ok) +{ + if (value.type() != QJsonValue::Double) { + *ok = false; + return 0; + } + return value.toInt(); +} + +static QString readString(const QJsonObject& object, const QString& key, bool *ok) +{ + return doReadString(object.value(key), ok); +} + +static QString readStringOptional(const QJsonObject& object, const QString& key, bool *ok) +{ + auto item = object.value(key); + if (item.type() == QJsonValue::Undefined) + return QString(); + return doReadString(item, ok); +} + +static int readInt(const QJsonObject& object, const QString& key, bool *ok) +{ + return doReadInt(object.value(key), ok); +} + +AppEntry AppParser::parseData(const QByteArray& content, bool *ok) +{ + *ok = true; + QJsonParseError error; + + QJsonDocument doc = QJsonDocument::fromJson(content, &error); + if (error.error != QJsonParseError::NoError) { + qCWarning(apps) << "Failed to parse json: " << error.errorString(); + *ok = false; + return AppEntry::empty(); + } + + if (!doc.isObject()) { + qCWarning(apps) << "Parsed document is not an object"; + *ok = false; + return AppEntry::empty(); + } + + auto root = doc.object(); + + QString type = readString(root, QStringLiteral("Type"), ok); + if (type != QStringLiteral("Application")) { + qCWarning(apps) << "Unknown type" << type; + *ok = false; + } + + int version = readInt(root, QStringLiteral("Version"), ok); + if (version != 1) { + qCWarning(apps) << "Version number should be 1... Consider to fix that" << version; + } + + QString iconName = readString(root, QStringLiteral("Icon"), ok); + QString appName = readString(root, QStringLiteral("Name"), ok); + QString executableName = readString(root, QStringLiteral("Exec"), ok); + QString executablePath = readStringOptional(root, QStringLiteral("Path"), ok); + if (!*ok) + return AppEntry::empty(); + + return AppEntry{iconName, appName, executableName, executablePath}; +} + +AppEntry AppParser::parseFile(const QString& fileName, bool *ok) +{ + qCDebug(apps) << "Trying to parse" << fileName; + + QFile file(fileName); + if (!file.open(QFile::ReadOnly)) { + qCWarning(apps) << "Failed to open" << fileName; + *ok = false; + return AppEntry::empty(); + } + + auto entry = parseData(file.readAll(), ok); + file.close(); + if (!*ok) { + qCWarning(apps) << "Failed to parse" << fileName; + return AppEntry::empty(); + } + return entry; +} diff --git a/wayland/democompositor/apps/appparser.h b/wayland/democompositor/apps/appparser.h new file mode 100644 index 0000000..da52c5a --- /dev/null +++ b/wayland/democompositor/apps/appparser.h @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of Qt for Device Creation. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#pragma once + +#include "appentry.h" + +/** + * Parse a single application entry to an AppEntry. + */ +class AppParser { +public: + static AppEntry parseData(const QByteArray& content, bool *ok); + static AppEntry parseFile(const QString& fileName, bool *ok); +}; diff --git a/wayland/democompositor/apps/apps.pri b/wayland/democompositor/apps/apps.pri new file mode 100644 index 0000000..dfcee61 --- /dev/null +++ b/wayland/democompositor/apps/apps.pri @@ -0,0 +1,9 @@ + +HEADERS += \ + apps/appentry.h \ + apps/applog.h \ + apps/appparser.h + +SOURCES += \ + apps/appentry.cpp \ + apps/appparser.cpp diff --git a/wayland/democompositor/democompositor.pro b/wayland/democompositor/democompositor.pro index cbed99f..ff9f2b4 100644 --- a/wayland/democompositor/democompositor.pro +++ b/wayland/democompositor/democompositor.pro @@ -17,6 +17,9 @@ RESOURCES += democompositor.qrc HEADERS += \ processlauncher.h +# include modules +include(apps/apps.pri) + INSTALLS += target apps target.path = /data/user/$$TARGET diff --git a/wayland/democompositor/tests/apps/apps.pro b/wayland/democompositor/tests/apps/apps.pro new file mode 100644 index 0000000..710e077 --- /dev/null +++ b/wayland/democompositor/tests/apps/apps.pro @@ -0,0 +1,12 @@ +TARGET = tst_apps +QT = testlib +CONFIG += testcase + +INCLUDEPATH += ../../apps + +SOURCES += \ + ../../apps/appentry.cpp \ + ../../apps/appparser.cpp + +SOURCES += tst_appparser.cpp +RESOURCES += apps.qrc diff --git a/wayland/democompositor/tests/apps/apps.qrc b/wayland/democompositor/tests/apps/apps.qrc new file mode 100644 index 0000000..07e0afe --- /dev/null +++ b/wayland/democompositor/tests/apps/apps.qrc @@ -0,0 +1,5 @@ + + + ../../apps/files/clock.app + + diff --git a/wayland/democompositor/tests/apps/tst_appparser.cpp b/wayland/democompositor/tests/apps/tst_appparser.cpp new file mode 100644 index 0000000..48b6b4d --- /dev/null +++ b/wayland/democompositor/tests/apps/tst_appparser.cpp @@ -0,0 +1,133 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of Qt for Device Creation. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +#include "appparser.h" + +class tst_AppParser : public QObject { + Q_OBJECT + +private Q_SLOTS: + void testValidVersion1_data(); + void testValidVersion1(); + + void testInvalid_data(); + void testInvalid(); + + void testFileOpen(); +}; + + +void tst_AppParser::testValidVersion1_data() +{ + QTest::addColumn("input"); + QTest::addColumn("icon"); + QTest::addColumn("name"); + 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(); + QTest::addRow("path") + << QByteArray("{\"Type\":\"Application\", \"Version\":1, \"Icon\":\"icon\", \"Name\":\"Clocks\",\"Exec\":\"clocks\",\"Path\":\"P\"}") + << QStringLiteral("icon") << QStringLiteral("Clocks") << QStringLiteral("clocks") << QStringLiteral("P"); +} + +void tst_AppParser::testValidVersion1() +{ + QFETCH(QByteArray, input); + QFETCH(QString, icon); + QFETCH(QString, name); + QFETCH(QString, exec); + QFETCH(QString, path); + + bool ok = false; + auto entry = AppParser::parseData(input, &ok); + QVERIFY(ok); +} + +void tst_AppParser::testInvalid_data() +{ + QTest::addColumn("input"); + QTest::addRow("no json") << QByteArray("12345"); + QTest::addRow("array") << QByteArray("[]"); + QTest::addRow("no content") << QByteArray("{}"); + QTest::addRow("empty") << QByteArray(""); +} + +void tst_AppParser::testInvalid() +{ + QFETCH(QByteArray, input); + + bool ok = true; + AppParser::parseData(input, &ok); + QVERIFY(!ok); +} + +void tst_AppParser::testFileOpen() +{ + bool ok = true; + + AppParser::parseFile(":/can_not_exist_here.json", &ok); + QVERIFY(!ok); + + ok = false; + auto entry = AppParser::parseFile(":/app.json", &ok); + QVERIFY(ok); + QCOMPARE(entry.iconName, QStringLiteral("qrc:/images/Icon_Clocks.png")); + QCOMPARE(entry.appName, QStringLiteral("Clocks")); + QCOMPARE(entry.executableName, QStringLiteral("clocks")); + QCOMPARE(entry.executablePath, QStringLiteral("./")); +} + +QTEST_MAIN(tst_AppParser) +#include "tst_appparser.moc" -- cgit v1.2.3