aboutsummaryrefslogtreecommitdiff
path: root/tests/client
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-11-07 08:43:20 -0300
committerRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-11-07 08:43:20 -0300
commitcba9178ec3d1956798e730585f89ecc363040085 (patch)
treede852b79ccd5d597d9986b304ad1c79900ffce52 /tests/client
parent79c1256b0994ad9673989a288363c88a66cb7766 (diff)
parent28245a5932f86b2bbab3304148bca33b8eaa207c (diff)
downloadqmenumodel-cba9178ec3d1956798e730585f89ecc363040085.tar.gz
qmenumodel-cba9178ec3d1956798e730585f89ecc363040085.tar.bz2
qmenumodel-cba9178ec3d1956798e730585f89ecc363040085.zip
Merged mainline.
Diffstat (limited to 'tests/client')
-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()