aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/client/CMakeLists.txt2
-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
6 files changed, 6 insertions, 7 deletions
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 725289e..d946fad 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -10,7 +10,7 @@ macro(declare_test testname)
add_test(${testname}
${DBUS_RUNNER}
- --task ${CMAKE_CURRENT_BINARY_DIR}/${testname} --task-name Client
+ --task ${CMAKE_CURRENT_BINARY_DIR}/${testname} -p -xunitxml -p -o -p test_${testname}.xml --task-name Client
--task ${CMAKE_CURRENT_SOURCE_DIR}/script_${testname}.py --task-name Server
--ignore-return)
set_tests_properties(${testname} PROPERTIES
diff --git a/tests/client/actiongrouptest.cpp b/tests/client/actiongrouptest.cpp
index 96d6916..6598d2e 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 ee7cf62..2e4ef6e 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 02ce8ca..c6b2f0e 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 2dfc356..1f1e494 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 262eacf..f61f5a1 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()