separate mkCal Option from Lomiri

8 files changed, 17 insertions, 17 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4aaee45..f6d5089 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -77,7 +77,7 @@ target_link_libraries (${TEST_NAME} indicatordatetimeservice ${SERVICE_DEPS_LIBR
 
 find_program(DBUS_RUNNER dbus-test-runner)
 
-if (ENABLE_LOMIRI_FEATURES)
+if (ENABLE_MKCAL)
     function(add_eds_ics_test_by_name name)
         set (TEST_NAME ${name})
         set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME} PARENT_SCOPE)
diff --git a/tests/test-eds-ics-all-day-events.cpp b/tests/test-eds-ics-all-day-events.cpp
index e38c7c7..069b4d8 100644
--- a/tests/test-eds-ics-all-day-events.cpp
+++ b/tests/test-eds-ics-all-day-events.cpp
@@ -80,7 +80,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
 
     // what we expect to get...
     Appointment expected_appt;
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     expected_appt.uid = "20150521T111538Z-7449-1000-3572-0@ghidorah";
 #else
     expected_appt.uid = "51340540-a924-468e-b3ee-0c0f222cd0f8";
@@ -102,7 +102,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     EXPECT_PRED3([](auto sColourIn, auto sColourExpected1, auto sColourExpected2)
     {
         return sColourIn == sColourExpected1 || sColourIn == sColourExpected2;
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     }, appt.color, "#becedd", "#62a0ea");
 #else
     }, appt.color, "#0000FF", "");
diff --git a/tests/test-eds-ics-missing-trigger.cpp b/tests/test-eds-ics-missing-trigger.cpp
index 69ca109..a006c9a 100644
--- a/tests/test-eds-ics-missing-trigger.cpp
+++ b/tests/test-eds-ics-missing-trigger.cpp
@@ -82,7 +82,7 @@ TEST_F(VAlarmFixture, MissingTriggers)
     std::vector<Appointment> expected1;
     Appointment a1;
     a1.type = Appointment::ALARM;
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     a1.uid = "20150617T211838Z-6217-32011-2036-1@lomiri-phablet";
     a1.color = "#becedd";
 #else
@@ -99,7 +99,7 @@ TEST_F(VAlarmFixture, MissingTriggers)
     expected1.push_back(a1);
 
     // build expected: recurring alarm 1
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     a1.uid = "20150617T211913Z-6217-32011-2036-5@lomiri-phablet";
 #else
     a1.uid = "3b45cbc9-d5c3-49a4-ad29-acc776818259";
@@ -130,7 +130,7 @@ TEST_F(VAlarmFixture, MissingTriggers)
     std::vector<Appointment> expected2;
     Appointment a2;
     a2.type = Appointment::ALARM;
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     a2.uid = "20150617T211838Z-6217-32011-2036-1@lomiri-phablet";
     a2.color = "#62a0ea";
 #else
@@ -147,7 +147,7 @@ TEST_F(VAlarmFixture, MissingTriggers)
     expected2.push_back(a2);
 
     // build expected: recurring alarm 2
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     a2.uid = "20150617T211913Z-6217-32011-2036-5@lomiri-phablet";
 #else
     a2.uid = "3b45cbc9-d5c3-49a4-ad29-acc776818259";
diff --git a/tests/test-eds-ics-nonrepeating-events.cpp b/tests/test-eds-ics-nonrepeating-events.cpp
index c126dba..6e9c0f1 100644
--- a/tests/test-eds-ics-nonrepeating-events.cpp
+++ b/tests/test-eds-ics-nonrepeating-events.cpp
@@ -80,7 +80,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
 
     // what we expect to get...
     Appointment expected_appt;
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     expected_appt.uid = "20150520T000726Z-3878-32011-1770-81@lomiri-phablet";
 #else
     expected_appt.uid = "d7aeb192-8b2c-4427-834f-f30388e9e73c";
