diff options
author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-04-12 10:01:49 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-04-19 11:14:28 +0000 |
commit | ca3c06d2b54b22ff4372a32ac5fcb1998cf09c38 (patch) | |
tree | 2e2df17c103224c55d2c93049f02dac337736d0e /tests | |
parent | 0af88f707387390049d3e5d524373fe93124a5a1 (diff) | |
download | qtivi-ca3c06d2b54b22ff4372a32ac5fcb1998cf09c38.tar.gz |
Clazy and clang-tidy fixes
Applied to all modules and the plugins
Change-Id: Id1dd9adb4a9f5bdcd452242785439e118d63ef10
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp | 2 | ||||
-rw-r--r-- | tests/auto/dlt/tst_dlt.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp index 2b8ce7f..9444e29 100644 --- a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp +++ b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp @@ -109,6 +109,7 @@ void ServiceManagerTest::initTestCase() { QStringList origList = QCoreApplication::libraryPaths(); QCoreApplication::setLibraryPaths(QStringList()); + QTest::ignoreMessage(QtWarningMsg, QRegularExpression("PluginManager - Malformed metaData in static plugin '.*'. MetaData must contain a list of interfaces")); QTest::ignoreMessage(QtWarningMsg, "No plugins found in search path: \"\""); QTest::ignoreMessage(QtWarningMsg, QRegularExpression("PluginManager - Malformed metaData in '.*'. MetaData must contain a list of interfaces")); manager = QIviServiceManager::instance(); @@ -116,6 +117,7 @@ void ServiceManagerTest::initTestCase() QList<QIviServiceObject *> services = manager->findServiceByInterface("simple_plugin"); QCOMPARE(services.count(), 0); + QTest::ignoreMessage(QtWarningMsg, QRegularExpression("PluginManager - Malformed metaData in static plugin '.*'. MetaData must contain a list of interfaces")); //Reset original setting + this folder for finding our test plugins origList.append(QDir::currentPath()); QCoreApplication::setLibraryPaths(origList); diff --git a/tests/auto/dlt/tst_dlt.cpp b/tests/auto/dlt/tst_dlt.cpp index 0eb31df..7bd4708 100644 --- a/tests/auto/dlt/tst_dlt.cpp +++ b/tests/auto/dlt/tst_dlt.cpp @@ -138,15 +138,15 @@ void QDltTest::testLogging() registration->registerApplication("APP1", "Description for APP"); registration->registerCategory(&TEST1(), "TES1", "Test Category One"); - QString msg = QLatin1Literal("TEST"); + QString msg = QLatin1String("TEST"); QString expectedMsg = QString("%1: \"%2\"").arg(TEST1().categoryName(), msg); qWarning(TEST1) << msg; QList<QDltMessage> dltMessages = m_dltParser->readNextMessages(); QCOMPARE(dltMessages.count(), 1); - QCOMPARE(dltMessages.at(0).appId, QLatin1Literal("APP1")); - QCOMPARE(dltMessages.at(0).ctxId, QLatin1Literal("TES1")); + QCOMPARE(dltMessages.at(0).appId, QLatin1String("APP1")); + QCOMPARE(dltMessages.at(0).ctxId, QLatin1String("TES1")); QCOMPARE(dltMessages.at(0).payload, expectedMsg); } |