From a8b6bb97a86e61844e34a99d35a7c4b7e3f2ee05 Mon Sep 17 00:00:00 2001 From: William Hua Date: Tue, 25 Jun 2013 17:22:15 -0400 Subject: Tests work-in-progress. --- tests/Makefile.am | 16 ++ tests/config.vala.in | 1 + .../com.canonical.indicator.keyboard.test.Execute | 3 + tests/external/gkbd-keyboard-display | 1 + tests/indicator-keyboard-service.in | 4 + tests/main.vala | 219 +++++++++++++++++++++ tests/services/indicator-keyboard.service.in | 3 + 7 files changed, 247 insertions(+) create mode 100644 tests/config.vala.in create mode 100755 tests/external/com.canonical.indicator.keyboard.test.Execute create mode 120000 tests/external/gkbd-keyboard-display create mode 100644 tests/indicator-keyboard-service.in create mode 100644 tests/main.vala create mode 100644 tests/services/indicator-keyboard.service.in (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index e69de29b..a2143607 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -0,0 +1,16 @@ +AM_CFLAGS = -w +AM_LDFLAGS = -lm +AM_VALAFLAGS = --enable-experimental-non-null \ + --metadatadir $(top_srcdir)/deps \ + --vapidir $(top_srcdir)/deps + +check_PROGRAMS = indicator-keyboard-test + +indicator_keyboard_test_SOURCES = main.vala \ + config.vala +indicator_keyboard_test_VALAFLAGS = $(AM_VALAFLAGS) \ + --pkg gio-2.0 +indicator_keyboard_test_CFLAGS = $(AM_CFLAGS) \ + $(GIO_CFLAGS) +indicator_keyboard_test_LDFLAGS = $(AM_LDFLAGS) \ + $(GIO_LIBS) diff --git a/tests/config.vala.in b/tests/config.vala.in new file mode 100644 index 00000000..a3c4aeb8 --- /dev/null +++ b/tests/config.vala.in @@ -0,0 +1 @@ +const string SERVICE_DIR = "@abs_top_builddir@/tests/services"; diff --git a/tests/external/com.canonical.indicator.keyboard.test.Execute b/tests/external/com.canonical.indicator.keyboard.test.Execute new file mode 100755 index 00000000..ad73fd24 --- /dev/null +++ b/tests/external/com.canonical.indicator.keyboard.test.Execute @@ -0,0 +1,3 @@ +#!/bin/sh + +gdbus call -e -d com.canonical.indicator.keyboard.test -o /com/canonical/indicator/keyboard/test -m com.canonical.indicator.keyboard.test.Execute "\'`basename $0` $*\'" diff --git a/tests/external/gkbd-keyboard-display b/tests/external/gkbd-keyboard-display new file mode 120000 index 00000000..849e205e --- /dev/null +++ b/tests/external/gkbd-keyboard-display @@ -0,0 +1 @@ +com.canonical.indicator.keyboard.test.Execute \ No newline at end of file diff --git a/tests/indicator-keyboard-service.in b/tests/indicator-keyboard-service.in new file mode 100644 index 00000000..bc2d12eb --- /dev/null +++ b/tests/indicator-keyboard-service.in @@ -0,0 +1,4 @@ +#!/bin/sh + +PATH="@abs_top_builddir@/tests/external:$PATH" +@abs_top_builddir@/lib/indicator-keyboard-service diff --git a/tests/main.vala b/tests/main.vala new file mode 100644 index 00000000..20704001 --- /dev/null +++ b/tests/main.vala @@ -0,0 +1,219 @@ +const int LONG_TIMEOUT = 10; +const int SHORT_TIMEOUT = 1000; + +[DBus (name = "com.canonical.indicator.keyboard.test")] +public class Service : Object { + + [DBus (visible = false)] + private string? _command; + + [DBus (visible = false)] + public string? command { + get { return _command; } + } + + public void execute (string command) { + this._command = command; + + var pspec = this.get_class ().find_property ("command"); + + if (pspec != null) { + this.notify["command"] ((!) pspec); + } + } +} + +struct Fixture { + TestDBus? bus; + uint service_name; + DBusConnection? connection; + Service? service; + uint object_name; +} + +static void begin_test (void *data) { + var fixture = (Fixture *) data; + + fixture.bus = new TestDBus (TestDBusFlags.NONE); + ((!) fixture.bus).add_service_dir (SERVICE_DIR); + ((!) fixture.bus).up (); + + var loop = new MainLoop (null, false); + + fixture.service_name = Bus.own_name (BusType.SESSION, + "com.canonical.indicator.keyboard.test", + BusNameOwnerFlags.ALLOW_REPLACEMENT | BusNameOwnerFlags.REPLACE, + (connection, name) => { + if (loop.is_running ()) { + fixture.connection = connection; + loop.quit (); + } + }, + null, + (connection, name) => { + if (loop.is_running ()) { + fixture.connection = null; + loop.quit (); + } + }); + + loop.run (); + + if (fixture.connection != null) { + try { + fixture.service = new Service (); + fixture.object_name = ((!) fixture.connection).register_object ("/com/canonical/indicator/keyboard/test", fixture.service); + } catch (IOError error) { + fixture.object_name = 0; + fixture.service = null; + + Test.message ("error: %s", error.message); + Test.fail (); + } + } else { + fixture.service = null; + fixture.object_name = 0; + + Test.message ("Unable to connect to 'com.canonical.indicator.keyboard.test'."); + Test.fail (); + } +} + +static void end_test (void *data) { + var fixture = (Fixture *) data; + + if (fixture.object_name != 0) { + ((!) fixture.connection).unregister_object (fixture.object_name); + fixture.object_name = 0; + } + + fixture.service = null; + fixture.connection = null; + + if (fixture.service_name != 0) { + Bus.unown_name (fixture.service_name); + fixture.service_name = 0; + } + + if (fixture.bus != null) { + ((!) fixture.bus).down (); + fixture.bus = null; + } +} + +static void test_activate_input_source (void *data) { +} + +static void test_activate_character_map (void *data) { + var fixture = (Fixture *) data; + + if (fixture.object_name == 0) { + Test.message ("Invalid test fixture."); + Test.fail (); + return; + } + + var cancellable = new Cancellable (); + DBusProxy action_proxy; + DBusProxy menu_proxy; + + var source = Timeout.add_seconds (LONG_TIMEOUT, () => { cancellable.cancel (); return false; }); + + try { + action_proxy = new DBusProxy.for_bus_sync (BusType.SESSION, + DBusProxyFlags.NONE, + null, + "com.canonical.indicator.keyboard", + "/com/canonical/indicator/keyboard", + "org.gtk.Actions", + cancellable); + } catch (Error error) { + Test.message ("error: %s", error.message); + Test.fail (); + return; + } + + Source.remove (source); + + if (cancellable.is_cancelled ()) { + Test.message ("Unable to connect to 'com.canonical.indicator.keyboard'.\n"); + Test.fail (); + return; + } + + source = Timeout.add_seconds (LONG_TIMEOUT, () => { cancellable.cancel (); return false; }); + + try { + menu_proxy = new DBusProxy.for_bus_sync (BusType.SESSION, + DBusProxyFlags.NONE, + null, + "com.canonical.indicator.keyboard", + "/com/canonical/indicator/keyboard/desktop", + "org.gtk.Menus", + cancellable); + } catch (Error error) { + Test.message ("error: %s", error.message); + Test.fail (); + return; + } + + Source.remove (source); + + if (cancellable.is_cancelled ()) { + Test.message ("Unable to connect to 'com.canonical.indicator.keyboard'.\n"); + Test.fail (); + return; + } + + var loop = new MainLoop (null, false); + + var signal_name = ((!) fixture.service).notify["command"].connect ((pspec) => { + loop.quit (); + }); + + try { + var builder = new VariantBuilder (new VariantType ("(sava{sv})")); + builder.add ("s", "chart"); + builder.add_value (new Variant.parsed ("@av []")); + builder.add_value (new Variant.parsed ("@a{sv} {}")); + action_proxy.call_sync ("Activate", builder.end (), DBusCallFlags.NONE, SHORT_TIMEOUT); + } catch (Error error) { + Test.message ("error: %s", error.message); + Test.fail (); + return; + } + + source = Timeout.add_seconds (LONG_TIMEOUT, () => { loop.quit (); return false; }); + loop.run (); + Source.remove (source); + ((!) fixture.service).disconnect (signal_name); +} + +static void test_activate_keyboard_layout_chart (void *data) { +} + +static void test_activate_text_entry_settings (void *data) { +} + +static void test_update_input_source (void *data) { +} + +static void test_update_input_sources (void *data) { +} + +public int main (string[] args) { + Test.init (ref args, null); + + var suite = new TestSuite ("indicator-keyboard"); + + suite.add (new TestCase ("activate-input-source", begin_test, test_activate_input_source, end_test, sizeof (Fixture))); + suite.add (new TestCase ("activate-character-map", begin_test, test_activate_character_map, end_test, sizeof (Fixture))); + suite.add (new TestCase ("activate-keyboard-layout-chart", begin_test, test_activate_keyboard_layout_chart, end_test, sizeof (Fixture))); + suite.add (new TestCase ("activate-text-entry-settings", begin_test, test_activate_text_entry_settings, end_test, sizeof (Fixture))); + suite.add (new TestCase ("update-input-source", begin_test, test_update_input_source, end_test, sizeof (Fixture))); + suite.add (new TestCase ("update-input-sources", begin_test, test_update_input_sources, end_test, sizeof (Fixture))); + + TestSuite.get_root ().add_suite (suite); + + return Test.run (); +} diff --git a/tests/services/indicator-keyboard.service.in b/tests/services/indicator-keyboard.service.in new file mode 100644 index 00000000..8b04a464 --- /dev/null +++ b/tests/services/indicator-keyboard.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=com.canonical.indicator.keyboard +Exec=@abs_top_builddir@/tests/indicator-keyboard-service -- cgit v1.2.3