diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/test-sound.cpp | 28 |
2 files changed, 11 insertions, 18 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index faf4341..69a2dfc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -57,6 +57,7 @@ endif() # add the bin dir to our include path so our code can find the generated header files include_directories (${CMAKE_CURRENT_BINARY_DIR}) +set_source_files_properties (engine-eds.cpp PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -Wno-enum-constexpr-conversion") add_library (${SERVICE_LIB} STATIC ${SERVICE_C_SOURCES} ${SERVICE_CXX_SOURCES} ${SERVICE_GENERATED_SOURCES}) include_directories (${CMAKE_SOURCE_DIR}) link_directories (${SERVICE_DEPS_LIBRARY_DIRS}) diff --git a/tests/test-sound.cpp b/tests/test-sound.cpp index eaf76ac..90c18eb 100644 --- a/tests/test-sound.cpp +++ b/tests/test-sound.cpp @@ -47,13 +47,8 @@ namespace return G_SOURCE_REMOVE; }; - class SoundNotificationFixture : public NotificationFixture, - public testing::WithParamInterface<bool> + class SoundNotificationFixture : public NotificationFixture { - public: - bool IsLomiri() { - return GetParam(); - } }; } @@ -61,7 +56,7 @@ namespace **** ***/ -TEST_P(SoundNotificationFixture, InteractiveDuration) +TEST_F(SoundNotificationFixture, InteractiveDuration) { static constexpr int duration_minutes = 120; auto settings = std::make_shared<Settings>(); @@ -76,7 +71,12 @@ TEST_P(SoundNotificationFixture, InteractiveDuration) settings->cal_notification_bubbles.set(true); settings->cal_notification_list.set(true); - mock_capabilities(IsLomiri()); +#ifdef LOMIRI_FEATURES_ENABLED + /* Here both values true|false should succeed. */ + mock_capabilities(true); +#else + mock_capabilities(false); +#endif // call the Snap Decision auto func = [this](const Appointment&, const Alarm&, const Snap::Response&){g_idle_add(quit_idle, loop);}; @@ -111,7 +111,8 @@ TEST_P(SoundNotificationFixture, InteractiveDuration) EXPECT_EQ(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count(), i32); #ifdef LOMIRI_FEATURES_ENABLED - if (IsLomiri()) { + /* If setting mock_capabilities to false, set the below to false, as well. */ + if (true) { // Due to custom logic in Lomiri, also make sure custom timeout hint is set. bool b; auto hints = g_variant_get_child_value (params, 6); @@ -126,15 +127,6 @@ TEST_P(SoundNotificationFixture, InteractiveDuration) ne.reset(); } -INSTANTIATE_TEST_SUITE_P(SoundNotificationTest, - SoundNotificationFixture, - testing::Values( -#ifdef LOMIRI_FEATURES_ENABLED - true, -#endif - false - )); - /*** **** ***/ |