From eedf73fac0b2e9af0623ef7df7e142ab30ee45af Mon Sep 17 00:00:00 2001 From: kh1 Date: Tue, 26 Mar 2013 14:19:18 +0100 Subject: Cleanup. Change-Id: I36406e3e32b04f7817ce049f9fa37910070688ce Reviewed-by: Niels Weber --- tests/auto/installer/settings/tst_settings.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/auto/installer') diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index 947e772d3..dff789d2b 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -24,8 +24,7 @@ private slots: void tst_Settings::loadTutorialConfig() { - Settings settings = - Settings::fromFileAndPrefix(":///data/tutorial_config.xml", ":///data"); + Settings settings = Settings::fromFileAndPrefix(":///data/tutorial_config.xml", ":///data"); // specified values QCOMPARE(settings.applicationName(), QLatin1String("Your application")); @@ -74,8 +73,7 @@ void tst_Settings::loadTutorialConfig() void tst_Settings::loadFullConfig() { QTest::ignoreMessage(QtWarningMsg, "Deprecated element 'Pages'. "); - Settings settings = - Settings::fromFileAndPrefix(":///data/full_config.xml", ":///data"); + Settings settings = Settings::fromFileAndPrefix(":///data/full_config.xml", ":///data"); } void tst_Settings::loadEmptyConfig() @@ -123,8 +121,8 @@ void tst_Settings::loadMalformedConfig() void tst_Settings::loadUnknownElementConfigInStrictParseMode() { - QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Error in :/data/unknown_element_config.xml, line 5, " - "column 13: Unexpected element 'unknown'.\" "); + QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Error in :/data/unknown_element_config.xml, " + "line 5, column 13: Unexpected element 'unknown'.\" "); try { Settings::fromFileAndPrefix(":/data/unknown_element_config.xml", ":/data"); } catch (const Error &error) { @@ -144,7 +142,7 @@ void tst_Settings::loadUnknownElementConfigInRelaxedParseMode() Settings::RelaxedParseMode); QCOMPARE(settings.title(), QLatin1String("Your application Installer")); } catch (const Error &error) { - QFAIL(qPrintable(QString::fromLatin1("Got an exception in FaultTolerantParseMode: %1").arg(error.message()))); + QFAIL(qPrintable(QString::fromLatin1("Got an exception in TolerantParseMode: %1").arg(error.message()))); } } -- cgit v1.2.3