1 files changed, 7 insertions, 22 deletions

diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp
index 6deea6093..036decc20 100644
--- a/tests/auto/installer/settings/tst_settings.cpp
+++ b/tests/auto/installer/settings/tst_settings.cpp
@@ -73,6 +73,7 @@ void tst_Settings::loadTutorialConfig()
     QCOMPARE(settings.allowSpaceInPath(), true);
     QCOMPARE(settings.allowNonAsciiCharacters(), false);
     QCOMPARE(settings.createLocalRepository(), false);
+    QCOMPARE(settings.installActionColumnVisible(), false);
 
     QCOMPARE(settings.hasReplacementRepos(), false);
     QCOMPARE(settings.repositories(), QSet<Repository>());
@@ -95,8 +96,6 @@ void tst_Settings::loadFullConfig()
 
 void tst_Settings::loadEmptyConfig()
 {
-    QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Missing or empty <Name> tag in "
-                         ":/data/empty_config.xml.\" ");
     try {
         Settings::fromFileAndPrefix(":/data/empty_config.xml", ":/data");
     } catch (const Error &error) {
@@ -108,13 +107,10 @@ void tst_Settings::loadEmptyConfig()
 
 void tst_Settings::loadNotExistingConfig()
 {
-    QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Could not open settings file "
-                         ":/data/inexisting_config.xml for reading: "
-                         "Unknown error\" ");
     try {
         Settings::fromFileAndPrefix(":/data/inexisting_config.xml", ":/data");
     } catch (const Error &error) {
-        QCOMPARE(error.message(), QLatin1String("Could not open settings file "
+        QCOMPARE(error.message(), QLatin1String("Cannot open settings file "
                                                 ":/data/inexisting_config.xml for reading: "
                                                 "Unknown error"));
         return;
@@ -124,8 +120,6 @@ void tst_Settings::loadNotExistingConfig()
 
 void tst_Settings::loadMalformedConfig()
 {
-    QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Error in :/data/malformed_config.xml, "
-                         "line 9, column 0: Premature end of document.\" ");
     try {
         Settings::fromFileAndPrefix(":/data/malformed_config.xml", ":/data");
     } catch (const Error &error) {
@@ -138,13 +132,11 @@ 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'.\" ");
     try {
         Settings::fromFileAndPrefix(":/data/unknown_element_config.xml", ":/data");
     } catch (const Error &error) {
         QCOMPARE(error.message(), QLatin1String("Error in :/data/unknown_element_config.xml, line 5, "
-                                                "column 13: Unexpected element 'unknown'."));
+                                                "column 13: Unexpected element \"unknown\"."));
         return;
     }
     QFAIL("No exception thrown");
@@ -152,8 +144,8 @@ void tst_Settings::loadUnknownElementConfigInStrictParseMode()
 
 void tst_Settings::loadUnknownElementConfigInRelaxedParseMode()
 {
-    QTest::ignoreMessage(QtWarningMsg, "\"Ignoring following settings reader error in "
-        ":/data/unknown_element_config.xml, line 5, column 13: Unexpected element 'unknown'.\" ");
+    QTest::ignoreMessage(QtWarningMsg, "Ignoring following settings reader error in "
+        ":/data/unknown_element_config.xml, line 5, column 13: Unexpected element \"unknown\".");
     try {
         Settings settings = Settings::fromFileAndPrefix(":/data/unknown_element_config.xml", ":/data",
             Settings::RelaxedParseMode);
@@ -177,15 +169,11 @@ void tst_Settings::loadMinimalConfigTagDefaults()
 
 void tst_Settings::loadUnexpectedAttributeConfig()
 {
-    QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Error in "
-        ":///data/unexpectedattribute_config.xml, line 6, column 27: Unexpected attribute "
-        "for element 'Argument'.\" ");
-
     try {
         Settings::fromFileAndPrefix(":///data/unexpectedattribute_config.xml", ":///data");
     } catch (const Error &error) {
         QCOMPARE(error.message(), QLatin1String("Error in :///data/unexpectedattribute_config.xml,"
-           " line 6, column 27: Unexpected attribute for element 'Argument'."));
+           " line 6, column 27: Unexpected attribute for element \"Argument\"."));
         return;
     }
     QFAIL("No exception thrown");
@@ -195,14 +183,11 @@ void tst_Settings::loadUnexpectedAttributeConfig()
 
 void tst_Settings::loadUnexpectedTagConfig()
 {
-    QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Error in "
-        ":///data/unexpectedtag_config.xml, line 6, column 12: Unexpected element 'Foo'.\" ");
-
     try {
         Settings::fromFileAndPrefix(":///data/unexpectedtag_config.xml", ":///data");
     } catch (const Error &error) {
         QCOMPARE(error.message(), QLatin1String("Error in :///data/unexpectedtag_config.xml,"
-           " line 6, column 12: Unexpected element 'Foo'."));
+           " line 6, column 12: Unexpected element \"Foo\"."));
         return;
     }
     QFAIL("No exception thrown");