Merge lp:~khurshid-alam/libunity/glib-2.59.3 into lp:libunity

[Khurshid Alam]

Fix diffmodel tests against glib 2.59.3

With glib 2.59.3, dee server can't to bind to a address which is already in use. Instead use different address for each diffmodel tests.

See https://gitlab.gnome.org/GNOME/glib/merge_requests/509

Note: I used this fix on top of lp:~ricotz/libunity/syntax-fixes

[Iain Lane (laney)]

Wonder if it'd be possible to reduce the duplication, but OK

review: Approve

=== modified file 'test/vala/test-diff.vala'
--- test/vala/test-diff.vala	2013-07-09 13:35:25 +0000
+++ test/vala/test-diff.vala	2019-03-18 15:10:29 +0000
@@ -50,13 +50,13 @@
         Fixture.create<DiffTester> (DiffTester.test_mixed));
 
       GLib.Test.add_data_func ("/Unit/DiffModel/Populate",
-        Fixture.create<DiffModelTester> (DiffModelTester.test_populate));
+        Fixture.create<DiffModelTester0> (DiffModelTester0.test_populate));
       GLib.Test.add_data_func ("/Unit/DiffModel/Clear",
-        Fixture.create<DiffModelTester> (DiffModelTester.test_clear));
+        Fixture.create<DiffModelTester1> (DiffModelTester1.test_clear));
       GLib.Test.add_data_func ("/Unit/DiffModel/Mixed",
-        Fixture.create<DiffModelTester> (DiffModelTester.test_mixed));
+        Fixture.create<DiffModelTester2> (DiffModelTester2.test_mixed));
       GLib.Test.add_data_func ("/Unit/DiffModel/ChangedMetadata",
-        Fixture.create<DiffModelTester> (DiffModelTester.test_metadata));
+        Fixture.create<DiffModelTester3> (DiffModelTester3.test_metadata));
     }
 
     class DiffTester: Object, Fixture
@@ -340,7 +340,7 @@
       }
     }
 
-    class DiffModelTester: Object, Fixture
+    class DiffModelTester0: Object, Fixture
     {
       private Unity.Internal.DiffModel? model;
       private Dee.SequenceModel? backend_model;
@@ -353,7 +353,7 @@
         backend_model.set_schema_full (RESULTS_SCHEMA);
         backend_model.set_column_names_full (RESULTS_COLUMN_NAMES);
 
-        var peer = new Dee.Server ("com.canonical.Libunity.Test");
+        var peer = new Dee.Server ("com.canonical.Libunity.Test0");
         model = new Unity.Internal.DiffModel (peer, backend_model);
         model.set_schema_full (RESULTS_SCHEMA);
         model.set_column_names_full (RESULTS_COLUMN_NAMES);
@@ -407,6 +407,51 @@
         assert (rows_added == 4);
         assert (rows_removed == 0);
       }
