Merge lp:~ted/url-dispatcher/lp1356077-send-without-mainloop into lp:url-dispatcher/14.10

[Ted Gould]

Ensure send works even without a mainloop

Just needed to ensure we didn't have a callback if we didn't have a callback (yes, that makes sense if you think about it), but it turned out to clean up a lot if we just removed getting the proxy. So I did that.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/138/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-i386-ci/30/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/url-dispatcher-ci/138/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-armhf-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-i386-ci/32

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/url-dispatcher-ci/140/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

+1, I agree with the premise and it really did simplify things.

review: Approve

[lp:~ted/url-dispatcher/lp1356077-send-without-mainloop]

67. By Ted Gould on 2014-08-19

Use dbus-test-runner for the tests

=== modified file 'liburl-dispatcher/url-dispatcher.c'
--- liburl-dispatcher/url-dispatcher.c	2014-07-16 19:16:10 +0000
+++ liburl-dispatcher/url-dispatcher.c	2014-08-19 21:02:22 +0000
@@ -16,11 +16,10 @@
  */
 
 #include "url-dispatcher.h"
-#include "service-iface.h"
+#include <gio/gio.h>
 
 typedef struct _dispatch_data_t dispatch_data_t;
 struct _dispatch_data_t {
-	ServiceIfaceComCanonicalURLDispatcher * proxy;
 	URLDispatchCallback cb;
 	gpointer user_data;
 	gchar * url;
@@ -33,8 +32,8 @@
 	GError * error = NULL;
 	dispatch_data_t * dispatch_data = (dispatch_data_t *)user_data;
 
-	service_iface_com_canonical_urldispatcher_call_dispatch_url_finish(
-		SERVICE_IFACE_COM_CANONICAL_URLDISPATCHER(obj),
+	g_dbus_connection_call_finish(
+		G_DBUS_CONNECTION(obj),
 		res,
 		&error);
 
@@ -51,7 +50,6 @@
 		}
 	}
 
-	g_clear_object(&dispatch_data->proxy);
 	g_free(dispatch_data->url);
 	g_free(dispatch_data->package);
 	g_free(dispatch_data);
@@ -59,38 +57,6 @@
 	return;
 }
 
