aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-11-02 12:39:28 +0100
committerRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-11-02 12:39:28 +0100
commit59dfda627da51e5b275775a407f132276b45e638 (patch)
tree153065133c24f0e75b3aabe2d695ea57a484a977
parent2e6ccdba482da0d042ff3a6a4bee0807f533a3e3 (diff)
downloadqmenumodel-59dfda627da51e5b275775a407f132276b45e638.tar.gz
qmenumodel-59dfda627da51e5b275775a407f132276b45e638.tar.bz2
qmenumodel-59dfda627da51e5b275775a407f132276b45e638.zip
Fixed tests code to avoid crash if dbus session is not avaliable.
-rw-r--r--tests/client/actiongrouptest.cpp2
-rw-r--r--tests/client/menuchangestest.cpp2
-rw-r--r--tests/client/modeltest.cpp2
-rw-r--r--tests/client/qmltest.cpp3
-rw-r--r--tests/client/servicetest.cpp2
5 files changed, 5 insertions, 6 deletions
diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp
index 116bd44..5f1bf60 100644
--- a/tests/client/actiongrouptest.cpp
+++ b/tests/client/actiongrouptest.cpp
@@ -38,7 +38,7 @@ private:
private Q_SLOTS:
void initTestCase()
{
- Q_ASSERT(m_script.connect());
+ QVERIFY(m_script.connect());
}
void cleanupTestCase()
diff --git a/tests/client/menuchangestest.cpp b/tests/client/menuchangestest.cpp
index 2015582..6ef5879 100644
--- a/tests/client/menuchangestest.cpp
+++ b/tests/client/menuchangestest.cpp
@@ -35,7 +35,7 @@ private:
private Q_SLOTS:
void initTestCase()
{
- Q_ASSERT(m_script.connect());
+ QVERIFY(m_script.connect());
}
void cleanupTestCase()
diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp
index 93677db..2cb64b0 100644
--- a/tests/client/modeltest.cpp
+++ b/tests/client/modeltest.cpp
@@ -35,7 +35,7 @@ private:
private Q_SLOTS:
void initTestCase()
{
- Q_ASSERT(m_script.connect());
+ QVERIFY(m_script.connect());
}
void cleanupTestCase()
diff --git a/tests/client/qmltest.cpp b/tests/client/qmltest.cpp
index 4e6f288..ce77f6f 100644
--- a/tests/client/qmltest.cpp
+++ b/tests/client/qmltest.cpp
@@ -44,8 +44,7 @@ private:
private Q_SLOTS:
void initTestCase()
{
- g_type_init();
- Q_ASSERT(m_script.connect());
+ QVERIFY(m_script.connect());
}
void cleanupTestCase()
diff --git a/tests/client/servicetest.cpp b/tests/client/servicetest.cpp
index a8b0c2a..4d238c4 100644
--- a/tests/client/servicetest.cpp
+++ b/tests/client/servicetest.cpp
@@ -42,7 +42,7 @@ private:
private Q_SLOTS:
void initTestCase()
{
- Q_ASSERT(m_script.connect());
+ QVERIFY(m_script.connect());
}
void cleanupTestCase()