SymbX/feedbackd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'misc_cleanups' into 'main'

Browse Source 
tests/integration: Test that "feedback-ended" is propagated through LfbEvent

Closes #62

See merge request Librem5/feedbackd!82
This commit is contained in:
Guido Gunther
2022-11-10 12:52:07 +00:00
parent 4d95249bdd d739a33a5f
commit 68189de793
2 changed files with 84 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fbd-feedback-manager.c
+2 -1
View File
@@ -384,6 +384,8 @@ fbd_feedback_manager_handle_trigger_feedback (LfbGdbusFeedback *object,
found_fb = FALSE; found_fb = FALSE;
} }
lfb_gdbus_feedback_complete_trigger_feedback (object, invocation, event_id);
if (found_fb) { if (found_fb) {
g_signal_connect_object (event, "feedbacks-ended", g_signal_connect_object (event, "feedbacks-ended",
(GCallback) on_event_feedbacks_ended, (GCallback) on_event_feedbacks_ended,
@@ -397,7 +399,6 @@ fbd_feedback_manager_handle_trigger_feedback (LfbGdbusFeedback *object,
FBD_EVENT_END_REASON_NOT_FOUND); FBD_EVENT_END_REASON_NOT_FOUND);
} }
lfb_gdbus_feedback_complete_trigger_feedback (object, invocation, event_id);
return TRUE; return TRUE;
} }
tests/test-lfb-integration.c
+82 -29
View File
@@ -124,8 +124,30 @@ test_lfb_integration_event_not_found (void)
static void static void
on_event_triggered (LfbEvent *event, on_event_triggered (LfbEvent *event,
GAsyncResult *res, GAsyncResult *res,
LfbEvent **cmp) LfbEvent **cmp)
{
g_autoptr (GError) err = NULL;
gboolean success;
g_assert_true (LFB_IS_EVENT (event));
g_assert_null (*cmp);
g_debug ("%s: %p, %s", __func__, event, lfb_event_get_event (event));
success = lfb_event_trigger_feedback_finish (event, res, &err);
g_assert_no_error (err);
g_assert_true (success);
g_assert_cmpint (lfb_event_get_state (event), ==, LFB_EVENT_STATE_RUNNING);
/* "Return" event */
*cmp = event;
}
static void
on_event_triggered_quit (LfbEvent *event,
GAsyncResult *res,
LfbEvent **cmp)
{ {
g_autoptr (GError) err = NULL; g_autoptr (GError) err = NULL;
gboolean success; gboolean success;
@@ -169,6 +191,32 @@ on_event_end_finished (LfbEvent *event,
g_main_loop_quit (mainloop); g_main_loop_quit (mainloop);
} }
static void
test_lfb_integration_event_not_found_async (void)
{
g_autoptr(LfbEvent) event0 = NULL;
LfbEvent *cmp = NULL;
LfbEvent *cmp2 = NULL;
event0 = lfb_event_new ("test-does-not-exist");
g_signal_connect (event0, "feedback-ended", (GCallback)on_feedback_ended, &cmp2);
/* The main loop will only quit if the "feedback-ended" signal actually gets emitted */
g_signal_connect_swapped (event0, "feedback-ended", (GCallback)g_main_loop_quit, mainloop);
lfb_event_trigger_feedback_async (event0,
NULL,
(GAsyncReadyCallback)on_event_triggered,
&cmp);
g_main_loop_run (mainloop);
/* If the signal fired cmp will match event */
g_assert_true (event0 == cmp);
g_assert_true (event0 == cmp2);
g_assert_cmpint (lfb_event_get_state (event0), ==, LFB_EVENT_STATE_ENDED);
g_assert_cmpint (lfb_event_get_end_reason (event0), ==, LFB_EVENT_END_REASON_NOT_FOUND);
}
static void static void
test_lfb_integration_event_async (void) test_lfb_integration_event_async (void)
{ {
@@ -178,9 +226,9 @@ test_lfb_integration_event_async (void)
event0 = lfb_event_new ("test-dummy-0"); event0 = lfb_event_new ("test-dummy-0");
lfb_event_trigger_feedback_async (event0, lfb_event_trigger_feedback_async (event0,
NULL, NULL,
(GAsyncReadyCallback)on_event_triggered, (GAsyncReadyCallback)on_event_triggered_quit,
&cmp1); &cmp1);
g_main_loop_run (mainloop); g_main_loop_run (mainloop);
/* The async finish callback saw the right event */ /* The async finish callback saw the right event */
g_assert_true (event0 == cmp1); g_assert_true (event0 == cmp1);
@@ -194,16 +242,16 @@ test_lfb_integration_event_async (void)
/* The async callback ends the main loop */ /* The async callback ends the main loop */
lfb_event_trigger_feedback_async (event10, lfb_event_trigger_feedback_async (event10,
NULL, NULL,
(GAsyncReadyCallback)on_event_triggered, (GAsyncReadyCallback)on_event_triggered_quit,
&cmp2); &cmp2);
g_main_loop_run (mainloop); g_main_loop_run (mainloop);
/* The async callback ends the main loop */ /* The async callback ends the main loop */
lfb_event_end_feedback_async (event10, lfb_event_end_feedback_async (event10,
NULL, NULL,
(GAsyncReadyCallback)on_event_end_finished, (GAsyncReadyCallback)on_event_end_finished,
&cmp3); &cmp3);
g_main_loop_run (mainloop); g_main_loop_run (mainloop);
/* Check if callbacks saw the right event */ /* Check if callbacks saw the right event */
@@ -246,9 +294,9 @@ test_lfb_integration_event_async_error (void)
/* Empty event names are invalid */ /* Empty event names are invalid */
event0 = lfb_event_new (""); event0 = lfb_event_new ("");
lfb_event_trigger_feedback_async (event0, lfb_event_trigger_feedback_async (event0,
NULL, NULL,
(GAsyncReadyCallback)on_event_with_error_triggered, (GAsyncReadyCallback)on_event_with_error_triggered,
&cmp1); &cmp1);
g_main_loop_run (mainloop); g_main_loop_run (mainloop);
/* The async finish callback saw the right event */ /* The async finish callback saw the right event */
g_assert_true (event0 == cmp1); g_assert_true (event0 == cmp1);
@@ -288,29 +336,34 @@ main (gint argc, gchar *argv[])
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_add("/feedbackd/lfb-integration/event_sync", TestFixture, NULL, g_test_add("/feedbackd/lfb-integration/event_sync", TestFixture, NULL,
(gpointer)fixture_setup, (gpointer)fixture_setup,
(gpointer)test_lfb_integration_event_sync, (gpointer)test_lfb_integration_event_sync,
(gpointer)fixture_teardown); (gpointer)fixture_teardown);
g_test_add("/feedbackd/lfb-integration/event_async/success", TestFixture, NULL, g_test_add("/feedbackd/lfb-integration/event_async/success", TestFixture, NULL,
(gpointer)fixture_setup, (gpointer)fixture_setup,
(gpointer)test_lfb_integration_event_async, (gpointer)test_lfb_integration_event_async,
(gpointer)fixture_teardown); (gpointer)fixture_teardown);
g_test_add("/feedbackd/lfb-integration/event_async/error", TestFixture, NULL, g_test_add("/feedbackd/lfb-integration/event_async/error", TestFixture, NULL,
(gpointer)fixture_setup, (gpointer)fixture_setup,
(gpointer)test_lfb_integration_event_async_error, (gpointer)test_lfb_integration_event_async_error,
(gpointer)fixture_teardown); (gpointer)fixture_teardown);
g_test_add("/feedbackd/lfb-integration/event_not_found", TestFixture, NULL, g_test_add("/feedbackd/lfb-integration/event_not_found", TestFixture, NULL,
(gpointer)fixture_setup, (gpointer)fixture_setup,
(gpointer)test_lfb_integration_event_not_found, (gpointer)test_lfb_integration_event_not_found,
(gpointer)fixture_teardown); (gpointer)fixture_teardown);
g_test_add("/feedbackd/lfb-integration/event_not_found_async", TestFixture, NULL,
(gpointer)fixture_setup,
(gpointer)test_lfb_integration_event_not_found_async,
(gpointer)fixture_teardown);
g_test_add("/feedbackd/lfb-integration/profile", TestFixture, NULL, g_test_add("/feedbackd/lfb-integration/profile", TestFixture, NULL,
(gpointer)fixture_setup, (gpointer)fixture_setup,
(gpointer)test_lfb_integration_profile, (gpointer)test_lfb_integration_profile,
(gpointer)fixture_teardown); (gpointer)fixture_teardown);
return g_test_run(); return g_test_run();
} }