From 2c8c7707c5c56816f42bedc75a6dfd0cb4a842e5 Mon Sep 17 00:00:00 2001 From: Samuel Ghinet Date: Mon, 17 Jan 2022 18:34:48 +0200 Subject: [PATCH] Enable disabled test in QDS's wizard factories 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 Reviewed-by: Mahmoud Badri Reviewed-by: Qt CI Bot Reviewed-by: Thomas Hartmann --- src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h | 2 +- tests/auto/qml/qmldesigner/wizard/wizardfactories-test.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h index 347692bf65b..814585ae91f 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h @@ -83,7 +83,7 @@ public: bool isAvailable(Utils::Id platformId) const override; - std::pair screenSizeInfoFromPage(const QString &pageType) const; + virtual std::pair screenSizeInfoFromPage(const QString &pageType) const; private: Utils::Wizard *runWizardImpl(const Utils::FilePath &path, QWidget *parent, Utils::Id platform, diff --git a/tests/auto/qml/qmldesigner/wizard/wizardfactories-test.cpp b/tests/auto/qml/qmldesigner/wizard/wizardfactories-test.cpp index 9b692c7d0ba..7a34b1d4205 100644 --- a/tests/auto/qml/qmldesigner/wizard/wizardfactories-test.cpp +++ b/tests/auto/qml/qmldesigner/wizard/wizardfactories-test.cpp @@ -238,7 +238,7 @@ TEST_F(QdsWizardFactories, doesNotFilterOutAGoodWizardFactory) ASSERT_THAT(presets, Not(IsEmpty())); } -TEST_F(QdsWizardFactories, DISABLED_buildsPresetItemWithCorrectSizeName) +TEST_F(QdsWizardFactories, buildsPresetItemWithCorrectSizeName) { WizardFactories wf = makeWizardFactoriesHandler( {