feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/13.0' into 14.0

Browse Source 
Change-Id: I530a3047364fae9cf8a992dd9395147d3e25a10a
This commit is contained in:
Eike Ziller
2024-06-12 12:55:25 +02:00
parent 3ea08f9b6f 108ed5a400
commit 1ff3e0aab8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/mcusupport/test/unittest.cpp
View File

@@ -75,6 +75,7 @@ using ProjectExplorer::ToolchainManager;
using testing::_; using testing::_;
using testing::Return; using testing::Return;
using testing::Between;
namespace { namespace {
const char empty[]{""}; const char empty[]{""};
@@ -506,6 +507,7 @@ void McuSupportTest::init()
void McuSupportTest::cleanup() void McuSupportTest::cleanup()
{ {
QVERIFY(settingsMockPtr.get());
QVERIFY(testing::Mock::VerifyAndClearExpectations(settingsMockPtr.get())); QVERIFY(testing::Mock::VerifyAndClearExpectations(settingsMockPtr.get()));
QVERIFY(testing::Mock::VerifyAndClearExpectations(freeRtosPackage)); QVERIFY(testing::Mock::VerifyAndClearExpectations(freeRtosPackage));
QVERIFY(testing::Mock::VerifyAndClearExpectations(sdkPackage)); QVERIFY(testing::Mock::VerifyAndClearExpectations(sdkPackage));
@@ -854,7 +856,7 @@ void McuSupportTest::test_useFallbackPathForToolchainWhenPathFromSettingsIsNotAv
McuTargetDescription::Toolchain toolchainDescription{armGcc, {}, compilerDescription, {}}; McuTargetDescription::Toolchain toolchainDescription{armGcc, {}, compilerDescription, {}};
EXPECT_CALL(*settingsMockPtr, getPath(Key{armGccDirectorySetting}, _, FilePath{fallbackDir})) EXPECT_CALL(*settingsMockPtr, getPath(Key{armGccDirectorySetting}, _, FilePath{fallbackDir}))
.Times(2) .Times(Between(2,3))
.WillRepeatedly(Return(FilePath{fallbackDir})); .WillRepeatedly(Return(FilePath{fallbackDir}));
McuToolchainPackage *toolchain = targetFactory.createToolchain(toolchainDescription); McuToolchainPackage *toolchain = targetFactory.createToolchain(toolchainDescription);
@@ -1559,7 +1561,7 @@ void McuSupportTest::test_legacy_createThirdPartyPackage()
QFETCH(QString, detectionPath); QFETCH(QString, detectionPath);
EXPECT_CALL(*settingsMockPtr, getPath(Key{setting}, _, _)) EXPECT_CALL(*settingsMockPtr, getPath(Key{setting}, _, _))
.Times(2) .Times(Between(2,3))
.WillRepeatedly(Return(FilePath::fromUserInput(defaultPath))); .WillRepeatedly(Return(FilePath::fromUserInput(defaultPath)));
McuPackagePtr thirdPartyPackage{creator()}; McuPackagePtr thirdPartyPackage{creator()};
@@ -1644,7 +1646,7 @@ void McuSupportTest::test_createThirdPartyPackage()
.WillOnce(Return(FilePath::fromUserInput(defaultPath))); .WillOnce(Return(FilePath::fromUserInput(defaultPath)));
EXPECT_CALL(*settingsMockPtr, getPath(Key{setting}, QSettings::UserScope, _)) EXPECT_CALL(*settingsMockPtr, getPath(Key{setting}, QSettings::UserScope, _))
.Times(testing::AtMost(1)) .Times(testing::AtMost(2))
.WillOnce(Return(FilePath::fromUserInput(path))); .WillOnce(Return(FilePath::fromUserInput(path)));
auto [targets, packages] = targetFactory.createTargets(targetDescription, sdkPackagePtr); auto [targets, packages] = targetFactory.createTargets(targetDescription, sdkPackagePtr);
@@ -1668,7 +1670,7 @@ void McuSupportTest::test_createThirdPartyPackage()
void McuSupportTest::test_legacy_createCypressProgrammer3rdPartyPackage() void McuSupportTest::test_legacy_createCypressProgrammer3rdPartyPackage()
{ {
EXPECT_CALL(*settingsMockPtr, getPath(Key{cypressProgrammerSetting}, _, _)) EXPECT_CALL(*settingsMockPtr, getPath(Key{cypressProgrammerSetting}, _, _))
.Times(2) .Times(Between(2,3))
.WillRepeatedly(Return(FilePath::fromUserInput(defaultToolPath))); .WillRepeatedly(Return(FilePath::fromUserInput(defaultToolPath)));
McuPackagePtr thirdPartyPackage{Legacy::createCypressProgrammerPackage(settingsMockPtr)}; McuPackagePtr thirdPartyPackage{Legacy::createCypressProgrammerPackage(settingsMockPtr)};
@@ -1692,7 +1694,7 @@ void McuSupportTest::test_createJLink3rdPartyPackage()
.WillOnce(Return(FilePath::fromUserInput(jlinkPath))); .WillOnce(Return(FilePath::fromUserInput(jlinkPath)));
EXPECT_CALL(*settingsMockPtr, getPath(Key{jlinkSetting}, QSettings::UserScope, _)) EXPECT_CALL(*settingsMockPtr, getPath(Key{jlinkSetting}, QSettings::UserScope, _))
.Times(testing::AtMost(1)) .Times(testing::AtMost(2))
.WillOnce(Return(FilePath::fromUserInput(jlinkPath))); .WillOnce(Return(FilePath::fromUserInput(jlinkPath)));
auto [targets, packages] = targetFactory.createTargets(targetDescription, sdkPackagePtr); auto [targets, packages] = targetFactory.createTargets(targetDescription, sdkPackagePtr);