-static void
-got_proxy (GObject * obj, GAsyncResult * res, gpointer user_data)
-{
-	GError * error = NULL;
-	dispatch_data_t * dispatch_data = (dispatch_data_t *)user_data;
-
-	dispatch_data->proxy = service_iface_com_canonical_urldispatcher_proxy_new_for_bus_finish(res, &error);
-
-	if (error != NULL) {
-		g_warning("Unable to get proxy for URL Dispatcher: %s", error->message);
-		g_error_free(error);
-
-		if (dispatch_data->cb != NULL) {
-			dispatch_data->cb(dispatch_data->url, FALSE, dispatch_data->user_data);
-		}
-
-		g_free(dispatch_data->url);
-		g_free(dispatch_data);
-		return;
-	}
-
-	service_iface_com_canonical_urldispatcher_call_dispatch_url(
-		dispatch_data->proxy,
-		dispatch_data->url,
-		dispatch_data->package ? dispatch_data->package : "",
-		NULL, /* cancelable */
-		url_dispatched,
-		dispatch_data);
-
-	return;
-}
-
 void
 url_dispatch_send (const gchar * url, URLDispatchCallback cb, gpointer user_data)
 {
@@ -100,22 +66,44 @@
 void
 url_dispatch_send_restricted (const gchar * url, const gchar * package, URLDispatchCallback cb, gpointer user_data)
 {
-	dispatch_data_t * dispatch_data = g_new0(dispatch_data_t, 1);
-
-	dispatch_data->cb = cb;
-	dispatch_data->user_data = user_data;
-	dispatch_data->url = g_strdup(url);
-	dispatch_data->package = g_strdup(package);
-
-	service_iface_com_canonical_urldispatcher_proxy_new_for_bus(
-		G_BUS_TYPE_SESSION,
-		G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
-		"com.canonical.URLDispatcher",
-		"/com/canonical/URLDispatcher",
-		NULL, /* cancellable */
-		got_proxy,
-		dispatch_data
-	);
+	GError * error = NULL;
+	GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+
+	if (error != NULL) {
+		g_warning("Unable to get session bus: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	dispatch_data_t * dispatch_data = NULL;
+	
+	if (cb != NULL) {
+		dispatch_data = g_new0(dispatch_data_t, 1);
+
+		dispatch_data->cb = cb;
+		dispatch_data->user_data = user_data;
+		dispatch_data->url = g_strdup(url);
+		dispatch_data->package = g_strdup(package);
+	}
+
+	g_dbus_connection_call(bus,
+	                       "com.canonical.URLDispatcher",
+	                       "/com/canonical/URLDispatcher",
+	                       "com.canonical.URLDispatcher",
+	                       "DispatchURL",
+	                       g_variant_new("(ss)", url, package ? package : ""),
+	                       NULL,
+	                       G_DBUS_CALL_FLAGS_NO_AUTO_START,
+	                       -1, /* timeout */
+	                       NULL, /* cancelable */
+	                       cb != NULL ? url_dispatched : NULL,
+	                       dispatch_data);
+
+	if (cb == NULL) {
+		g_dbus_connection_flush_sync(bus, NULL, NULL);
+	}
+
+	g_object_unref(bus);
 
 	return;
 }

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-07-20 11:45:00 +0000
+++ tests/CMakeLists.txt	2014-08-19 21:02:22 +0000
@@ -71,6 +71,10 @@
 # lib test
 ###########################
 
+add_executable (lib-test-no-main lib-test-no-main.c)
+target_link_libraries (lib-test-no-main dispatcher)
+add_definitions ( -DLIB_TEST_NO_MAIN_HELPER="${CMAKE_CURRENT_BINARY_DIR}/lib-test-no-main" )
+
 add_executable (lib-test lib-test.cc)
 target_link_libraries (lib-test
 	dispatcher

=== added file 'tests/lib-test-no-main.c'
--- tests/lib-test-no-main.c	1970-01-01 00:00:00 +0000
+++ tests/lib-test-no-main.c	2014-08-19 21:02:22 +0000
@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <gio/gio.h>
+#include <liburl-dispatcher/url-dispatcher.h>
+
+int
+main (int argc, char * argv[]) {
+	url_dispatch_send("foo://bar/barish", NULL, NULL);
+	return 0;
+}

=== modified file 'tests/lib-test.cc'
--- tests/lib-test.cc	2014-07-16 19:36:10 +0000
+++ tests/lib-test.cc	2014-08-19 21:02:22 +0000
@@ -101,6 +101,21 @@
 	g_variant_unref(check);
 }
 
+TEST_F(LibTest, NoMain) {
+	/* Spawning a non-main caller */
+	g_spawn_command_line_sync(LIB_TEST_NO_MAIN_HELPER, NULL, NULL, NULL, NULL);
+
+	guint callslen = 0;
+	const DbusTestDbusMockCall * calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "DispatchURL", &callslen, NULL);
+
+	// ASSERT_NE(calls, nullptr);
+	ASSERT_EQ(callslen, 1);
+	GVariant * check = g_variant_new_parsed("('foo://bar/barish', '')");
+	g_variant_ref_sink(check);
+	ASSERT_TRUE(g_variant_equal(calls->params, check));
+	g_variant_unref(check);
+}
+
 TEST_F(LibTest, RestrictedTest) {
 	GMainLoop * main = g_main_loop_new(NULL, FALSE);
 

=== modified file 'tests/url_dispatcher_testability/CMakeLists.txt'
--- tests/url_dispatcher_testability/CMakeLists.txt	2014-07-22 13:09:42 +0000
+++ tests/url_dispatcher_testability/CMakeLists.txt	2014-08-19 21:02:22 +0000
@@ -10,4 +10,4 @@
   "${PROJECT_SOURCE_DIR}/tests/url_dispatcher_testability/test_fake_dispatcher.py"
   )
 
-add_test(fake-dispatcher dbus-launch --exit-with-session nosetests3 ${PROJECT_SOURCE_DIR}/tests/url_dispatcher_testability/test_fake_dispatcher.py)
+add_test(fake-dispatcher dbus-test-runner --task nosetests3 --parameter ${PROJECT_SOURCE_DIR}/tests/url_dispatcher_testability/test_fake_dispatcher.py)