diff options
author | Raul Gutierrez Segales <raul.gutierrez.segales@collabora.co.uk> | 2011-05-24 18:11:49 +0100 |
---|---|---|
committer | Raul Gutierrez Segales <raul.gutierrez.segales@collabora.co.uk> | 2011-05-28 12:38:38 +0100 |
commit | 77f97b8797f82b08c959d3ae32e58b70fc70f2bf (patch) | |
tree | 3810d10379d57c1b9d659084bce54f20595b58dd | |
parent | 7bba7ad32a8c9f4b6420da4dd993be73e313a147 (diff) |
[tracker] Deal with null Avatars being set on a Trf.Persona
Fixes: bgo#650067 - Tracker backend warns when setting a NULL
avatar (ie, unsetting the avatar)
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | backends/tracker/lib/trf-persona-store.vala | 15 | ||||
-rw-r--r-- | tests/tracker/Makefile.am | 6 | ||||
-rw-r--r-- | tests/tracker/set-null-avatar.vala | 140 |
4 files changed, 158 insertions, 5 deletions
@@ -16,6 +16,8 @@ Bugs fixed: * Bug 648533 — Add runtime debug signalling * Bug 649790 — Vala uses the wrong includes * Bug 649088 — Combining contacts doesn't work with german Umlauts +* Bug 650067 — Tracker backend warns when setting a NULL avatar (ie, unsetting + the avatar) API changes: * LinkedHashSet.list_iterator() is now disallowed (causes an assertion failure) diff --git a/backends/tracker/lib/trf-persona-store.vala b/backends/tracker/lib/trf-persona-store.vala index 775c272..8cc10f2 100644 --- a/backends/tracker/lib/trf-persona-store.vala +++ b/backends/tracker/lib/trf-persona-store.vala @@ -2166,17 +2166,18 @@ public class Trf.PersonaStore : Folks.PersonaStore } internal async void _set_avatar (Folks.Persona persona, - File avatar) + File? avatar) { - const string query_t = "DELETE {" + + const string query_d = "DELETE {" + " ?c " + Trf.OntologyDefs.NCO_PHOTO + " ?p " + " } " + "WHERE { " + " ?c a " + Trf.OntologyDefs.NCO_PERSON + " ; " + Trf.OntologyDefs.NCO_PHOTO + " ?p . " + " FILTER(tracker:id(?c) = %s) " + - "} " + - "INSERT { " + + "} "; + + const string query_i = "INSERT { " + " _:i a " + Trf.OntologyDefs.NFO_IMAGE + ", " + Trf.OntologyDefs.NIE_DATAOBJECT + " ; " + Trf.OntologyDefs.NIE_URL + " '%s' . " + @@ -2194,7 +2195,11 @@ public class Trf.PersonaStore : Folks.PersonaStore if (image_urn != "") this._delete_resource ("<%s>".printf (image_urn)); - string query = query_t.printf (p_id, avatar.get_uri (), p_id); + string query = query_d.printf (p_id); + if (avatar != null) + { + query += query_i.printf (avatar.get_uri (), p_id); + } yield this._tracker_update (query, "_set_avatar"); } diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am index 9855671..90419f1 100644 --- a/tests/tracker/Makefile.am +++ b/tests/tracker/Makefile.am @@ -100,6 +100,7 @@ noinst_PROGRAMS = \ match-name \ match-all \ set-duplicate-email \ + set-null-avatar \ $(NULL) backend_store_key_file=$(srcdir)/data/backend-tracker-only.ini @@ -342,6 +343,10 @@ set_duplicate_email_SOURCES = \ set-duplicate-email.vala \ $(NULL) +set_null_avatar_SOURCES = \ + set-null-avatar.vala \ + $(NULL) + CLEANFILES = \ *.pid \ *.address \ @@ -407,6 +412,7 @@ MAINTAINERCLEANFILES = \ match_name_vala.stamp \ match_all_vala.stamp \ set_duplicate_email_vala.stamp \ + set_null_avatar_vala.stamp \ $(NULL) EXTRA_DIST = \ diff --git a/tests/tracker/set-null-avatar.vala b/tests/tracker/set-null-avatar.vala new file mode 100644 index 0000000..fbbfe9b --- /dev/null +++ b/tests/tracker/set-null-avatar.vala @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2011 Collabora Ltd. + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY 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 library. If not, see <http://www.gnu.org/licenses/>. + * + * Authors: Raul Gutierrez Segales <raul.gutierrez.segales@collabora.co.uk> + * + */ + +using Tracker.Sparql; +using TrackerTest; +using Folks; +using Gee; + +public class SetNullAvatarTests : Folks.TestCase +{ + private GLib.MainLoop _main_loop; + private TrackerTest.Backend _tracker_backend; + private IndividualAggregator _aggregator; + private string _persona_fullname; + private bool _null_avatar_set; + + public SetNullAvatarTests () + { + base ("SetNullAvatarTests"); + + this._tracker_backend = new TrackerTest.Backend (); + + this.add_test ("test setting null avatar ", this.test_set_null_avatar); + } + + public override void set_up () + { + } + + public override void tear_down () + { + } + + public void test_set_null_avatar () + { + this._main_loop = new GLib.MainLoop (null, false); + Gee.HashMap<string, string> c1 = new Gee.HashMap<string, string> (); + this._persona_fullname = "persona #1"; + + c1.set (Trf.OntologyDefs.NCO_FULLNAME, this._persona_fullname); + this._tracker_backend.add_contact (c1); + + this._tracker_backend.set_up (); + + this._null_avatar_set = false; + + this._test_set_null_avatar_async (); + + Timeout.add_seconds (5, () => + { + this._main_loop.quit (); + assert_not_reached (); + }); + + this._main_loop.run (); + + assert (this._null_avatar_set); + + this._tracker_backend.tear_down (); + } + + private async void _test_set_null_avatar_async () + { + var store = BackendStore.dup (); + yield store.prepare (); + this._aggregator = new IndividualAggregator (); + this._aggregator.individuals_changed.connect + (this._individuals_changed_cb); + try + { + yield this._aggregator.prepare (); + } + catch (GLib.Error e) + { + GLib.warning ("Error when calling prepare: %s\n", e.message); + } + } + + private void _individuals_changed_cb + (Set<Individual> added, + Set<Individual> removed, + string? message, + Persona? actor, + GroupDetails.ChangeReason reason) + { + foreach (var i in added) + { + if (i.full_name == this._persona_fullname) + { + foreach (var p in i.personas) + { + ((AvatarDetails) p).avatar = null; + this._set_null_avatar_async (); + } + } + } + + assert (removed.size == 0); + } + + private async void _set_null_avatar_async () + { + yield _do_set_null_avatar_async (); + this._main_loop.quit (); + } + + private async void _do_set_null_avatar_async () + { + this._null_avatar_set = true; + } +} + +public int main (string[] args) +{ + Test.init (ref args); + + TestSuite root = TestSuite.get_root (); + root.add_suite (new SetNullAvatarTests ().get_suite ()); + + Test.run (); + + return 0; +} |