~townsend/unity/fix-lp1301394-trusty

Committer: Marco Trevisan (Treviño)
Date: 2012-09-18 15:47:49 UTC
mto: This revision was merged to the branch mainline in revision 2713.
Revision ID: mail@3v1n0.net-20120918154749-24znz8xth0y4aptz

Tests: move the .desktop applications in a data dir so that it's more XDG compliant

Fix the TestDesktopUtilities tests so that it won't depend on system changes

files added:
tests/data/applications

files renamed:
tests/data/bzr-handle-patch.desktop => tests/data/applications/bzr-handle-patch.desktop

tests/data/no-icon.desktop => tests/data/applications/no-icon.desktop

tests/data/ubuntu-software-center.desktop => tests/data/applications/ubuntu-software-center.desktop

tests/data/ubuntuone-installer.desktop => tests/data/applications/ubuntuone-installer.desktop

tests/data/update-manager.desktop => tests/data/applications/update-manager.desktop

files modified:
tests/CMakeLists.txt

tests/test_bamf_launcher_icon.cpp

tests/test_desktop_utilities.cpp

tests/test_favorite_store.cpp

tests/test_favorite_store_gsettings.cpp

tests/test_launcher_controller.cpp

tests/test_software_center_launcher_icon.cpp

Show diffs side-by-side

added added

removed removed

tests/CMakeLists.txt

# Data

configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/ubuntuone-installer.desktop

${CMAKE_BINARY_DIR}/tests/data/ubuntuone-installer.desktop)

configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/ubuntu-software-center.desktop

${CMAKE_BINARY_DIR}/tests/data/ubuntu-software-center.desktop)

configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/update-manager.desktop

${CMAKE_BINARY_DIR}/tests/data/update-manager.desktop)

configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/bzr-handle-patch.desktop

${CMAKE_BINARY_DIR}/tests/data/bzr-handle-patch.desktop)

configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/no-icon.desktop

${CMAKE_BINARY_DIR}/tests/data/no-icon.desktop)

configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/applications/ubuntuone-installer.desktop

${CMAKE_BINARY_DIR}/tests/data/applications/ubuntuone-installer.desktop)

configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/applications/ubuntu-software-center.desktop

${CMAKE_BINARY_DIR}/tests/data/applications/ubuntu-software-center.desktop)

configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/applications/update-manager.desktop

${CMAKE_BINARY_DIR}/tests/data/applications/update-manager.desktop)

configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/applications/bzr-handle-patch.desktop

${CMAKE_BINARY_DIR}/tests/data/applications/bzr-handle-patch.desktop)

configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/applications/no-icon.desktop

${CMAKE_BINARY_DIR}/tests/data/applications/no-icon.desktop)

# Unit tests

Older »