fbd-event: Fix some indent
Gbp-Dch: Ignore
This commit is contained in:
committed by
Guido Günther
parent
2b6a9508a0
commit
924320bbf9
+2
-2
@@ -343,8 +343,8 @@ fbd_event_get_timeout (FbdEvent *self)
|
|||||||
void
|
void
|
||||||
fbd_event_add_feedback (FbdEvent *self, FbdFeedbackBase *feedback)
|
fbd_event_add_feedback (FbdEvent *self, FbdFeedbackBase *feedback)
|
||||||
{
|
{
|
||||||
self->feedbacks = g_slist_prepend (self->feedbacks, g_object_ref(feedback));
|
self->feedbacks = g_slist_prepend (self->feedbacks, g_object_ref (feedback));
|
||||||
g_object_set_data (G_OBJECT (feedback), "event-id", GUINT_TO_POINTER(self->id));
|
g_object_set_data (G_OBJECT (feedback), "event-id", GUINT_TO_POINTER (self->id));
|
||||||
g_signal_connect_object (feedback,
|
g_signal_connect_object (feedback,
|
||||||
"ended",
|
"ended",
|
||||||
(GCallback) on_fb_ended,
|
(GCallback) on_fb_ended,
|
||||||
|
|||||||
+30
-30
@@ -12,7 +12,7 @@
|
|||||||
static void
|
static void
|
||||||
test_fbd_event (void)
|
test_fbd_event (void)
|
||||||
{
|
{
|
||||||
g_autoptr(FbdEvent) event = NULL;
|
g_autoptr (FbdEvent) event = NULL;
|
||||||
g_autofree gchar *appid = NULL;
|
g_autofree gchar *appid = NULL;
|
||||||
g_autofree gchar *name = NULL;
|
g_autofree gchar *name = NULL;
|
||||||
g_autofree gchar *sender = NULL;
|
g_autofree gchar *sender = NULL;
|
||||||
@@ -50,9 +50,9 @@ static void
|
|||||||
test_fbd_event_feedback (void)
|
test_fbd_event_feedback (void)
|
||||||
{
|
{
|
||||||
GSList *feedbacks;
|
GSList *feedbacks;
|
||||||
g_autoptr(FbdEvent) event = NULL;
|
g_autoptr (FbdEvent) event = NULL;
|
||||||
g_autoptr(FbdFeedbackDummy) feedback1 = NULL;
|
g_autoptr (FbdFeedbackDummy) feedback1 = NULL;
|
||||||
g_autoptr(FbdFeedbackDummy) feedback2 = NULL;
|
g_autoptr (FbdFeedbackDummy) feedback2 = NULL;
|
||||||
|
|
||||||
event = fbd_event_new (1, TEST_APP_ID, TEST_EVENT, -1, NULL);
|
event = fbd_event_new (1, TEST_APP_ID, TEST_EVENT, -1, NULL);
|
||||||
feedback1 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
feedback1 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
||||||
@@ -61,21 +61,21 @@ test_fbd_event_feedback (void)
|
|||||||
feedbacks = fbd_event_get_feedbacks (event);
|
feedbacks = fbd_event_get_feedbacks (event);
|
||||||
g_assert_cmpint (g_slist_length (feedbacks), ==, 0);
|
g_assert_cmpint (g_slist_length (feedbacks), ==, 0);
|
||||||
|
|
||||||
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE(feedback1));
|
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE (feedback1));
|
||||||
feedbacks = fbd_event_get_feedbacks (event);
|
feedbacks = fbd_event_get_feedbacks (event);
|
||||||
g_assert_cmpint (g_slist_length (feedbacks), ==, 1);
|
g_assert_cmpint (g_slist_length (feedbacks), ==, 1);
|
||||||
|
|
||||||
/* Remove non existing feedback */
|
/* Remove non existing feedback */
|
||||||
fbd_event_remove_feedback (event, FBD_FEEDBACK_BASE(feedback2));
|
fbd_event_remove_feedback (event, FBD_FEEDBACK_BASE (feedback2));
|
||||||
feedbacks = fbd_event_get_feedbacks (event);
|
feedbacks = fbd_event_get_feedbacks (event);
|
||||||
g_assert_cmpint (g_slist_length (feedbacks), ==, 1);
|
g_assert_cmpint (g_slist_length (feedbacks), ==, 1);
|
||||||
|
|
||||||
fbd_event_remove_feedback (event, FBD_FEEDBACK_BASE(feedback1));
|
fbd_event_remove_feedback (event, FBD_FEEDBACK_BASE (feedback1));
|
||||||
feedbacks = fbd_event_get_feedbacks (event);
|
feedbacks = fbd_event_get_feedbacks (event);
|
||||||
g_assert_cmpint (g_slist_length (feedbacks), ==, 0);
|
g_assert_cmpint (g_slist_length (feedbacks), ==, 0);
|
||||||
|
|
||||||
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE(feedback1));
|
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE (feedback1));
|
||||||
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE(feedback2));
|
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE (feedback2));
|
||||||
feedbacks = fbd_event_get_feedbacks (event);
|
feedbacks = fbd_event_get_feedbacks (event);
|
||||||
g_assert_cmpint (g_slist_length (feedbacks), ==, 2);
|
g_assert_cmpint (g_slist_length (feedbacks), ==, 2);
|
||||||
|
|
||||||
@@ -96,16 +96,16 @@ on_feedbacks_ended (FbdEvent *event, gboolean *ended)
|
|||||||
static void
|
static void
|
||||||
test_fbd_event_feedback_ended (void)
|
test_fbd_event_feedback_ended (void)
|
||||||
{
|
{
|
||||||
g_autoptr(FbdEvent) event = NULL;
|
g_autoptr (FbdEvent) event = NULL;
|
||||||
g_autoptr(FbdFeedbackDummy) feedback1 = NULL;
|
g_autoptr (FbdFeedbackDummy) feedback1 = NULL;
|
||||||
g_autoptr(FbdFeedbackDummy) feedback2 = NULL;
|
g_autoptr (FbdFeedbackDummy) feedback2 = NULL;
|
||||||
gboolean ended = FALSE;
|
gboolean ended = FALSE;
|
||||||
|
|
||||||
event = fbd_event_new (1, TEST_APP_ID, TEST_EVENT, FBD_EVENT_TIMEOUT_ONESHOT, NULL);
|
event = fbd_event_new (1, TEST_APP_ID, TEST_EVENT, FBD_EVENT_TIMEOUT_ONESHOT, NULL);
|
||||||
feedback1 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
feedback1 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
||||||
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE(feedback1));
|
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE (feedback1));
|
||||||
feedback2 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
feedback2 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
||||||
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE(feedback2));
|
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE (feedback2));
|
||||||
|
|
||||||
g_signal_connect (event, "feedbacks-ended",
|
g_signal_connect (event, "feedbacks-ended",
|
||||||
(GCallback)on_feedbacks_ended, &ended);
|
(GCallback)on_feedbacks_ended, &ended);
|
||||||
@@ -117,16 +117,16 @@ test_fbd_event_feedback_ended (void)
|
|||||||
static void
|
static void
|
||||||
test_fbd_event_feedback_loop (void)
|
test_fbd_event_feedback_loop (void)
|
||||||
{
|
{
|
||||||
g_autoptr(FbdEvent) event = NULL;
|
g_autoptr (FbdEvent) event = NULL;
|
||||||
g_autoptr(FbdFeedbackDummy) feedback1 = NULL;
|
g_autoptr (FbdFeedbackDummy) feedback1 = NULL;
|
||||||
g_autoptr(FbdFeedbackDummy) feedback2 = NULL;
|
g_autoptr (FbdFeedbackDummy) feedback2 = NULL;
|
||||||
gboolean ended = FALSE;
|
gboolean ended = FALSE;
|
||||||
|
|
||||||
event = fbd_event_new (1, TEST_APP_ID, TEST_EVENT, FBD_EVENT_TIMEOUT_LOOP, NULL);
|
event = fbd_event_new (1, TEST_APP_ID, TEST_EVENT, FBD_EVENT_TIMEOUT_LOOP, NULL);
|
||||||
feedback1 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
feedback1 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
||||||
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE(feedback1));
|
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE (feedback1));
|
||||||
feedback2 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
feedback2 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
||||||
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE(feedback2));
|
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE (feedback2));
|
||||||
|
|
||||||
g_signal_connect (event, "feedbacks-ended",
|
g_signal_connect (event, "feedbacks-ended",
|
||||||
(GCallback)on_feedbacks_ended, &ended);
|
(GCallback)on_feedbacks_ended, &ended);
|
||||||
@@ -139,16 +139,16 @@ test_fbd_event_feedback_loop (void)
|
|||||||
static void
|
static void
|
||||||
test_fbd_event_feedback_timeout (void)
|
test_fbd_event_feedback_timeout (void)
|
||||||
{
|
{
|
||||||
g_autoptr(FbdEvent) event = NULL;
|
g_autoptr (FbdEvent) event = NULL;
|
||||||
g_autoptr(FbdFeedbackDummy) feedback1 = NULL;
|
g_autoptr (FbdFeedbackDummy) feedback1 = NULL;
|
||||||
g_autoptr(FbdFeedbackDummy) feedback2 = NULL;
|
g_autoptr (FbdFeedbackDummy) feedback2 = NULL;
|
||||||
gboolean ended = FALSE;
|
gboolean ended = FALSE;
|
||||||
|
|
||||||
event = fbd_event_new (1, TEST_APP_ID, TEST_EVENT, 1, NULL);
|
event = fbd_event_new (1, TEST_APP_ID, TEST_EVENT, 1, NULL);
|
||||||
feedback1 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
feedback1 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
||||||
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE(feedback1));
|
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE (feedback1));
|
||||||
feedback2 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
feedback2 = g_object_new (FBD_TYPE_FEEDBACK_DUMMY, NULL);
|
||||||
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE(feedback2));
|
fbd_event_add_feedback (event, FBD_FEEDBACK_BASE (feedback2));
|
||||||
|
|
||||||
g_signal_connect (event, "feedbacks-ended",
|
g_signal_connect (event, "feedbacks-ended",
|
||||||
(GCallback)on_feedbacks_ended, &ended);
|
(GCallback)on_feedbacks_ended, &ended);
|
||||||
@@ -163,11 +163,11 @@ main (gint argc, gchar *argv[])
|
|||||||
{
|
{
|
||||||
g_test_init (&argc, &argv, NULL);
|
g_test_init (&argc, &argv, NULL);
|
||||||
|
|
||||||
g_test_add_func("/feedbackd/fbd/event/new", test_fbd_event);
|
g_test_add_func ("/feedbackd/fbd/event/new", test_fbd_event);
|
||||||
g_test_add_func("/feedbackd/fbd/event/feedbacks/props", test_fbd_event_feedback);
|
g_test_add_func ("/feedbackd/fbd/event/feedbacks/props", test_fbd_event_feedback);
|
||||||
g_test_add_func("/feedbackd/fbd/event/feedbacks/ended", test_fbd_event_feedback_ended);
|
g_test_add_func ("/feedbackd/fbd/event/feedbacks/ended", test_fbd_event_feedback_ended);
|
||||||
g_test_add_func("/feedbackd/fbd/event/feedbacks/loop", test_fbd_event_feedback_loop);
|
g_test_add_func ("/feedbackd/fbd/event/feedbacks/loop", test_fbd_event_feedback_loop);
|
||||||
g_test_add_func("/feedbackd/fbd/event/feedbacks/timeout", test_fbd_event_feedback_timeout);
|
g_test_add_func ("/feedbackd/fbd/event/feedbacks/timeout", test_fbd_event_feedback_timeout);
|
||||||
|
|
||||||
return g_test_run();
|
return g_test_run ();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user