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

Enable disabled test in QDS's wizard factories

Browse Source 
The test was disabled because it required a method to be virtual, in
order to be mocked; and where it was integrated in (branch 6.0), it was
a patch release, and we couldn't break binary compatibility.

Task-number: QDS-5691
Change-Id: If8d3101be7b92942b32ffff1d88ab0823f26e08b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Samuel Ghinet
2022-01-17 18:34:48 +02:00
parent d6f56254d1
commit 2c8c7707c5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h
View File

@@ -83,7 +83,7 @@ public:
bool isAvailable(Utils::Id platformId) const override; bool isAvailable(Utils::Id platformId) const override;
std::pair<int, QStringList> screenSizeInfoFromPage(const QString &pageType) const; virtual std::pair<int, QStringList> screenSizeInfoFromPage(const QString &pageType) const;
private: private:
Utils::Wizard *runWizardImpl(const Utils::FilePath &path, QWidget *parent, Utils::Id platform, Utils::Wizard *runWizardImpl(const Utils::FilePath &path, QWidget *parent, Utils::Id platform,

2
tests/auto/qml/qmldesigner/wizard/wizardfactories-test.cpp
View File

@@ -238,7 +238,7 @@ TEST_F(QdsWizardFactories, doesNotFilterOutAGoodWizardFactory)
ASSERT_THAT(presets, Not(IsEmpty())); ASSERT_THAT(presets, Not(IsEmpty()));
} }
TEST_F(QdsWizardFactories, DISABLED_buildsPresetItemWithCorrectSizeName) TEST_F(QdsWizardFactories, buildsPresetItemWithCorrectSizeName)
{ {
WizardFactories wf = makeWizardFactoriesHandler( WizardFactories wf = makeWizardFactoriesHandler(
{ {