&err) == FALSE) {
if (err != nullptr) {
ERR("Emit signal err [%s]", err->message);
- g_error_free(err);
+ g_clear_error(&err);
}
is_existed = is_existed_busname(target_bus_name);
if (is_existed == false)
delete_monitoring_list(monitoring_hash, target_bus_name, uid);
ERR("Fail, emit signal to [%s]", target_bus_name);
}
+
+ if (g_dbus_connection_flush_sync(_gdbus_conn, NULL, &err) == FALSE) {
+ ERR("Failed to flush connection[%s]", err ? err->message : "");
+ g_clear_error(&err);
+ }
+
monitoring_count++;
- DBG("Success, emit signal to [%s]", target_bus_name);
+ WARN("Success, emit signal to [%s]", target_bus_name);
}
- DBG("Success, cmd[%s] monitoring count[%d]", cmd, monitoring_count);
+ WARN("Success, cmd[%s] monitoring count[%d]", cmd, monitoring_count);
return SERVICE_COMMON_ERROR_NONE;
}
if (err != nullptr) {
ERR("Emit signal err [%s]",
err->message);
- g_error_free(err);
+ g_clear_error(&err);
}
ERR("Failed to emit signal to [%s]", busname);
return SERVICE_COMMON_ERROR_IO_ERROR;
}
- DBG("Success, Emit signal to [%s] cmd[%s]", busname, cmd);
+
+ if (g_dbus_connection_flush_sync(_gdbus_conn, NULL, &err) == FALSE) {
+ ERR("Failed to flush connection[%s]", err ? err->message : "");
+ g_clear_error(&err);
+
+ return SERVICE_COMMON_ERROR_IO_ERROR;
+ }
+
+ WARN("Success, Emit signal to [%s] cmd[%s]", busname, cmd);
return SERVICE_COMMON_ERROR_NONE;
}
GCancellable* cancellable, GError** error) {
return MOCK_HOOK_P3(GioMock, g_bus_get_sync, type, cancellable, error);
}
+
+extern "C" gboolean g_dbus_connection_flush_sync(GDBusConnection* arg0,
+ GCancellable* arg1, GError** arg2) {
+ return MOCK_HOOK_P3(GioMock, g_dbus_connection_flush_sync, arg0, arg1, arg2);
+}
MOCK_METHOD3(g_bus_get_sync,
GDBusConnection*(GBusType, GCancellable*, GError**));
+ MOCK_METHOD3(g_dbus_connection_flush_sync,
+ gboolean(GDBusConnection*, GCancellable*, GError**));
+
};
#endif // MOCK_GIO_MOCK_H_
\ No newline at end of file
EXPECT_CALL(GetMock<GioMock>(),
g_bus_watch_name(_, _, _, _, _, _, _))
.WillOnce(Return(1));
+ EXPECT_CALL(GetMock<GioMock>(), g_dbus_connection_flush_sync(_, _, _))
+ .WillRepeatedly(Return(true));
+
int ret = notification_reset_event_receiver(param2, &reply2, "sender");
EXPECT_EQ(ret, NOTIFICATION_ERROR_NONE);
ret = notification_send_noti_event(param, &reply);
.WillOnce(Return(1));
EXPECT_CALL(GetMock<NotificationMock>(), notification_create(_))
.WillOnce(Return(info));
+ EXPECT_CALL(GetMock<GioMock>(), g_dbus_connection_flush_sync(_, _, _))
+ .WillRepeatedly(Return(true));
GVariant* param2 = g_variant_new("(i)", 20);
GVariant* reply2;
int ret = notification_reset_event_receiver(param2, &reply2, "sender");