Merge lp:~3v1n0/indicator-datetime/calendar-data-files into lp:indicator-datetime

[Marco Trevisan (Treviño)]

tests: add fake calendar desktop and icon files so that they can be used at testing time

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:488
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/26/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1937/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1944
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1724/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1724/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1724/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1724/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1724/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1724/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/26/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:489
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/27/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1938/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1945
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1725/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1725/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1725/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1725/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1725/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1725/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/27/rebuild

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/indicator-datetime/calendar-data-files]

488. By Marco Trevisan (Treviño) on 2017-08-16

tests: add fake calendar desktop and icon files so that they can be used for testing

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-02-10 16:15:07 +0000
+++ tests/CMakeLists.txt	2017-08-16 14:06:24 +0000
@@ -40,6 +40,7 @@
   set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
   add_executable (${TEST_NAME} ${TEST_NAME}.cpp gschemas.compiled)
   add_test (${TEST_NAME} ${TEST_NAME})
+  set_tests_properties(${TEST_NAME} PROPERTIES ENVIRONMENT "XDG_DATA_DIRS=${CMAKE_CURRENT_SOURCE_DIR}/data:/usr/share")
   target_link_libraries (${TEST_NAME} indicatordatetimeservice ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
 endfunction()
 add_test_by_name(test-datetime)
@@ -86,7 +87,8 @@
             ${TEST_NAME}                                           # arg3: test name
             ${CMAKE_CURRENT_SOURCE_DIR}/test-eds-ics-config-files  # arg4: base directory for config file template
             ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}.ics           # arg5: the ical file for this test
-            ${CMAKE_CURRENT_SOURCE_DIR}/accounts.db)               # arg6: online accounts database
+            ${CMAKE_CURRENT_SOURCE_DIR}/accounts.db                # arg6: online accounts database
+            ${CMAKE_CURRENT_SOURCE_DIR}/data)                      # arg7: data dir
 endfunction()
 add_eds_ics_test_by_name(test-eds-ics-all-day-events)
 add_eds_ics_test_by_name(test-eds-ics-repeating-events)

=== added directory 'tests/data'
=== added directory 'tests/data/applications'
=== added file 'tests/data/applications/org.gnome.Calendar.desktop'
--- tests/data/applications/org.gnome.Calendar.desktop	1970-01-01 00:00:00 +0000
+++ tests/data/applications/org.gnome.Calendar.desktop	2017-08-16 14:06:24 +0000
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=Calendar
+Comment=Access, and manage calendar
+Exec=/bin/true
+Icon=org.gnome.Calendar
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Office;Calendar;Core;
+Keywords=Calendar;Event;Reminder;
+MimeType=text/calendar;
+DBusActivatable=true
+X-Ubuntu-Gettext-Domain=gnome-calendar

=== added directory 'tests/data/icons'
=== added file 'tests/data/icons/org.gnome.Calendar.png'
Binary files tests/data/icons/org.gnome.Calendar.png	1970-01-01 00:00:00 +0000 and tests/data/icons/org.gnome.Calendar.png	2017-08-16 14:06:24 +0000 differ
=== modified file 'tests/run-eds-ics-test.sh'
--- tests/run-eds-ics-test.sh	2016-05-14 02:07:10 +0000
+++ tests/run-eds-ics-test.sh	2017-08-16 14:06:24 +0000
@@ -7,6 +7,7 @@
 CONFIG_DIR=$4  # config files
 ICS_FILE=$5    # ical file holding test data
 ACCOUNTS_DB=$6 # online account database
+DATA_DIR=$7    # data dir
 
 echo "this script: ${SELF}"
 echo "test-runner: ${TEST_RUNNER}"
@@ -34,6 +35,7 @@
 export XDG_PUBLICSHARE_DIR=${TEST_TMP_DIR}
 export XDG_TEMPLATES_DIR=${TEST_TMP_DIR}
 export XDG_VIDEOS_DIR=${TEST_TMP_DIR}
+export XDG_DATA_DIRS=$(dirname ${TEST_EXEC}):${DATA_DIR}:/usr/share
 export QORGANIZER_EDS_DEBUG=On
 export GIO_USE_VFS=local # needed to ensure GVFS shuts down cleanly after the test is over