diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | tests/client/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/client/actiongrouptest.cpp | 2 | ||||
| -rw-r--r-- | tests/client/menuchangestest.cpp | 2 | ||||
| -rw-r--r-- | tests/client/modeltest.cpp | 2 | ||||
| -rw-r--r-- | tests/client/qmltest.cpp | 3 | ||||
| -rw-r--r-- | tests/client/servicetest.cpp | 2 |
10 files changed, 27 insertions, 14 deletions
@@ -22,6 +22,7 @@ tests/client/modeltest tests/client/qmlfiles.h tests/client/qmltest tests/client/servicetest +tests/client/test_*.xml tests/script/__pycache__/ doc/html/ diff --git a/CMakeLists.txt b/CMakeLists.txt index eb25369..7f60630 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,16 +16,16 @@ add_definitions(-DQT_NO_KEYWORDS) find_program(DBUS_RUNNER dbus-test-runner) # Cooverage tools -OPTION(BUILD_WITH_COVERAGE "Build with coverage analysis support" OFF) -if(BUILD_WITH_COVERAGE) +OPTION(ENABLE_COVERAGE "Build with coverage analysis support" OFF) +if(ENABLE_COVERAGE) message(STATUS "Using coverage flags") find_program(COVERAGE_COMMAND gcov) if(NOT COVERAGE_COMMAND) message(FATAL_ERROR "gcov command not found") endif() - SET(CMAKE_C_FLAGS "-g -O0 -Wall -fprofile-arcs -ftest-coverage") - SET(CMAKE_CXX_FLAGS "-g -O0 -Wall -fprofile-arcs -ftest-coverage") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -lgcov") + SET(CMAKE_C_FLAGS "-g -O0 -Wall --coverage") + SET(CMAKE_CXX_FLAGS "-g -O0 -Wall --coverage") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") include(${CMAKE_SOURCE_DIR}/cmake/lcov.cmake) endif() @@ -26,10 +26,10 @@ installed, install it and then re-run cmake. Then run either of these commands: = Getting code coverage information = To run the unit tests and generate code coverage information, you need to re-run -cmake with BUILD_WITH_COVERAGE set to ON and then invoke `make lcov`. +cmake with ENABLE_COVERAGE set to ON and then invoke `make lcov`. This requires lcov to be installed. - $ cmake -DBUILD_WITH_COVERAGE=ON . + $ cmake -DENABLE_COVERAGE=ON . $ make lcov This will generate a report (coverage/index.html) which you can view in a diff --git a/debian/changelog b/debian/changelog index 0261fef..60de143 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +qmenumodel (0.1.6) quantal; urgency=low + + [ Renato Araujo Oliveira Filho ] + * Changed the 'g_bus_watch_name' flag to auto start the service. + * Replaced gchar ⇄ QString conversion function, from Latin1 to Utf8. + * Use the correct function "g_action_group_change_action_state" to change the + action state. + + [ Olivier Tilloy ] + * Migrate all the scripts to python3. + + -- Olivier Tilloy <olivier.tilloy@canonical.com> Wed, 31 Oct 2012 18:19:15 +0100 + qmenumodel (0.1.5) quantal; urgency=low [ Renato Araujo Oliveira Filho] 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() |