feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
5e059db065b1680c4f08b901b64f102300eda6e6
qt-creator/tests/auto/qml/qmldesigner/wizard/presetmodel-test.cpp

451 lines
12 KiB
C++
Raw Normal View History

Use SPDX license identifiers Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-19 15:59:36 +02:00
// Copyright (C) 2022 The Qt Company Ltd.
Remove GPL-3.0+ from license identifiers Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-21 10:12:09 +01:00
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
#include "test-utilities.h"
#include "presetmodel.h"
using namespace StudioWelcome;
using ::testing::ElementsAre;
using ::testing::ElementsAreArray;
using ::testing::PrintToString;
namespace StudioWelcome {
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
void PrintTo(const UserPresetItem &item, std::ostream *os);
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
void PrintTo(const PresetItem &item, std::ostream *os)
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{
if (typeid(item) == typeid(UserPresetItem)) {
PrintTo((UserPresetItem &) item, os);
return;
}
*os << "{categId: " << item.categoryId << ", "
<< "name: " << item.wizardName;
if (!item.screenSizeName.isEmpty())
*os << ", size: " << item.screenSizeName;
*os << "}";
}
void PrintTo(const UserPresetItem &item, std::ostream *os)
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
{
*os << "{categId: " << item.categoryId << ", "
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
<< "name: " << item.wizardName << ", "
<< "user name: " << item.userName;
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
if (!item.screenSizeName.isEmpty())
*os << ", size: " << item.screenSizeName;
*os << "}";
}
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
void PrintTo(const std::shared_ptr<PresetItem> &p, std::ostream *os)
{
if (p)
PrintTo(*p, os);
else
*os << "{null}";
}
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
} // namespace StudioWelcome
namespace {
std::pair<QString, WizardCategory> aCategory(const QString &categId,
const QString &categName,
const std::vector<QString> &names)
{
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
std::vector<std::shared_ptr<PresetItem>> items
= Utils::transform(names, [&categId](const QString &name) {
std::shared_ptr<PresetItem> item{new PresetItem};
item->wizardName = name;
item->categoryId = categId;
return item;
});
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
return std::make_pair(categId, WizardCategory{categId, categName, items});
}
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
UserPresetData aUserPreset(const QString &categId, const QString &wizardName, const QString &userName)
{
UserPresetData preset;
preset.categoryId = categId;
preset.wizardName = wizardName;
preset.name = userName;
return preset;
}
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
UserPresetData aRecentPreset(const QString &categId, const QString &wizardName, const QString &screenSizeName)
{
UserPresetData preset = aUserPreset(categId, wizardName, wizardName);
preset.screenSize = screenSizeName;
return preset;
}
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
MATCHER_P2(PresetIs, category, name, PrintToString(PresetItem{name, category}))
{
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
return arg->categoryId == category && arg->wizardName == name;
}
MATCHER_P3(UserPresetIs,
category,
wizardName,
userName,
PrintToString(UserPresetItem{wizardName, userName, category}))
{
auto userPreset = dynamic_cast<UserPresetItem *>(arg.get());
return userPreset->categoryId == category && userPreset->wizardName == wizardName
&& userPreset->userName == userName;
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
}
MATCHER_P3(PresetIs, category, name, size, PrintToString(PresetItem{name, category, size}))
{
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
return arg->categoryId == category && arg->wizardName == name && size == arg->screenSizeName;
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
}
} // namespace
/******************* TESTS *******************/
TEST(QdsPresetModel, whenHaveNoPresetsNoRecentsReturnEmpty)
{
PresetData data;
ASSERT_THAT(data.presets(), SizeIs(0));
ASSERT_THAT(data.categories(), SizeIs(0));
}
TEST(QdsPresetModel, haveSameArraySizeForPresetsAndCategories)
{
PresetData data;
data.setData(
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
/*wizard presets*/
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
{
aCategory("A.categ", "A", {"item a", "item b"}),
aCategory("B.categ", "B", {"item c", "item d"}),
},
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{/*user presets*/},
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
{/*recents*/});
ASSERT_THAT(data.presets(), SizeIs(2));
ASSERT_THAT(data.categories(), SizeIs(2));
}
TEST(QdsPresetModel, haveWizardPresetsNoRecents)
{
// Given
PresetData data;
// When
data.setData(
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
/*wizard presets*/
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
{
aCategory("A.categ", "A", {"item a", "item b"}),
aCategory("B.categ", "B", {"item c", "item d"}),
},
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{/*user presets*/},
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
{/*recents*/});
// Then
ASSERT_THAT(data.categories(), ElementsAre("A", "B"));
ASSERT_THAT(data.presets()[0],
ElementsAre(PresetIs("A.categ", "item a"), PresetIs("A.categ", "item b")));
ASSERT_THAT(data.presets()[1],
ElementsAre(PresetIs("B.categ", "item c"), PresetIs("B.categ", "item d")));
}
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
TEST(QdsPresetModel, whenHaveUserPresetsButNoWizardPresetsReturnEmpty)
{
// Given
PresetData data;
// When
data.setData({/*builtin presets*/},
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
/*user presets*/
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{
aUserPreset("A.Mobile", "Scroll", "iPhone5"),
aUserPreset("B.Desktop", "Launcher", "MacBook"),
},
{/*recents*/});
// Then
ASSERT_THAT(data.categories(), IsEmpty());
ASSERT_THAT(data.presets(), IsEmpty());
}
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
TEST(QdsPresetModel, haveRecentsNoWizardPresets)
{
PresetData data;
data.setData({/*wizardPresets*/},
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{/*user presets*/},
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
/*recent presets*/
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
{
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
aRecentPreset("A.categ", "Desktop", "640 x 480"),
aRecentPreset("B.categ", "Mobile", "800 x 600"),
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
});
ASSERT_THAT(data.categories(), IsEmpty());
ASSERT_THAT(data.presets(), IsEmpty());
}
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
TEST(QdsPresetModel, recentsAddedWithWizardPresets)
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
{
// Given
PresetData data;
// When
data.setData(
/*wizard presets*/
{
aCategory("A.categ", "A", {"Desktop", "item b"}),
aCategory("B.categ", "B", {"item c", "Mobile"}),
},
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{/*user presets*/},
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
/*recents*/
{
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
aRecentPreset("A.categ", "Desktop", "800 x 600"),
aRecentPreset("B.categ", "Mobile", "640 x 480"),
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
});
// Then
ASSERT_THAT(data.categories(), ElementsAre("Recents", "A", "B"));
ASSERT_THAT(data.presets(),
ElementsAreArray(
{ElementsAre(PresetIs("A.categ", "Desktop"), PresetIs("B.categ", "Mobile")),
ElementsAre(PresetIs("A.categ", "Desktop"), PresetIs("A.categ", "item b")),
ElementsAre(PresetIs("B.categ", "item c"), PresetIs("B.categ", "Mobile"))}));
}
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
TEST(QdsPresetModel, userPresetsAddedWithWizardPresets)
{
// Given
PresetData data;
// When
data.setData(
/*wizard presets*/
{
aCategory("A.categ", "A", {"Desktop", "item b"}),
aCategory("B.categ", "B", {"Mobile"}),
},
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
/*user presets*/
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{
aUserPreset("A.categ", "Desktop", "Windows10"),
},
{/*recents*/});
// Then
ASSERT_THAT(data.categories(), ElementsAre("A", "B", "Custom"));
ASSERT_THAT(data.presets(),
ElementsAre(ElementsAre(PresetIs("A.categ", "Desktop"),
PresetIs("A.categ", "item b")),
ElementsAre(PresetIs("B.categ", "Mobile")),
ElementsAre(UserPresetIs("A.categ", "Desktop", "Windows10"))));
}
TEST(QdsPresetModel, doesNotAddUserPresetsOfNonExistingCategory)
{
// Given
PresetData data;
// When
data.setData(
/*wizard presets*/
{
aCategory("A.categ", "A", {"Desktop"}), // Only category "A.categ" exists
},
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
/*user presets*/
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{
aUserPreset("Bad.Categ", "Desktop", "Windows8"), // Bad.Categ does not exist
},
{/*recents*/});
// Then
ASSERT_THAT(data.categories(), ElementsAre("A"));
ASSERT_THAT(data.presets(), ElementsAre(ElementsAre(PresetIs("A.categ", "Desktop"))));
}
TEST(QdsPresetModel, doesNotAddUserPresetIfWizardPresetItRefersToDoesNotExist)
{
// Given
PresetData data;
// When
data.setData(
/*wizard presets*/
{
aCategory("A.categ", "A", {"Desktop"}),
},
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
/*user presets*/
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{
aUserPreset("B.categ", "BadWizard", "Tablet"), // BadWizard referenced does not exist
},
{/*recents*/});
// Then
ASSERT_THAT(data.categories(), ElementsAre("A"));
ASSERT_THAT(data.presets(), ElementsAre(ElementsAre(PresetIs("A.categ", "Desktop"))));
}
TEST(QdsPresetModel, userPresetWithSameNameAsWizardPreset)
{
// Given
PresetData data;
// When
data.setData(
/*wizard presets*/
{
aCategory("A.categ", "A", {"Desktop"}),
},
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
/*user presets*/
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{
aUserPreset("A.categ", "Desktop", "Desktop"),
},
{/*recents*/});
// Then
ASSERT_THAT(data.categories(), ElementsAre("A", "Custom"));
ASSERT_THAT(data.presets(),
ElementsAre(ElementsAre(PresetIs("A.categ", "Desktop")),
ElementsAre(UserPresetIs("A.categ", "Desktop", "Desktop"))));
}
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
TEST(QdsPresetModel, recentOfNonExistentWizardPreset)
Fix: Recents don't show up for Custom presets In the New Project dialog for QDS, if the user had created a project from a User-defined (i.e. Custom) preset, this preset did not appear under the Recents tab. Task-number: QDS-4989 Change-Id: Ib1f5e772fc9a45ad727627152f292f6e1178ee8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-08 15:09:49 +02:00
{
// Given
PresetData data;
// When
data.setData(
/*wizard presets*/
{
aCategory("A.categ", "A", {"Desktop"}),
},
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
{/*user presets*/},
Fix: Recents don't show up for Custom presets In the New Project dialog for QDS, if the user had created a project from a User-defined (i.e. Custom) preset, this preset did not appear under the Recents tab. Task-number: QDS-4989 Change-Id: Ib1f5e772fc9a45ad727627152f292f6e1178ee8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-08 15:09:49 +02:00
/*recents*/
{
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
aRecentPreset("A.categ", "Windows 7", "200 x 300")
Fix: Recents don't show up for Custom presets In the New Project dialog for QDS, if the user had created a project from a User-defined (i.e. Custom) preset, this preset did not appear under the Recents tab. Task-number: QDS-4989 Change-Id: Ib1f5e772fc9a45ad727627152f292f6e1178ee8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-08 15:09:49 +02:00
});
// Then
ASSERT_THAT(data.categories(), ElementsAre("A"));
ASSERT_THAT(data.presets(), ElementsAre(ElementsAre(PresetIs("A.categ", "Desktop"))));
}
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
TEST(QdsPresetModel, recentsShouldNotBeSorted)
Fix: Recents don't show up for Custom presets In the New Project dialog for QDS, if the user had created a project from a User-defined (i.e. Custom) preset, this preset did not appear under the Recents tab. Task-number: QDS-4989 Change-Id: Ib1f5e772fc9a45ad727627152f292f6e1178ee8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-08 15:09:49 +02:00
{
// Given
PresetData data;
// When
data.setData(
/*wizard presets*/
{
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
aCategory("A.categ", "A", {"Desktop", "item b"}),
aCategory("B.categ", "B", {"item c", "Mobile"}),
aCategory("Z.categ", "Z", {"Z.desktop"}),
Fix: Recents don't show up for Custom presets In the New Project dialog for QDS, if the user had created a project from a User-defined (i.e. Custom) preset, this preset did not appear under the Recents tab. Task-number: QDS-4989 Change-Id: Ib1f5e772fc9a45ad727627152f292f6e1178ee8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-08 15:09:49 +02:00
},
{/*user presets*/},
/*recents*/
{
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
aRecentPreset("Z.categ", "Z.desktop", "200 x 300"),
aRecentPreset("B.categ", "Mobile", "200 x 300"),
aRecentPreset("A.categ", "Desktop", "200 x 300"),
Fix: Recents don't show up for Custom presets In the New Project dialog for QDS, if the user had created a project from a User-defined (i.e. Custom) preset, this preset did not appear under the Recents tab. Task-number: QDS-4989 Change-Id: Ib1f5e772fc9a45ad727627152f292f6e1178ee8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-08 15:09:49 +02:00
});
// Then
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
ASSERT_THAT(data.presets()[0],
ElementsAre(PresetIs("Z.categ", "Z.desktop"),
PresetIs("B.categ", "Mobile"),
PresetIs("A.categ", "Desktop")));
Fix: Recents don't show up for Custom presets In the New Project dialog for QDS, if the user had created a project from a User-defined (i.e. Custom) preset, this preset did not appear under the Recents tab. Task-number: QDS-4989 Change-Id: Ib1f5e772fc9a45ad727627152f292f6e1178ee8c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-08 15:09:49 +02:00
}
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
TEST(QdsPresetModel, recentsOfSameWizardProjectButDifferentSizesAreRecognizedAsDifferentPresets)
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
{
// Given
PresetData data;
// When
data.setData(
/*wizard presets*/
{
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
aCategory("A.categ", "A", {"Desktop"}),
aCategory("B.categ", "B", {"Mobile"}),
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
},
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{/*user presets*/},
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
/*recents*/
{
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
aRecentPreset("B.categ", "Mobile", "400 x 400"),
aRecentPreset("B.categ", "Mobile", "200 x 300"),
aRecentPreset("A.categ", "Desktop", "640 x 480"),
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
});
// Then
ASSERT_THAT(data.presets()[0],
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
ElementsAre(PresetIs("B.categ", "Mobile", "400 x 400"),
PresetIs("B.categ", "Mobile", "200 x 300"),
PresetIs("A.categ", "Desktop", "640 x 480")));
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
}
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
TEST(QdsPresetModel, allowRecentsWithTheSameName)
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
{
// Given
PresetData data;
// When
data.setData(
/*wizard presets*/
{
aCategory("A.categ", "A", {"Desktop"}),
},
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{/*user presets*/},
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
/*recents*/
{
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
/* NOTE: it is assumed recents with the same name and size have other fields that
* distinguishes them from one another. It is the responsibility of the caller, who
* calls data.setData() to make sure that the recents do not contain duplicates. */
aRecentPreset("A.categ", "Desktop", "200 x 300"),
aRecentPreset("A.categ", "Desktop", "200 x 300"),
aRecentPreset("A.categ", "Desktop", "200 x 300"),
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
});
// Then
ASSERT_THAT(data.presets()[0],
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
ElementsAre(PresetIs("A.categ", "Desktop"),
PresetIs("A.categ", "Desktop"),
PresetIs("A.categ", "Desktop")));
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
}
TEST(QdsPresetModel, outdatedRecentsAreNotShown)
{
// Given
PresetData data;
// When
data.setData(
/*wizard presets*/
{
aCategory("A.categ", "A", {"Desktop"}),
aCategory("B.categ", "B", {"Mobile"}),
},
Implement custom presets Task-number: QDS-4989 Change-Id: I95844ae97204ad3bb94905c89f8e16b79eed8f64 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-02-23 15:32:34 +02:00
{/*user presets*/},
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
/*recents*/
{
QDS New Project Dialog fix: recents should include all project properties Previously, only the wizard category, name, and size were saved for recent presets. Solved the problem by using the same kind of store (and struct type) for Recent presets as for User/Custom presets - this way we can save all properties. Other changes introduced: * After user creates custom preset C, then creates a project from it (resulting in the creation of a Recent preset R), if the user then deletes custom preset C, then the recent preset R will remain - previously, all recents of the custom preset were deleted * Now we can have multiple recent presets with the same name and size - so, no distinguishing feature inside the Presets view. User will have to look at Details and Styles panes to view differences. * Replaced .ini format with *.json file format. Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-21 23:18:59 +02:00
aRecentPreset("B.categ", "NoLongerExists", "400 x 400"),
aRecentPreset("A.categ", "Desktop", "640 x 480"),
QDS-5691 Create a tab for Recent choices The Recents should store presets, rather than normal project items, while the rest of tabs are to store normal project (i.e. wizard) items but with the default screen size written under the wizard name. In this patch I also did a few renames: e.g. the Presets view now uses a PresetModel rather than ProjectModel, because we now store presets. A Preset is a higher level concept than Project / Wizard item: it can be a project/wizard item with pre-defined configurations; and now we can have multiple presets using the same Wizard factory. Renamed struct ProjectCategory to WizardCategory, because the items are grouped by the category of the wizard (i.e. the "category" property of IWizardFactory) I extracted a class, PresetData, to hold the data that is being shared by the PresetModel (items in the view) and the PresetCategoryModel (header/tab items). It stored both information on normal presets and on recent presets. Made changes to JsonWizardFactory so that I could extract the list of screen sizes without requiring to build a wizard object first. This is important, because multiple JsonWizard objects cannot be created at the same time and I need to show the screen sizes of multiple presets / wizards as the Presets view is opened. This also required class WizardFactories to use JsonWizardFactory instead of Core::IWizardFactory -- since "screen sizes" are a particularity of the json wizards, not of all kinds of wizards. Also, fixed a TODO in WizardHandler::reset() method. Also, added a few utilities I had need of, in algorithm.h. Change-Id: Ifd986e2def19b2e112f0aa1ab3db63d522736321 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-10 15:48:29 +02:00
});
// Then
ASSERT_THAT(data.presets()[0], ElementsAre(PresetIs("A.categ", "Desktop", "640 x 480")));
}
Copy Permalink