diff options
Diffstat (limited to 'tests')
5 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/installer/settings/data/length_units_invalid.xml b/tests/auto/installer/settings/data/length_units_invalid.xml index b1dc5aa62..7c5e99dd0 100644 --- a/tests/auto/installer/settings/data/length_units_invalid.xml +++ b/tests/auto/installer/settings/data/length_units_invalid.xml @@ -4,4 +4,6 @@ <Version>1.2.3</Version> <WizardDefaultWidth>800pt</WizardDefaultWidth> <WizardDefaultHeight>600pt</WizardDefaultHeight> + <WizardMinimumWidth>640pt</WizardMinimumWidth> + <WizardMinimumHeight>480pt</WizardMinimumHeight> </Installer> diff --git a/tests/auto/installer/settings/data/length_units_valid_em.xml b/tests/auto/installer/settings/data/length_units_valid_em.xml index af087fdfe..81eec5af7 100644 --- a/tests/auto/installer/settings/data/length_units_valid_em.xml +++ b/tests/auto/installer/settings/data/length_units_valid_em.xml @@ -4,4 +4,6 @@ <Version>1.2.3</Version> <WizardDefaultWidth>800em</WizardDefaultWidth> <WizardDefaultHeight>600em</WizardDefaultHeight> + <WizardMinimumWidth>640em</WizardMinimumWidth> + <WizardMinimumHeight>480em</WizardMinimumHeight> </Installer> diff --git a/tests/auto/installer/settings/data/length_units_valid_ex.xml b/tests/auto/installer/settings/data/length_units_valid_ex.xml index 3b39cf7a7..633a239ef 100644 --- a/tests/auto/installer/settings/data/length_units_valid_ex.xml +++ b/tests/auto/installer/settings/data/length_units_valid_ex.xml @@ -4,4 +4,6 @@ <Version>1.2.3</Version> <WizardDefaultWidth>800ex</WizardDefaultWidth> <WizardDefaultHeight>600ex</WizardDefaultHeight> + <WizardMinimumWidth>640ex</WizardMinimumWidth> + <WizardMinimumHeight>480ex</WizardMinimumHeight> </Installer> diff --git a/tests/auto/installer/settings/data/length_units_valid_px.xml b/tests/auto/installer/settings/data/length_units_valid_px.xml index 3553dd7d8..71518a71c 100644 --- a/tests/auto/installer/settings/data/length_units_valid_px.xml +++ b/tests/auto/installer/settings/data/length_units_valid_px.xml @@ -4,4 +4,6 @@ <Version>1.2.3</Version> <WizardDefaultWidth>800px</WizardDefaultWidth> <WizardDefaultHeight>600px</WizardDefaultHeight> + <WizardMinimumWidth>640px</WizardMinimumWidth> + <WizardMinimumHeight>480px</WizardMinimumHeight> </Installer> diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index 945f08e78..f8aa00528 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -90,6 +90,8 @@ void tst_Settings::loadTutorialConfig() QCOMPARE(settings.wizardStyle(), QString()); QCOMPARE(settings.wizardDefaultWidth(), settings.wizardShowPageList() ? 800 : 0); QCOMPARE(settings.wizardDefaultHeight(), 0); + QCOMPARE(settings.wizardMinimumWidth(), 0); + QCOMPARE(settings.wizardMinimumHeight(), 0); QCOMPARE(settings.wizardShowPageList(), true); QCOMPARE(settings.productImages(), QStringList()); QCOMPARE(settings.titleColor(), QString()); @@ -244,6 +246,8 @@ void tst_Settings::loadConfigWithValidLengthUnits() Settings settings = Settings::fromFileAndPrefix(":///data/length_units_valid_px.xml", ":///data"); QCOMPARE(settings.wizardDefaultWidth(), 800); QCOMPARE(settings.wizardDefaultHeight(), 600); + QCOMPARE(settings.wizardMinimumWidth(), 640); + QCOMPARE(settings.wizardMinimumHeight(), 480); // Cannot test the parsed values for these units portably since the // pixel value depends on the font metrics. Let's just check for parse @@ -261,6 +265,8 @@ void tst_Settings::loadConfigWithInvalidLengthUnits() Settings settings = Settings::fromFileAndPrefix(":///data/length_units_invalid.xml", ":///data"); QCOMPARE(settings.wizardDefaultWidth(), 0); QCOMPARE(settings.wizardDefaultHeight(), 0); + QCOMPARE(settings.wizardMinimumWidth(), 0); + QCOMPARE(settings.wizardMinimumHeight(), 0); } catch (const Error &error) { QFAIL(qPrintable(QString::fromLatin1("Exception caught: %1").arg(error.message()))); } |