use cmake's configure_file() to generate the test .ics files from .ic…

…s.in so that we don't have to hardcode the filenames in the test data files either
ubports · Mar 26, 2018 · b72e441 · b72e441
1 parent 222c9e4
commit b72e441
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 5 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -78,6 +78,8 @@ find_program(DBUS_RUNNER dbus-test-runner)
 
 function(add_eds_ics_test_by_name name)
   set (TEST_NAME ${name})
+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.ics.in"
+                 "${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}.ics")
   add_executable(${TEST_NAME} ${TEST_NAME}.cpp gschemas.compiled)
   target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS})
   add_test (${TEST_NAME}
@@ -86,7 +88,7 @@ function(add_eds_ics_test_by_name name)
             ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}               # arg2: test executable path
             ${TEST_NAME}                                           # arg3: test name
             ${CMAKE_CURRENT_SOURCE_DIR}/test-eds-ics-config-files  # arg4: base directory for config file template
-            ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.ics)          # arg5: the ical file for this test
+            ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}.ics)          # arg5: the ical file for this test
 endfunction()
 add_eds_ics_test_by_name(test-eds-ics-all-day-events)
 add_eds_ics_test_by_name(test-eds-ics-repeating-events)

diff --git a/tests/test-eds-ics-all-day-events.ics → tests/test-eds-ics-all-day-events.ics.in b/tests/test-eds-ics-all-day-events.ics → tests/test-eds-ics-all-day-events.ics.in
diff --git a/tests/test-eds-ics-missing-trigger.ics → tests/test-eds-ics-missing-trigger.ics.in b/tests/test-eds-ics-missing-trigger.ics → tests/test-eds-ics-missing-trigger.ics.in
@@ -14,7 +14,7 @@ LAST-MODIFIED:20150617T211838Z
 BEGIN:VALARM
 X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-2@ubuntu-phablet
 ACTION:AUDIO
-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
+ATTACH:file://${ALARM_DEFAULT_SOUND}
 END:VALARM
 BEGIN:VALARM
 X-EVOLUTION-ALARM-UID:20150617T211838Z-6217-32011-2036-3@ubuntu-phablet
@@ -34,7 +34,7 @@ LAST-MODIFIED:20150617T211913Z
 BEGIN:VALARM
 X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-6@ubuntu-phablet
 ACTION:AUDIO
-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
+ATTACH:file://${ALARM_DEFAULT_SOUND}
 END:VALARM
 BEGIN:VALARM
 X-EVOLUTION-ALARM-UID:20150617T211913Z-6217-32011-2036-7@ubuntu-phablet

diff --git a/tests/test-eds-ics-nonrepeating-events.ics → ...s/test-eds-ics-nonrepeating-events.ics.in b/tests/test-eds-ics-nonrepeating-events.ics → ...s/test-eds-ics-nonrepeating-events.ics.in
@@ -14,7 +14,7 @@ LAST-MODIFIED:20150520T223932Z
 BEGIN:VALARM
 X-EVOLUTION-ALARM-UID:20150520T223932Z-22506-32011-1771-2@ubuntu-phablet
 ACTION:AUDIO
-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
+ATTACH:file://${ALARM_DEFAULT_SOUND}
 TRIGGER;VALUE=DURATION;RELATED=START:PT0S
 END:VALARM
 BEGIN:VALARM

diff --git a/tests/test-eds-ics-repeating-events.ics → tests/test-eds-ics-repeating-events.ics.in b/tests/test-eds-ics-repeating-events.ics → tests/test-eds-ics-repeating-events.ics.in
@@ -15,7 +15,7 @@ LAST-MODIFIED:20150507T211449Z
 BEGIN:VALARM
 X-EVOLUTION-ALARM-UID:20150507T211449Z-4262-32011-1418-2@ubuntu-phablet
 ACTION:AUDIO
-ATTACH:file:///usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg
+ATTACH:file://${ALARM_DEFAULT_SOUND}
 TRIGGER;VALUE=DURATION;RELATED=START:PT0S
 END:VALARM
 BEGIN:VALARM

diff --git a/tests/test-eds-ics-repeating-valarms.ics → tests/test-eds-ics-repeating-valarms.ics.in b/tests/test-eds-ics-repeating-valarms.ics → tests/test-eds-ics-repeating-valarms.ics.in
diff --git a/tests/test-eds-ics-tzids-2.ics → tests/test-eds-ics-tzids-2.ics.in b/tests/test-eds-ics-tzids-2.ics → tests/test-eds-ics-tzids-2.ics.in
diff --git a/tests/test-eds-ics-tzids.ics → tests/test-eds-ics-tzids.ics.in b/tests/test-eds-ics-tzids.ics → tests/test-eds-ics-tzids.ics.in