aboutsummaryrefslogtreecommitdiff
path: root/include/datetime
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-07-16 21:52:08 +0200
committerRobert Tari <robert@tari.in>2021-07-21 02:02:47 +0200
commit217b48352a2591150413c77ca85b6a1ef158e6d5 (patch)
treed511ab0cc1854de03f09f915f57c6e7d518810dd /include/datetime
parent7b495005c1998aaf148c17ceb4f5576835d87ba2 (diff)
downloadayatana-indicator-datetime-217b48352a2591150413c77ca85b6a1ef158e6d5.tar.gz
ayatana-indicator-datetime-217b48352a2591150413c77ca85b6a1ef158e6d5.tar.bz2
ayatana-indicator-datetime-217b48352a2591150413c77ca85b6a1ef158e6d5.zip
Fix failing tests
- include/actions-mock.h: Set return value to std::string and return an empty string - include/actions.h: Make open_alarm_app, open_appointment, open_calendar_app and open_settings_app return the uri/command - include/actions-live.h: Make open_alarm_app, open_appointment, open_calendar_app and open_settings_app return the uri/command - src/actions-live.cpp: Make open_alarm_app, open_appointment, open_calendar_app and open_settings_app return the uri/command - tests/test-live-actions.cpp: Drop last_cmd and last_url variables + use return values of actions-live functions for testing + test phone functions on lomiri only - tests/test-live-actions.cpp: test phone functions after setting XDG_CURRENT_DESKTOP - tests/test-settings.cpp: Use SETTINGS_NOTIFY_SCHEMA_ID only if it exists - tests/run-eds-ics-test.sh: Remove return statement - tests/CMakeLists.txt: Enable the timezone unit tests - tests/CMakeLists.txt: Catch race condition while attempting to copy schemas - tests/CMakeLists.txt: Exclude blocking tests on Travis for now - tests/tests-timezones.cpp: Use MockTimezone to construct LiveTimezones + drop section expecting changes after /timezone is modified (not monitored) - tests/test-formater: Change warning to plain message otherwise it can crash the test - .build.yml: Replace libmessaging-menu-dev with ayatana-indicator-messages Git build
Diffstat (limited to 'include/datetime')
-rw-r--r--include/datetime/actions-live.h8
-rw-r--r--include/datetime/actions.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/include/datetime/actions-live.h b/include/datetime/actions-live.h
index 1eb34ec..136812c 100644
--- a/include/datetime/actions-live.h
+++ b/include/datetime/actions-live.h
@@ -40,10 +40,10 @@ public:
virtual ~LiveActions() =default;
bool desktop_has_calendar_app() const override;
- void open_alarm_app() override;
- void open_appointment(const Appointment&, const DateTime&) override;
- void open_calendar_app(const DateTime&) override;
- void open_settings_app() override;
+ std::string open_alarm_app() override;
+ std::string open_appointment(const Appointment&, const DateTime&) override;
+ std::string open_calendar_app(const DateTime&) override;
+ std::string open_settings_app() override;
void set_location(const std::string& zone, const std::string& name) override;
diff --git a/include/datetime/actions.h b/include/datetime/actions.h
index d866b00..5927967 100644
--- a/include/datetime/actions.h
+++ b/include/datetime/actions.h
@@ -45,10 +45,10 @@ public:
virtual bool desktop_has_calendar_app() const =0;
- virtual void open_alarm_app() =0;
- virtual void open_appointment(const Appointment&, const DateTime&) =0;
- virtual void open_calendar_app(const DateTime&) =0;
- virtual void open_settings_app() =0;
+ virtual std::string open_alarm_app() =0;
+ virtual std::string open_appointment(const Appointment&, const DateTime&) =0;
+ virtual std::string open_calendar_app(const DateTime&) =0;
+ virtual std::string open_settings_app() =0;
virtual void set_location(const std::string& zone, const std::string& name)=0;