diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-09-05 11:14:31 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-09-05 14:18:31 +0200 |
| commit | 858d39554cc2709213d4b403637dd38e0e172a34 (patch) | |
| tree | 020574f2e5e1606b4af310de643d61891c940dc6 /tests | |
| parent | 4883046795fca3c26e19cbc7c0a884e922d128e7 (diff) | |
Set value for empty tags that should provide a default value.
Task-number: QTIFW-541
Change-Id: Ib899d87be75baaa96b3b15d8a94f660c1a6544e0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/installer/settings/data/minimal_config_tag_defaults.xml | 8 | ||||
| -rw-r--r-- | tests/auto/installer/settings/settings.qrc | 1 | ||||
| -rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 13 |
3 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/installer/settings/data/minimal_config_tag_defaults.xml b/tests/auto/installer/settings/data/minimal_config_tag_defaults.xml new file mode 100644 index 000000000..041ce5062 --- /dev/null +++ b/tests/auto/installer/settings/data/minimal_config_tag_defaults.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Installer> + <Name>Your application</Name> + <Version>1.2.3</Version> + <MaintenanceToolName></MaintenanceToolName> + <MaintenanceToolIniFile></MaintenanceToolIniFile> + <TargetConfigurationFile></TargetConfigurationFile> +</Installer> diff --git a/tests/auto/installer/settings/settings.qrc b/tests/auto/installer/settings/settings.qrc index de130ea10..2dbffd927 100644 --- a/tests/auto/installer/settings/settings.qrc +++ b/tests/auto/installer/settings/settings.qrc @@ -6,5 +6,6 @@ <file>data/minimal_config.xml</file> <file>data/tutorial_config.xml</file> <file>data/unknown_element_config.xml</file> + <file>data/minimal_config_tag_defaults.xml</file> </qresource> </RCC> diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index 438816bdc..6704471a2 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -20,6 +20,7 @@ private slots: void loadMalformedConfig(); void loadUnknownElementConfigInStrictParseMode(); void loadUnknownElementConfigInRelaxedParseMode(); + void loadMinimalConfigTagDefaults(); }; void tst_Settings::loadTutorialConfig() @@ -156,6 +157,18 @@ void tst_Settings::loadUnknownElementConfigInRelaxedParseMode() } } +void tst_Settings::loadMinimalConfigTagDefaults() +{ + Settings settings = Settings::fromFileAndPrefix(":///data/minimal_config_tag_defaults.xml", + ":///data"); + + // These tags are not mandatory, though need to be set to default values. + QCOMPARE(settings.configurationFileName(), QLatin1String("components.xml")); + + QCOMPARE(settings.maintenanceToolName(), QLatin1String("maintenancetool")); + QCOMPARE(settings.maintenanceToolIniFile(), QLatin1String("maintenancetool.ini")); +} + QTEST_MAIN(tst_Settings) #include "tst_settings.moc" |