From bc2aee1af581e0e3c6c89a797ccb13e40b807d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Mu=C4=87ko?= Date: Fri, 17 Jun 2022 16:12:33 +0200 Subject: [PATCH] McuSupport: Test Qt MCUs package legacy creation Change-Id: I8e724e11f8342ef02a8ee7246fbf35e65e0166a1 Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/mculegacyconstants.h | 1 + src/plugins/mcusupport/mcusupportsdk.cpp | 5 +++-- src/plugins/mcusupport/test/unittest.cpp | 14 ++++++++++++++ src/plugins/mcusupport/test/unittest.h | 1 + 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/plugins/mcusupport/mculegacyconstants.h b/src/plugins/mcusupport/mculegacyconstants.h index 503f30ee75d..01e5fa5f93a 100644 --- a/src/plugins/mcusupport/mculegacyconstants.h +++ b/src/plugins/mcusupport/mculegacyconstants.h @@ -27,6 +27,7 @@ namespace McuSupport::Constants { +const char QT_FOR_MCUS_SDK_PACKAGE_VALIDATION_PATH[] = "bin/qmltocpp"; const char QUL_TOOLCHAIN_CMAKE_DIR[] = "lib/cmake/Qul/toolchain/"; const char QUL_ENV_VAR[] = "Qul_ROOT"; const char BOARD_SDK_CMAKE_VAR[] = "QUL_BOARD_SDK_DIR"; diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index b81289b1033..3a40c275423 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -82,8 +82,9 @@ McuPackagePtr createQtForMCUsPackage(const SettingsHandler::Ptr &settingsHandler return McuPackagePtr{ new McuPackage(settingsHandler, McuPackage::tr("Qt for MCUs SDK"), - FileUtils::homePath(), // defaultPath - FilePath("bin/qmltocpp").withExecutableSuffix(), // detectionPath + FileUtils::homePath(), // defaultPath + FilePath(Constants::QT_FOR_MCUS_SDK_PACKAGE_VALIDATION_PATH) + .withExecutableSuffix(), // detectionPath Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK, // settingsKey QStringLiteral("Qul_ROOT"), // cmakeVarName QStringLiteral("Qul_DIR"))}; // envVarName diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index d21aeabb366..50d66a99d6d 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -874,4 +874,18 @@ void McuSupportTest::test_createBoardSdk() verifyBoardSdk(boardSdk, environmentVariable, versions); } +void McuSupportTest::test_legacy_createQtMCUsPackage() +{ + EXPECT_CALL(*settingsMockPtr, + getPath(QString{Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK}, _, _)) + .WillRepeatedly(Return(FilePath::fromString(qtForMcuSdkPath))); + + McuPackagePtr qtForMCUsSDK = Sdk::createQtForMCUsPackage(settingsMockPtr); + + QVERIFY(qtForMCUsSDK); + QCOMPARE(qtForMCUsSDK->settingsKey(), Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK); + QCOMPARE(qtForMCUsSDK->detectionPath(), Constants::QT_FOR_MCUS_SDK_PACKAGE_VALIDATION_PATH); + QCOMPARE(qtForMCUsSDK->path().toString(), qtForMcuSdkPath); +} + } // namespace McuSupport::Internal::Test diff --git a/src/plugins/mcusupport/test/unittest.h b/src/plugins/mcusupport/test/unittest.h index 89ad83a51b3..91844f087e7 100644 --- a/src/plugins/mcusupport/test/unittest.h +++ b/src/plugins/mcusupport/test/unittest.h @@ -63,6 +63,7 @@ private slots: void test_legacy_createTargetWithToolchainPackages(); void test_createTargetWithToolchainPackages_data(); void test_createTargetWithToolchainPackages(); + void test_legacy_createQtMCUsPackage(); void test_createFreeRtosPackageWithCorrectSetting_data(); void test_createFreeRtosPackageWithCorrectSetting();