diff options
author | Christian Dywan <christian.dywan@canonical.com> | 2014-01-27 23:57:39 +0100 |
---|---|---|
committer | Christian Dywan <christian.dywan@canonical.com> | 2014-01-27 23:57:39 +0100 |
commit | 2c9a9d4a9375fd44137d9f54bc4ab695abc5ef30 (patch) | |
tree | f4624130e4f9fac9944e56ce70b043d2dac3d4e3 /tests | |
parent | 332bde7c4a802123cb9d8000a4ebffba739ed60e (diff) | |
download | midori-git-2c9a9d4a9375fd44137d9f54bc4ab695abc5ef30.tar.gz |
Port autocompleter test to async job
Diffstat (limited to 'tests')
-rw-r--r-- | tests/completion.vala | 84 |
1 files changed, 41 insertions, 43 deletions
diff --git a/tests/completion.vala b/tests/completion.vala index e20c76db..be6698e2 100644 --- a/tests/completion.vala +++ b/tests/completion.vala @@ -43,48 +43,46 @@ class TestCompletion : Midori.Completion { } } -void completion_autocompleter () { - var app = new Midori.App (); - var autocompleter = new Midori.Autocompleter (app); - assert (!autocompleter.can_complete ("")); - var completion = new TestCompletion (); - autocompleter.add (completion); - completion.test_can_complete = false; - assert (!autocompleter.can_complete ("")); - completion.test_can_complete = true; - assert (autocompleter.can_complete ("")); - - completion.test_suggestions = 0; - autocompleter.complete.begin (""); - var loop = MainContext.default (); - do { loop.iteration (true); } while (loop.pending ()); - assert (autocompleter.model.iter_n_children (null) == 0); - - completion.test_suggestions = 1; - autocompleter.complete.begin (""); - do { loop.iteration (true); } while (loop.pending ()); - assert (autocompleter.model.iter_n_children (null) == 1); - - /* Order */ - completion.test_suggestions = 2; - autocompleter.complete.begin (""); - do { loop.iteration (true); } while (loop.pending ()); - assert (autocompleter.model.iter_n_children (null) == 2); - Gtk.TreeIter iter_first; - autocompleter.model.get_iter_first (out iter_first); - string title; - autocompleter.model.get (iter_first, Midori.Autocompleter.Columns.MARKUP, out title); - if (title != "First") - error ("Expected %s but got %s", "First", title); - - /* Cancellation */ - autocompleter.complete.begin (""); - completion.test_suggestions = 3; - autocompleter.complete.begin (""); - do { loop.iteration (true); } while (loop.pending ()); - int n = autocompleter.model.iter_n_children (null); - if (n != 3) - error ("Expected %d but got %d", 3, n); +class CompletionAutocompleter : Midori.Test.Job { + public static void test () { new CompletionAutocompleter ().run_sync (); } + public override async void run (Cancellable cancellable) throws GLib.Error { + var app = new Midori.App (); + var autocompleter = new Midori.Autocompleter (app); + assert (!autocompleter.can_complete ("")); + var completion = new TestCompletion (); + autocompleter.add (completion); + completion.test_can_complete = false; + assert (!autocompleter.can_complete ("")); + completion.test_can_complete = true; + assert (autocompleter.can_complete ("")); + + completion.test_suggestions = 0; + yield autocompleter.complete (""); + assert (autocompleter.model.iter_n_children (null) == 0); + + completion.test_suggestions = 1; + yield autocompleter.complete (""); + assert (autocompleter.model.iter_n_children (null) == 1); + + /* Order */ + completion.test_suggestions = 2; + yield autocompleter.complete (""); + assert (autocompleter.model.iter_n_children (null) == 2); + Gtk.TreeIter iter_first; + autocompleter.model.get_iter_first (out iter_first); + string title; + autocompleter.model.get (iter_first, Midori.Autocompleter.Columns.MARKUP, out title); + if (title != "First") + error ("Expected %s but got %s", "First", title); + + /* Cancellation */ + yield autocompleter.complete (""); + completion.test_suggestions = 3; + yield autocompleter.complete (""); + int n = autocompleter.model.iter_n_children (null); + if (n != 3) + error ("Expected %d but got %d", 3, n); + } } class CompletionHistory : Midori.Test.Job { @@ -140,7 +138,7 @@ void main (string[] args) { Midori.Test.init (ref args); Midori.App.setup (ref args, null); Midori.Paths.init (Midori.RuntimeMode.NORMAL, null); - Test.add_func ("/completion/autocompleter", completion_autocompleter); + Test.add_func ("/completion/autocompleter", CompletionAutocompleter.test); Test.add_func ("/completion/history", CompletionHistory.test); Test.add_func ("/completion/location-action", completion_location_action); Test.run (); |