@@ -103,7 +103,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
         EXPECT_PRED3([](auto sColourIn, auto sColourExpected1, auto sColourExpected2)
         {
             return sColourIn == sColourExpected1 || sColourIn == sColourExpected2;
-    #ifndef LOMIRI_FEATURES_ENABLED
+    #ifndef HAS_MKCAL
         }, appt.color, "#becedd", "#62a0ea");
     #else
         }, appt.color, "#0000FF", "");
diff --git a/tests/test-eds-ics-repeating-events.cpp b/tests/test-eds-ics-repeating-events.cpp
index 701f8da..8ab200e 100644
--- a/tests/test-eds-ics-repeating-events.cpp
+++ b/tests/test-eds-ics-repeating-events.cpp
@@ -80,7 +80,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
 
     // what we expect to get...
     Appointment expected_appt;
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     expected_appt.uid = "20150507T211449Z-4262-32011-1418-1@lomiri-phablet";
 #else
     expected_appt.uid = "840ab899-1b0e-4697-9514-dcd336a5e125";
@@ -110,7 +110,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
         EXPECT_PRED3([](auto sColourIn, auto sColourExpected1, auto sColourExpected2)
         {
             return sColourIn == sColourExpected1 || sColourIn == sColourExpected2;
-    #ifndef LOMIRI_FEATURES_ENABLED
+    #ifndef HAS_MKCAL
         }, appt.color, "#becedd", "#62a0ea");
     #else
         }, appt.color, "#0000FF", "");
diff --git a/tests/test-eds-ics-tzids-2.cpp b/tests/test-eds-ics-tzids-2.cpp
index aff9de7..3654e83 100644
--- a/tests/test-eds-ics-tzids-2.cpp
+++ b/tests/test-eds-ics-tzids-2.cpp
@@ -81,7 +81,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     // what we expect to get...
     std::array<Appointment,1> expected_appts1;
     auto appt1 = &expected_appts1[0];
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     appt1->uid = "109264742";
     appt1->color = "#becedd";
 #else
@@ -95,7 +95,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
 
     std::array<Appointment,1> expected_appts2;
     auto appt2 = &expected_appts2[0];
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     appt2->uid = "109264742";
     appt2->color = "#62a0ea";
 #else
diff --git a/tests/test-eds-ics-tzids-utc.cpp b/tests/test-eds-ics-tzids-utc.cpp
index 8226061..5c85b1c 100644
--- a/tests/test-eds-ics-tzids-utc.cpp
+++ b/tests/test-eds-ics-tzids-utc.cpp
@@ -82,7 +82,7 @@ TEST_F(VAlarmFixture, UTCAppointments)
     // what we expect to get...
     std::array<Appointment,1> expected_appts1;
     auto appt1 = &expected_appts1[0];
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     appt1->uid = "20160322T132738Z";
     appt1->color = "#becedd";
 #else
@@ -95,7 +95,7 @@ TEST_F(VAlarmFixture, UTCAppointments)
 
     std::array<Appointment,1> expected_appts2;
     auto appt2 = &expected_appts2[0];
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     appt2->uid = "20160322T132738Z";
     appt2->color = "#62a0ea";
 #else
diff --git a/tests/test-eds-ics-tzids.cpp b/tests/test-eds-ics-tzids.cpp
index e676001..1fa6d08 100644
--- a/tests/test-eds-ics-tzids.cpp
+++ b/tests/test-eds-ics-tzids.cpp
@@ -81,7 +81,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
     // what we expect to get...
     std::array<Appointment,1> expected_appts1;
     auto appt1 = &expected_appts1[0];
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     appt1->uid = "8ggc30kh89qql8vjumgtug7l14@google.com";
     appt1->color = "#becedd";
 #else
@@ -94,7 +94,7 @@ TEST_F(VAlarmFixture, MultipleAppointments)
 
     std::array<Appointment,1> expected_appts2;
     auto appt2 = &expected_appts2[0];
-#ifndef LOMIRI_FEATURES_ENABLED
+#ifndef HAS_MKCAL
     appt2->uid = "8ggc30kh89qql8vjumgtug7l14@google.com";
     appt2->color = "#62a0ea";
 #else