From 70dde948ed0f10f02cdaca0dc93ff7eb3c5394eb Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 13 Apr 2022 11:54:36 +0200 Subject: [PATCH] McuSupport: Fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia40a8aa6af12c93087a20ce2b2000cccd8fd6e0c Reviewed-by: Piotr Mućko Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/test/unittest.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 1c9feba4aef..a2e9b833054 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -52,7 +52,7 @@ #include #include -#include +#include #include @@ -259,14 +259,12 @@ void McuSupportTest::test_addFreeRtosCmakeVarToKit() QVERIFY(!kit.allKeys().empty()); const auto &cmakeConfig{CMakeConfigurationKitAspect::configuration(&kit)}; - QCOMPARE(cmakeConfig.size(), 8); + QVERIFY(cmakeConfig.size() > 0); CMakeConfigItem expectedCmakeVar{freeRtosCMakeVar, FilePath::fromString(defaultfreeRtosPath).toUserOutput().toLocal8Bit()}; QVERIFY(cmakeConfig.contains(expectedCmakeVar)); - const auto config = CMakeConfigurationKitAspect::configuration(&kit); - QVERIFY(config.size() > 0); } void McuSupportTest::test_legacy_createIarToolchain() @@ -443,7 +441,13 @@ void McuSupportTest::test_createTargets() QCOMPARE(target->colorDepth(), colorDepth); const auto &tgtPackages{target->packages()}; QVERIFY(!tgtPackages.empty()); - const auto rtosPackage{*tgtPackages.constBegin()}; + // for whatever reasons there are more than a single package, get the right one to check + const auto rtosPackage + = Utils::findOrDefault(tgtPackages, + [id = QString::fromLatin1(id)](McuPackagePtr pkg) { + return pkg->label() == id; + }); + QVERIFY(rtosPackage); QCOMPARE(rtosPackage->environmentVariableName(), nxp1064FreeRtosEnvVar); }