summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-02-19 17:10:22 +0100
committerKai Koehne <kai.koehne@digia.com>2013-02-20 09:22:16 +0100
commit5d9b4fe6360e261b40e54e1acbba55a921414e22 (patch)
tree76a34a9429d15c7675a273cc47b6dfc5432101d7
parent15a93cb54b7c26f2ec2a62cdf547824193433550 (diff)
Hide warnings in settings autotest
Change-Id: I087003da9da37be2379bf07f8494612167c8dba3 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
-rw-r--r--src/libs/installer/errors.h2
-rw-r--r--tests/auto/installer/settings/tst_settings.cpp9
2 files changed, 10 insertions, 1 deletions
diff --git a/src/libs/installer/errors.h b/src/libs/installer/errors.h
index 852370c5a..b53b112d1 100644
--- a/src/libs/installer/errors.h
+++ b/src/libs/installer/errors.h
@@ -54,7 +54,7 @@ class Error : public std::runtime_error
public:
explicit Error(const QString &message)
: std::runtime_error(message.toStdString())
- , m_message (message) { qDebug() << "Error-Exception:" << message; }
+ , m_message (message) { qWarning() << "Error-Exception:" << message; }
virtual ~Error() throw() {}
QString message() const { return m_message; }
diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp
index ac092554c..4029ace67 100644
--- a/tests/auto/installer/settings/tst_settings.cpp
+++ b/tests/auto/installer/settings/tst_settings.cpp
@@ -78,6 +78,8 @@ void tst_Settings::loadFullConfig()
void tst_Settings::loadEmptyConfig()
{
+ QTest::ignoreMessage(QtWarningMsg, "Error-Exception: \"Missing or empty <Name> tag in "
+ ":/data/empty_config.xml.\" ");
try {
Settings::fromFileAndPrefix(":/data/empty_config.xml", ":/data");
} catch (const Error &error) {
@@ -89,6 +91,9 @@ void tst_Settings::loadEmptyConfig()
void tst_Settings::loadNotExistingConfig()
{
+ QTest::ignoreMessage(QtWarningMsg, "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) {
@@ -102,6 +107,8 @@ void tst_Settings::loadNotExistingConfig()
void tst_Settings::loadMalformedConfig()
{
+ QTest::ignoreMessage(QtWarningMsg, "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) {
@@ -114,6 +121,8 @@ void tst_Settings::loadMalformedConfig()
void tst_Settings::loadUnknownElementConfig()
{
+ QTest::ignoreMessage(QtWarningMsg, "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) {