From 4fde5f11ce2bea6c29156b180d427f0047b1a6f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Mu=C4=87ko?= <piotr.mucko@qt.io>
Date: Fri, 29 Apr 2022 10:58:34 +0200
Subject: [PATCH] McuSupport: Tests overhaul, mocks verification

Change-Id: I710a58b987c501dfff1102a6e3361981df4fdaee
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/mcusupport/test/unittest.cpp | 34 ++++++++++++------------
 src/plugins/mcusupport/test/unittest.h   |  3 ++-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp
index e02a456d27d..3dd8a9bd86f 100644
--- a/src/plugins/mcusupport/test/unittest.cpp
+++ b/src/plugins/mcusupport/test/unittest.cpp
@@ -38,8 +38,8 @@
 #include "mcukitmanager.h"
 #include "mculegacyconstants.h"
 #include "mcusupportconstants.h"
-#include "mcusupportsdk.h"
 #include "mcusupportoptions.h"
+#include "mcusupportsdk.h"
 #include "mcutargetdescription.h"
 #include "mcutargetfactorylegacy.h"
 
@@ -73,6 +73,7 @@ const char armGccLabel[]{"GNU Arm Embedded Toolchain"};
 const char armGccToolchainFilePath[]{"/opt/qtformcu/2.2/lib/cmake/Qul/toolchain/armgcc.cmake"};
 const char armGcc[]{"armgcc"};
 const char cmakeToolchainLabel[]{"CMake Toolchain File"};
+const char fallbackDir[]{"/abc/def/fallback"};
 const char freeRtosCMakeVar[]{"FREERTOS_DIR"};
 const char freeRtosDescription[]{"Freertos directory"};
 const char freeRtosEnvVar[]{"EVK_MIMXRT1170_FREERTOS_PATH"};
@@ -246,6 +247,7 @@ McuSupportTest::McuSupportTest()
                 armGccToolchainFilePackagePtr}
 {
     testing::Mock::AllowLeak(settingsMockPtr.get());
+    testing::FLAGS_gmock_verbose = "error";
 }
 
 void McuSupportTest::initTestCase()
@@ -291,6 +293,18 @@ void McuSupportTest::initTestCase()
         });
 }
 
+void McuSupportTest::init()
+{
+    qDebug() << __func__;
+}
+
+void McuSupportTest::cleanup()
+{
+    QVERIFY(testing::Mock::VerifyAndClearExpectations(settingsMockPtr.get()));
+    QVERIFY(testing::Mock::VerifyAndClearExpectations(freeRtosPackage));
+    QVERIFY(testing::Mock::VerifyAndClearExpectations(sdkPackage));
+}
+
 void McuSupportTest::test_parseBasicInfoFromJson()
 {
     const auto description = Sdk::parseDescriptionJson(iar_nxp_1064_json);
@@ -304,8 +318,8 @@ void McuSupportTest::test_parseCmakeEntries()
     const auto description{Sdk::parseDescriptionJson(iar_nxp_1064_json)};
 
     QVERIFY(!description.freeRTOS.packages.isEmpty());
-    auto &freeRtosPackage = description.freeRTOS.packages[0];
-    QCOMPARE(freeRtosPackage.envVar, nxp1064FreeRtosEnvVar);
+    auto &freeRtos = description.freeRTOS.packages[0];
+    QCOMPARE(freeRtos.envVar, nxp1064FreeRtosEnvVar);
 }
 
 void McuSupportTest::test_parseToolchainFromJSON_data()
@@ -356,20 +370,6 @@ void McuSupportTest::test_parseToolchainFromJSON()
     QCOMPARE(toolchainFilePackage.defaultPath.cleanPath().toUserOutput(), toolchainFile);
 }
 
-void McuSupportTest::test_addFreeRtosCmakeVarToKit()
-{
-    McuKitManager::upgradeKitInPlace(&kit, &mcuTarget, sdkPackagePtr);
-
-    QVERIFY(kit.hasValue(EnvironmentKitAspect::id()));
-    QVERIFY(kit.isValid());
-    QVERIFY(!kit.allKeys().empty());
-
-    const auto &cmakeConfig{CMakeConfigurationKitAspect::configuration(&kit)};
-    QVERIFY(cmakeConfig.size() > 0);
-    QCOMPARE(cmakeConfig.valueOf(freeRtosCMakeVar),
-             FilePath::fromString(freeRtosPath).toString().toLocal8Bit());
-}
-
 void McuSupportTest::test_legacy_createIarToolchain()
 {
     McuToolChainPackagePtr iarToolchainPackage = Sdk::createIarToolChainPackage(settingsMockPtr);
diff --git a/src/plugins/mcusupport/test/unittest.h b/src/plugins/mcusupport/test/unittest.h
index 4cacb680ec3..f0af8ca1d85 100644
--- a/src/plugins/mcusupport/test/unittest.h
+++ b/src/plugins/mcusupport/test/unittest.h
@@ -47,6 +47,8 @@ public:
 
 private slots:
     void initTestCase();
+    void init();
+    void cleanup();
 
     void test_addNewKit();
     void test_parseBasicInfoFromJson();
@@ -66,7 +68,6 @@ private slots:
     void test_createFreeRtosPackageWithCorrectSetting();
     void test_createTargets();
     void test_createPackages();
-    void test_addFreeRtosCmakeVarToKit();
     void test_legacy_createIarToolchain();
     void test_createIarToolchain();
     void test_legacy_createDesktopGccToolchain();