+    }
+
+    class DiffModelTester1: Object, Fixture
+    {
+      private Unity.Internal.DiffModel? model;
+      private Dee.SequenceModel? backend_model;
+      private uint rows_added;
+      private uint rows_removed;
+
+      private void setup ()
+      {
+        backend_model = new Dee.SequenceModel ();
+        backend_model.set_schema_full (RESULTS_SCHEMA);
+        backend_model.set_column_names_full (RESULTS_COLUMN_NAMES);
+        var peer = new Dee.Server ("com.canonical.Libunity.Test1");
+        model = new Unity.Internal.DiffModel (peer, backend_model);
+        model.set_schema_full (RESULTS_SCHEMA);
+        model.set_column_names_full (RESULTS_COLUMN_NAMES);
+        model.row_added.connect (() => { rows_added++; });
+        model.row_removed.connect (() => { rows_removed++; });
+
+        var ml = new MainLoop ();
+        Utils.wait_for_model_synchronization (model, (obj, res) =>
+        {
+          ml.quit ();
+        });
+        assert (run_with_timeout (ml));
+      }
+
+      private void teardown ()
+      {
+        model = null;
+        backend_model = null;
+      }
+
+      private void add_sample_result (
+          string uri,
+          uint category,
+          HashTable<string, Variant>? metadata = null)
+      {
+        Variant metadata_v = metadata != null ?
+          metadata : new Variant.array (VariantType.VARDICT.element (), {});
+        backend_model.append (uri, "icon", category, 0, "text/plain",
+                              Path.get_basename (uri), "", uri, metadata_v);
+      }
 
       public void test_clear ()
       {
@@ -431,6 +476,52 @@
         assert (rows_added == 0);
         assert (rows_removed == 6);
       }
+    }
+
+    class DiffModelTester2: Object, Fixture
+    {
+      private Unity.Internal.DiffModel? model;
+      private Dee.SequenceModel? backend_model;
+      private uint rows_added;
+      private uint rows_removed;
+
+      private void setup ()
+      {
+        backend_model = new Dee.SequenceModel ();
+        backend_model.set_schema_full (RESULTS_SCHEMA);
+        backend_model.set_column_names_full (RESULTS_COLUMN_NAMES);
+
+        var peer = new Dee.Server ("com.canonical.Libunity.Test2");
+        model = new Unity.Internal.DiffModel (peer, backend_model);
+        model.set_schema_full (RESULTS_SCHEMA);
+        model.set_column_names_full (RESULTS_COLUMN_NAMES);
+        model.row_added.connect (() => { rows_added++; });
+        model.row_removed.connect (() => { rows_removed++; });
+
+        var ml = new MainLoop ();
+        Utils.wait_for_model_synchronization (model, (obj, res) =>
+        {
+          ml.quit ();
+        });
+        assert (run_with_timeout (ml));
+      }
+
+      private void teardown ()
+      {
+        model = null;
+        backend_model = null;
+      }
+
+      private void add_sample_result (
+          string uri,
+          uint category,
+          HashTable<string, Variant>? metadata = null)
+      {
+        Variant metadata_v = metadata != null ?
+          metadata : new Variant.array (VariantType.VARDICT.element (), {});
+        backend_model.append (uri, "icon", category, 0, "text/plain",
+                              Path.get_basename (uri), "", uri, metadata_v);
+      }
 
       public void test_mixed ()
       {
@@ -470,7 +561,53 @@
           assert (row[ResultColumn.CATEGORY].equal (orig_row[ResultColumn.CATEGORY]));
         }
       }
-
+    }
+
+    class DiffModelTester3: Object, Fixture
+    {
+      private Unity.Internal.DiffModel? model;
+      private Dee.SequenceModel? backend_model;
+      private uint rows_added;
+      private uint rows_removed;
+
+      private void setup ()
+      {
+        backend_model = new Dee.SequenceModel ();
+        backend_model.set_schema_full (RESULTS_SCHEMA);
+        backend_model.set_column_names_full (RESULTS_COLUMN_NAMES);
+
+        var peer = new Dee.Server ("com.canonical.Libunity.Test3");
+        model = new Unity.Internal.DiffModel (peer, backend_model);
+        model.set_schema_full (RESULTS_SCHEMA);
+        model.set_column_names_full (RESULTS_COLUMN_NAMES);
+        model.row_added.connect (() => { rows_added++; });
+        model.row_removed.connect (() => { rows_removed++; });
+
+        var ml = new MainLoop ();
+        Utils.wait_for_model_synchronization (model, (obj, res) =>
+        {
+          ml.quit ();
+        });
+        assert (run_with_timeout (ml));
+      }
+
+      private void teardown ()
+      {
+        model = null;
+        backend_model = null;
+      }
+
+      private void add_sample_result (
+          string uri,
+          uint category,
+          HashTable<string, Variant>? metadata = null)
+      {
+        Variant metadata_v = metadata != null ?
+          metadata : new Variant.array (VariantType.VARDICT.element (), {});
+        backend_model.append (uri, "icon", category, 0, "text/plain",
+                              Path.get_basename (uri), "", uri, metadata_v);
+      }
+      
       public void test_metadata ()
       {
         var metadata = new HashTable<string, Variant> (str_hash, str_equal);