aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2018-03-26 15:55:46 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-03-26 21:02:35 +0000
commitb72e44163e22433fd3f0cab38d126fde4545ab8f (patch)
treeae2a97662dcf7cdab233debb30a80a81706ca72b
parent222c9e453f8b423fece2012cad87c1ce36470c46 (diff)
downloadayatana-indicator-datetime-b72e44163e22433fd3f0cab38d126fde4545ab8f.tar.gz
ayatana-indicator-datetime-b72e44163e22433fd3f0cab38d126fde4545ab8f.tar.bz2
ayatana-indicator-datetime-b72e44163e22433fd3f0cab38d126fde4545ab8f.zip
use cmake's configure_file() to generate the test .ics files from .ics.in so that we don't have to hardcode the filenames in the test data files either
-rw-r--r--tests/CMakeLists.txt4
-rw-r--r--tests/test-eds-ics-all-day-events.ics.in (renamed from tests/test-eds-ics-all-day-events.ics)0
-rw-r--r--tests/test-eds-ics-missing-trigger.ics.in (renamed from tests/test-eds-ics-missing-trigger.ics)4
-rw-r--r--tests/test-eds-ics-nonrepeating-events.ics.in (renamed from tests/test-eds-ics-nonrepeating-events.ics)2
-rw-r--r--tests/test-eds-ics-repeating-events.ics.in (renamed from tests/test-eds-ics-repeating-events.ics)2
-rw-r--r--tests/test-eds-ics-repeating-valarms.ics.in (renamed from tests/test-eds-ics-repeating-valarms.ics)0
-rw-r--r--tests/test-eds-ics-tzids-2.ics.in (renamed from tests/test-eds-ics-tzids-2.ics)0
-rw-r--r--tests/test-eds-ics-tzids.ics.in (renamed from tests/test-eds-ics-tzids.ics)0
8 files changed, 7 insertions, 5 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1901f9f..cce094c 100644
--- 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 b/tests/test-eds-ics-all-day-events.ics.in
index 0cf7dab..0cf7dab 100644
--- a/tests/test-eds-ics-all-day-events.ics
+++ b/tests/test-eds-ics-all-day-events.ics.in
diff --git a/tests/test-eds-ics-missing-trigger.ics b/tests/test-eds-ics-missing-trigger.ics.in
index 915e0de..6e10568 100644
--- a/tests/test-eds-ics-missing-trigger.ics
+++ b/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 b/tests/test-eds-ics-nonrepeating-events.ics.in
index 65473f2..89c74ac 100644
--- a/tests/test-eds-ics-nonrepeating-events.ics
+++ b/tests/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 b/tests/test-eds-ics-repeating-events.ics.in
index 1ab23bf..23ebf31 100644
--- a/tests/test-eds-ics-repeating-events.ics
+++ b/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 b/tests/test-eds-ics-repeating-valarms.ics.in
index fe526f4..fe526f4 100644
--- a/tests/test-eds-ics-repeating-valarms.ics
+++ b/tests/test-eds-ics-repeating-valarms.ics.in
diff --git a/tests/test-eds-ics-tzids-2.ics b/tests/test-eds-ics-tzids-2.ics.in
index f82334c..f82334c 100644
--- a/tests/test-eds-ics-tzids-2.ics
+++ b/tests/test-eds-ics-tzids-2.ics.in
diff --git a/tests/test-eds-ics-tzids.ics b/tests/test-eds-ics-tzids.ics.in
index 708bda7..708bda7 100644
--- a/tests/test-eds-ics-tzids.ics
+++ b/tests/test-eds-ics-tzids.ics.in