Merge branch 'wip/carlosg/numeric-affinity' into 'master'

core: Handle ROWIDs turned into strings in SparqlPrintIRI()

Closes #387

See merge request https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/552

67 files changed, 259 insertions, 254 deletions

diff --git a/src/libtracker-sparql/core/tracker-data-manager.c b/src/libtracker-sparql/core/tracker-data-manager.c
index f46be5273..8eca3d8d9 100644
--- a/src/libtracker-sparql/core/tracker-data-manager.c
+++ b/src/libtracker-sparql/core/tracker-data-manager.c
@@ -2394,6 +2394,7 @@ import_ontology_file (TrackerDataManager  *manager,
 			g_propagate_prefixed_error (error, internal_error,
 			                            "%s:%" G_GOFFSET_FORMAT ":%" G_GOFFSET_FORMAT ": ",
 			                            ontology_uri, object_line_no, object_column_no);
+			break;
 		}
 	}
 
diff --git a/src/libtracker-sparql/core/tracker-data-update.c b/src/libtracker-sparql/core/tracker-data-update.c
index c675f6da6..ca0399fa6 100644
--- a/src/libtracker-sparql/core/tracker-data-update.c
+++ b/src/libtracker-sparql/core/tracker-data-update.c
@@ -965,6 +965,9 @@ tracker_data_update_ensure_resource (TrackerData  *data,
 	TrackerOntologies *ontologies;
 	TrackerClass *class;
 
+	if (strchr (uri, ':') == NULL)
+		g_warning ("«%s» is not an absolute IRI", uri);
+
 	value = g_hash_table_lookup (data->update_buffer.resource_cache, uri);
 
 	if (value != NULL) {
diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
index ca1ebb985..68f6bd310 100644
--- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
+++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c
@@ -1901,7 +1901,7 @@ function_sparql_print_iri (sqlite3_context *context,
 		return;
 	}
 
-	if (sqlite3_value_type (argv[0]) == SQLITE_INTEGER) {
+	if (sqlite3_value_numeric_type (argv[0]) == SQLITE_INTEGER) {
 		sqlite3_stmt *stmt;
 		gboolean store_auxdata = FALSE;
 		sqlite3 *db;
diff --git a/tests/core/change/change-test-1.rq b/tests/core/change/change-test-1.rq
index 17754c5bd..a45101e9b 100644
--- a/tests/core/change/change-test-1.rq
+++ b/tests/core/change/change-test-1.rq
@@ -1 +1 @@
-select ?s1 { <a02> example:single1 ?s1 }
+select ?s1 { <http://example/a02> example:single1 ?s1 }
diff --git a/tests/core/change/change-test-2.rq b/tests/core/change/change-test-2.rq
index 4e8f2fb2d..f32710086 100644
--- a/tests/core/change/change-test-2.rq
+++ b/tests/core/change/change-test-2.rq
@@ -1,3 +1,3 @@
-select ?s1 { <a02> example:single1 ?s1 }
+select ?s1 { <http://example/a02> example:single1 ?s1 }
 ~
-select ?s2 { <a02> example:single2 ?s2 }
+select ?s2 { <http://example/a02> example:single2 ?s2 }
diff --git a/tests/core/change/change-test-3.rq b/tests/core/change/change-test-3.rq
index 4e8f2fb2d..f32710086 100644
--- a/tests/core/change/change-test-3.rq
+++ b/tests/core/change/change-test-3.rq
@@ -1,3 +1,3 @@
-select ?s1 { <a02> example:single1 ?s1 }
+select ?s1 { <http://example/a02> example:single1 ?s1 }
 ~
-select ?s2 { <a02> example:single2 ?s2 }
+select ?s2 { <http://example/a02> example:single2 ?s2 }
diff --git a/tests/core/change/change-test-4.out b/tests/core/change/change-test-4.out
index 2cb6288f4..fded200e2 100644
--- a/tests/core/change/change-test-4.out
+++ b/tests/core/change/change-test-4.out
@@ -1,2 +1,2 @@
-"fts1"
-"fts2"
+"http://example/fts1"
+"http://example/fts2"
diff --git a/tests/core/change/change-test-5.out b/tests/core/change/change-test-5.out
index 830687307..e8f8c2e0f 100644
--- a/tests/core/change/change-test-5.out
+++ b/tests/core/change/change-test-5.out
@@ -1,3 +1,3 @@
-"fts1"
-"fts3"
-"fts4"
+"http://example/fts1"
+"http://example/fts3"
+"http://example/fts4"
diff --git a/tests/core/change/test-1.out b/tests/core/change/test-1.out
index eb2d30494..c969a07f5 100644
--- a/tests/core/change/test-1.out
+++ b/tests/core/change/test-1.out
@@ -1 +1 @@
-"b02"
+"http://example/b02"
diff --git a/tests/core/change/test-1.rq b/tests/core/change/test-1.rq
index 2c3381755..a045c4092 100644
--- a/tests/core/change/test-1.rq
+++ b/tests/core/change/test-1.rq
@@ -1 +1 @@
-select ?b02 { <a01> example:b ?b02 }
+select ?b02 { <http://example/a01> example:b ?b02 }
diff --git a/tests/core/change/test-2.rq b/tests/core/change/test-2.rq
index 85121e22a..00625cca2 100644
--- a/tests/core/change/test-2.rq
+++ b/tests/core/change/test-2.rq
@@ -1 +1 @@
-select ?a ?b ?c { <a01> example:i2 ?a ; example:i1 ?b; example:single1 ?c }
+select ?a ?b ?c { <http://example/a01> example:i2 ?a ; example:i1 ?b; example:single1 ?c }
diff --git a/tests/core/change/test-3.rq b/tests/core/change/test-3.rq
index 25d5f3c33..995ca3854 100644
--- a/tests/core/change/test-3.rq
+++ b/tests/core/change/test-3.rq
@@ -1 +1 @@
-select ?ib ?sb { <b02> example:ib ?ib; example:sb ?sb }
+select ?ib ?sb { <http://example/b02> example:ib ?ib; example:sb ?sb }
diff --git a/tests/core/change/test-4.rq b/tests/core/change/test-4.rq
index 075ed235b..0e78cef77 100644
--- a/tests/core/change/test-4.rq
+++ b/tests/core/change/test-4.rq
@@ -1 +1 @@
-select ?s2 { <a02> example:single2 ?s2 }
+select ?s2 { <http://example/a02> example:single2 ?s2 }
diff --git a/tests/core/change/updates/99-example.queries.v10 b/tests/core/change/updates/99-example.queries.v10
index f53e8eac8..976995e1f 100644
--- a/tests/core/change/updates/99-example.queries.v10
+++ b/tests/core/change/updates/99-example.queries.v10
@@ -1 +1 @@
-insert data { <fts3> a example:A ; example:fts1 'resource fts3' }
+insert data { <http://example/fts3> a example:A ; example:fts1 'resource fts3' }
diff --git a/tests/core/change/updates/99-example.queries.v11 b/tests/core/change/updates/99-example.queries.v11
index bab58b3a5..35f4081f4 100644
--- a/tests/core/change/updates/99-example.queries.v11
+++ b/tests/core/change/updates/99-example.queries.v11
@@ -1 +1 @@
-insert data { <fts4> a example:A ; example:fts1 'resource fts4' }
+insert data { <http://example/fts4> a example:A ; example:fts1 'resource fts4' }
diff --git a/tests/core/change/updates/99-example.queries.v2 b/tests/core/change/updates/99-example.queries.v2
index eca5c3719..faf50dccf 100644
--- a/tests/core/change/updates/99-example.queries.v2
+++ b/tests/core/change/updates/99-example.queries.v2
@@ -1,3 +1,3 @@
-insert { <b01> a example:B . <a01> a example:A ; example:b <b01> }
-delete { <a01> example:b <b01> }
-insert { <b02> a example:B . <a01> example:b <b02> }
+insert { <http://example/b01> a example:B . <http://example/a01> a example:A ; example:b <http://example/b01> }
+delete { <http://example/a01> example:b <http://example/b01> }
+insert { <http://example/b02> a example:B . <http://example/a01> example:b <http://example/b02> }
diff --git a/tests/core/change/updates/99-example.queries.v3 b/tests/core/change/updates/99-example.queries.v3
index 45b4a552e..068e55d02 100644
--- a/tests/core/change/updates/99-example.queries.v3
+++ b/tests/core/change/updates/99-example.queries.v3
@@ -1,9 +1,9 @@
-insert { <a01> example:i1 1 }
-delete { <a01> example:i1 1 }
-insert { <a01> example:i1 2 }
-insert { <a01> example:i2 1 }
-delete { <a01> example:i2 1 }
-insert { <a01> example:i2 2 }
-insert { <a01> example:single1 2 }
-delete { <a01> example:single1 1 }
-insert { <a01> example:single1 2 }
+insert { <http://example/a01> example:i1 1 }
+delete { <http://example/a01> example:i1 1 }
+insert { <http://example/a01> example:i1 2 }
+insert { <http://example/a01> example:i2 1 }
+delete { <http://example/a01> example:i2 1 }
+insert { <http://example/a01> example:i2 2 }
+insert { <http://example/a01> example:single1 2 }
+delete { <http://example/a01> example:single1 1 }
+insert { <http://example/a01> example:single1 2 }
diff --git a/tests/core/change/updates/99-example.queries.v4 b/tests/core/change/updates/99-example.queries.v4
index 6f37824f7..4355b2ead 100644
--- a/tests/core/change/updates/99-example.queries.v4
+++ b/tests/core/change/updates/99-example.queries.v4
@@ -1,6 +1,6 @@
-insert { <b02> example:ib 1 }
-delete { <b02> example:ib 1 }
-insert { <b02> example:ib 2 }
-insert { <b02> example:sb "s1" }
-delete { <b02> example:sb "s1" }
-insert { <b02> example:sb "s2" }
+insert { <http://example/b02> example:ib 1 }
+delete { <http://example/b02> example:ib 1 }
+insert { <http://example/b02> example:ib 2 }
+insert { <http://example/b02> example:sb "s1" }
+delete { <http://example/b02> example:sb "s1" }
+insert { <http://example/b02> example:sb "s2" }
diff --git a/tests/core/change/updates/99-example.queries.v5 b/tests/core/change/updates/99-example.queries.v5
index 9e73b5803..363bec98f 100644
--- a/tests/core/change/updates/99-example.queries.v5
+++ b/tests/core/change/updates/99-example.queries.v5
@@ -1 +1 @@
-insert { <a02> a example:DomA ; example:single1 '1' }
+insert { <http://example/a02> a example:DomA ; example:single1 '1' }
diff --git a/tests/core/change/updates/99-example.queries.v6 b/tests/core/change/updates/99-example.queries.v6
index b8af357cb..7fa1e1fc6 100644
--- a/tests/core/change/updates/99-example.queries.v6
+++ b/tests/core/change/updates/99-example.queries.v6
@@ -1 +1 @@
-insert { <a02> example:single2 '2' }
+insert { <http://example/a02> example:single2 '2' }
diff --git a/tests/core/change/updates/99-example.queries.v8 b/tests/core/change/updates/99-example.queries.v8
index 5950952a3..967f71b4e 100644
--- a/tests/core/change/updates/99-example.queries.v8
+++ b/tests/core/change/updates/99-example.queries.v8
@@ -1,2 +1,2 @@
-insert data { <fts1> a example:A ; example:fts1 'resource fts1' }
-insert data { <fts2> a example:B ; example:fts2 'resource fts2' }
+insert data { <http://example/fts1> a example:A ; example:fts1 'resource fts1' }
+insert data { <http://example/fts2> a example:B ; example:fts2 'resource fts2' }
diff --git a/tests/core/change/updates/99-example.queries.v9 b/tests/core/change/updates/99-example.queries.v9
index 6c667836f..b47ad5ea7 100644
--- a/tests/core/change/updates/99-example.queries.v9
+++ b/tests/core/change/updates/99-example.queries.v9
@@ -1 +1 @@
-insert data { <nonFts> a example:A ; example:nonFts 42 }
+insert data { <http://example/nonFts> a example:A ; example:nonFts 42 }
diff --git a/tests/core/constraint/coexisting-1.out b/tests/core/constraint/coexisting-1.out
index 8be680548..cb964306a 100644
--- a/tests/core/constraint/coexisting-1.out
+++ b/tests/core/constraint/coexisting-1.out
@@ -1,4 +1,4 @@
-"a"
-"b"
-"c"
-"d"
+"http://example/a"
+"http://example/b"
+"http://example/c"
+"http://example/d"
diff --git a/tests/core/constraint/coexisting-1.rq b/tests/core/constraint/coexisting-1.rq
index 3fc6ee60a..4ab5604e6 100644
--- a/tests/core/constraint/coexisting-1.rq
+++ b/tests/core/constraint/coexisting-1.rq
@@ -1,3 +1,3 @@
-CONSTRAINT GRAPH ALL,<A>
+CONSTRAINT GRAPH ALL,<http://example/A>
 SELECT ?u { ?u a example:A }
 ORDER BY ?u
diff --git a/tests/core/constraint/coexisting-2.out b/tests/core/constraint/coexisting-2.out
index 22d3c21b7..f0da31cbd 100644
--- a/tests/core/constraint/coexisting-2.out
+++ b/tests/core/constraint/coexisting-2.out
@@ -1,2 +1,2 @@
-"a"
-"d"
+"http://example/a"
+"http://example/d"
diff --git a/tests/core/constraint/coexisting-2.rq b/tests/core/constraint/coexisting-2.rq
index 439678b18..f10383c0f 100644
--- a/tests/core/constraint/coexisting-2.rq
+++ b/tests/core/constraint/coexisting-2.rq
@@ -1,3 +1,3 @@
-CONSTRAINT GRAPH DEFAULT,<A>
+CONSTRAINT GRAPH DEFAULT,<http://example/A>
 SELECT ?u { ?u a example:A }
 ORDER BY ?u
diff --git a/tests/core/constraint/coexisting-3.out b/tests/core/constraint/coexisting-3.out
index 8be680548..cb964306a 100644
--- a/tests/core/constraint/coexisting-3.out
+++ b/tests/core/constraint/coexisting-3.out
@@ -1,4 +1,4 @@
-"a"
-"b"
-"c"
-"d"
+"http://example/a"
+"http://example/b"
+"http://example/c"
+"http://example/d"
diff --git a/tests/core/constraint/coexisting-4.out b/tests/core/constraint/coexisting-4.out
index 071144f21..9c0598673 100644
--- a/tests/core/constraint/coexisting-4.out
+++ b/tests/core/constraint/coexisting-4.out
@@ -1,2 +1,2 @@
-"a"
-"b"
+"http://example/a"
+"http://example/b"
diff --git a/tests/core/constraint/coexisting-4.rq b/tests/core/constraint/coexisting-4.rq
index 7dec44fba..65cf10200 100644
--- a/tests/core/constraint/coexisting-4.rq
+++ b/tests/core/constraint/coexisting-4.rq
@@ -1,3 +1,3 @@
-CONSTRAINT GRAPH <A>,<B>
+CONSTRAINT GRAPH <http://example/A>,<http://example/B>
 SELECT ?u { ?u a example:A }
 ORDER BY ?u
diff --git a/tests/core/constraint/data.rq b/tests/core/constraint/data.rq
index ef6ac9e25..3fa41b302 100644
--- a/tests/core/constraint/data.rq
+++ b/tests/core/constraint/data.rq
@@ -1,3 +1,4 @@
+BASE <http://example/>
 INSERT {
 	GRAPH <A> {
 		<a> a example:A ;
diff --git a/tests/core/constraint/nested-1.rq b/tests/core/constraint/nested-1.rq
index db172998d..7cc4fe29a 100644
--- a/tests/core/constraint/nested-1.rq
+++ b/tests/core/constraint/nested-1.rq
@@ -1,3 +1,3 @@
 CONSTRAINT GRAPH
-CONSTRAINT GRAPH <A>
+CONSTRAINT GRAPH <http://example/A>
 SELECT ?u { ?u a example:A }
diff --git a/tests/core/constraint/nested-2.rq b/tests/core/constraint/nested-2.rq
index dafb152b9..c18d2abc2 100644
--- a/tests/core/constraint/nested-2.rq
+++ b/tests/core/constraint/nested-2.rq
@@ -1,3 +1,3 @@
-CONSTRAINT GRAPH <A>
-CONSTRAINT GRAPH <B>
+CONSTRAINT GRAPH <http://example/A>
+CONSTRAINT GRAPH <http://example/B>
 SELECT ?u { ?u a example:A }
diff --git a/tests/core/constraint/nested-3.out b/tests/core/constraint/nested-3.out
index 19010cc35..6735c0767 100644
--- a/tests/core/constraint/nested-3.out
+++ b/tests/core/constraint/nested-3.out
@@ -1 +1 @@
-"b"
+"http://example/b"
diff --git a/tests/core/constraint/nested-3.rq b/tests/core/constraint/nested-3.rq
index a46945d5d..8c3147f54 100644
--- a/tests/core/constraint/nested-3.rq
+++ b/tests/core/constraint/nested-3.rq
@@ -1,3 +1,3 @@
-CONSTRAINT GRAPH <A>, <B>
-CONSTRAINT GRAPH <B>
+CONSTRAINT GRAPH <http://example/A>, <http://example/B>
+CONSTRAINT GRAPH <http://example/B>
 SELECT ?u { ?u a example:A }
diff --git a/tests/core/constraint/nested-6.out b/tests/core/constraint/nested-6.out
index 5775b9f8c..469a2dd34 100644
--- a/tests/core/constraint/nested-6.out
+++ b/tests/core/constraint/nested-6.out
@@ -1 +1 @@
-"d"
+"http://example/d"
diff --git a/tests/core/construct/construct-pattern.out b/tests/core/construct/construct-pattern.out
index bda80d4c6..a5ac5f21a 100644
--- a/tests/core/construct/construct-pattern.out
+++ b/tests/core/construct/construct-pattern.out
@@ -1,12 +1,12 @@
-"a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
-"b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
-"c"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
-"d"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
-"a"	"http://xmlns.com/foaf/0.1/name"	"nameA"
-"b"	"http://xmlns.com/foaf/0.1/name"	"nameB"
-"c"	"http://xmlns.com/foaf/0.1/name"	"nameC"
-"d"	"http://xmlns.com/foaf/0.1/name"	"nameD"
-"a"	"http://xmlns.com/foaf/0.1/mbox"	"mailto:bob@work"
-"b"	"http://xmlns.com/foaf/0.1/mbox"	"mailto:bob@work"
-"c"	"http://xmlns.com/foaf/0.1/mbox"	"mailto:bob@work"
-"d"	"http://xmlns.com/foaf/0.1/mbox"	"mailto:bob@work"
+"http://example/a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
+"http://example/b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
+"http://example/c"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
+"http://example/d"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
+"http://example/a"	"http://xmlns.com/foaf/0.1/name"	"nameA"
+"http://example/b"	"http://xmlns.com/foaf/0.1/name"	"nameB"
+"http://example/c"	"http://xmlns.com/foaf/0.1/name"	"nameC"
+"http://example/d"	"http://xmlns.com/foaf/0.1/name"	"nameD"
+"http://example/a"	"http://xmlns.com/foaf/0.1/mbox"	"mailto:bob@work"
+"http://example/b"	"http://xmlns.com/foaf/0.1/mbox"	"mailto:bob@work"
+"http://example/c"	"http://xmlns.com/foaf/0.1/mbox"	"mailto:bob@work"
+"http://example/d"	"http://xmlns.com/foaf/0.1/mbox"	"mailto:bob@work"
diff --git a/tests/core/construct/construct-where.out b/tests/core/construct/construct-where.out
index 6fb4dde44..cd10976f1 100644
--- a/tests/core/construct/construct-where.out
+++ b/tests/core/construct/construct-where.out
@@ -1,8 +1,8 @@
-"a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"
-"b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"
-"c"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"
-"d"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"
-"a"	"http://example/name"	"nameA"
-"b"	"http://example/name"	"nameB"
-"c"	"http://example/name"	"nameC"
-"d"	"http://example/name"	"nameD"
+"http://example/a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"
+"http://example/b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"
+"http://example/c"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"
+"http://example/d"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"
+"http://example/a"	"http://example/name"	"nameA"
+"http://example/b"	"http://example/name"	"nameB"
+"http://example/c"	"http://example/name"	"nameC"
+"http://example/d"	"http://example/name"	"nameD"
diff --git a/tests/core/construct/construct-with-modifiers.out b/tests/core/construct/construct-with-modifiers.out
index 737959de6..bc4611370 100644
--- a/tests/core/construct/construct-with-modifiers.out
+++ b/tests/core/construct/construct-with-modifiers.out
@@ -1,4 +1,4 @@
-"c"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
-"b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
-"c"	"http://xmlns.com/foaf/0.1/name"	"nameC"
-"b"	"http://xmlns.com/foaf/0.1/name"	"nameB"
+"http://example/c"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
+"http://example/b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://xmlns.com/foaf/0.1/Person"
+"http://example/c"	"http://xmlns.com/foaf/0.1/name"	"nameC"
+"http://example/b"	"http://xmlns.com/foaf/0.1/name"	"nameB"
diff --git a/tests/core/construct/data.ttl b/tests/core/construct/data.ttl
index 7449849fd..acbb1e253 100644
--- a/tests/core/construct/data.ttl
+++ b/tests/core/construct/data.ttl
@@ -1,31 +1,31 @@
 @prefix example: <http://example/> .
 
-<a> a example:A ;
+example:a a example:A ;
     example:name 'nameA' ;
     example:date '2000-01-01T00:00:01Z' ;
     example:number 42 .
 
-<b> a example:A ;
+example:b a example:A ;
     example:name 'nameB' ;
     example:date '2001-01-01T00:00:01Z' ;
     example:number 73 ;
-    example:relation <z> .
+    example:relation example:z .
 
-<c> a example:A ;
+example:c a example:A ;
     example:name 'nameC' ;
     example:number 113 ;
-    example:relation <x> .
+    example:relation example:x .
 
-<d> a example:A ;
+example:d a example:A ;
     example:name 'nameD' ;
     example:date '2002-01-01T00:00:01Z' ;
-    example:relation <z> .
+    example:relation example:z .
 
-<x> a example:B ;
+example:x a example:B ;
     example:title 'titleX' .
 
-<y> a example:B ;
+example:y a example:B ;
     example:title 'titleY' .
 
-<z> a example:B ;
+example:z a example:B ;
     example:title 'titleZ' .
diff --git a/tests/core/describe/data.ttl b/tests/core/describe/data.ttl
index 7449849fd..acbb1e253 100644
--- a/tests/core/describe/data.ttl
+++ b/tests/core/describe/data.ttl
@@ -1,31 +1,31 @@
 @prefix example: <http://example/> .
 
-<a> a example:A ;
+example:a a example:A ;
     example:name 'nameA' ;
     example:date '2000-01-01T00:00:01Z' ;
     example:number 42 .
 
-<b> a example:A ;
+example:b a example:A ;
     example:name 'nameB' ;
     example:date '2001-01-01T00:00:01Z' ;
     example:number 73 ;
-    example:relation <z> .
+    example:relation example:z .
 
-<c> a example:A ;
+example:c a example:A ;
     example:name 'nameC' ;
     example:number 113 ;
-    example:relation <x> .
+    example:relation example:x .
 
-<d> a example:A ;
+example:d a example:A ;
     example:name 'nameD' ;
     example:date '2002-01-01T00:00:01Z' ;
-    example:relation <z> .
+    example:relation example:z .
 
-<x> a example:B ;
+example:x a example:B ;
     example:title 'titleX' .
 
-<y> a example:B ;
+example:y a example:B ;
     example:title 'titleY' .
 
-<z> a example:B ;
+example:z a example:B ;
     example:title 'titleZ' .
diff --git a/tests/core/describe/describe-limit.out b/tests/core/describe/describe-limit.out
index b536c99e2..a48655ca6 100644
--- a/tests/core/describe/describe-limit.out
+++ b/tests/core/describe/describe-limit.out
@@ -1,11 +1,11 @@
-"b"	"http://example/relation"	"z"	
-"a"	"http://example/number"	"42"	
-"b"	"http://example/number"	"73"	
-"a"	"http://example/date"	"2000-01-01T00:00:01Z"	
-"b"	"http://example/date"	"2001-01-01T00:00:01Z"	
-"a"	"http://example/name"	"nameA"	
-"b"	"http://example/name"	"nameB"	
-"a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
-"a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
-"b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
-"b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
+"http://example/b"	"http://example/relation"	"http://example/z"	
+"http://example/a"	"http://example/number"	"42"	
+"http://example/b"	"http://example/number"	"73"	
+"http://example/a"	"http://example/date"	"2000-01-01T00:00:01Z"	
+"http://example/b"	"http://example/date"	"2001-01-01T00:00:01Z"	
+"http://example/a"	"http://example/name"	"nameA"	
+"http://example/b"	"http://example/name"	"nameB"	
+"http://example/a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
+"http://example/a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
+"http://example/b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
+"http://example/b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
diff --git a/tests/core/describe/describe-multiple.out b/tests/core/describe/describe-multiple.out
index dadbfbb86..4355e4854 100644
--- a/tests/core/describe/describe-multiple.out
+++ b/tests/core/describe/describe-multiple.out
@@ -1,22 +1,22 @@
-"b"	"http://example/relation"	"z"	
-"c"	"http://example/relation"	"x"	
-"d"	"http://example/relation"	"z"	
-"x"	"http://example/title"	"titleX"	
-"z"	"http://example/title"	"titleZ"
-"b"	"http://example/number"	"73"	
-"c"	"http://example/number"	"113"	
-"b"	"http://example/date"	"2001-01-01T00:00:01Z"	
-"d"	"http://example/date"	"2002-01-01T00:00:01Z"	
-"b"	"http://example/name"	"nameB"	
-"c"	"http://example/name"	"nameC"	
-"d"	"http://example/name"	"nameD"	
-"b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
-"b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
-"c"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
-"c"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
-"d"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
-"d"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
-"x"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"
-"x"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/B"
-"z"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"
-"z"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/B"
+"http://example/b"	"http://example/relation"	"http://example/z"	
+"http://example/c"	"http://example/relation"	"http://example/x"	
+"http://example/d"	"http://example/relation"	"http://example/z"	
+"http://example/x"	"http://example/title"	"titleX"	
+"http://example/z"	"http://example/title"	"titleZ"
+"http://example/b"	"http://example/number"	"73"	
+"http://example/c"	"http://example/number"	"113"	
+"http://example/b"	"http://example/date"	"2001-01-01T00:00:01Z"	
+"http://example/d"	"http://example/date"	"2002-01-01T00:00:01Z"	
+"http://example/b"	"http://example/name"	"nameB"	
+"http://example/c"	"http://example/name"	"nameC"	
+"http://example/d"	"http://example/name"	"nameD"	
+"http://example/b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
+"http://example/b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
+"http://example/c"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
+"http://example/c"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
+"http://example/d"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
+"http://example/d"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
+"http://example/x"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"
+"http://example/x"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/B"
+"http://example/z"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"
+"http://example/z"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/B"
diff --git a/tests/core/describe/describe-pattern.out b/tests/core/describe/describe-pattern.out
index 84d8d9520..a00bcfe00 100644
--- a/tests/core/describe/describe-pattern.out
+++ b/tests/core/describe/describe-pattern.out
@@ -1,6 +1,6 @@
-"b"	"http://example/relation"	"z"	
-"b"	"http://example/number"	"73"	
-"b"	"http://example/date"	"2001-01-01T00:00:01Z"	
-"b"	"http://example/name"	"nameB"	
-"b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
-"b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
+"http://example/b"	"http://example/relation"	"http://example/z"	
+"http://example/b"	"http://example/number"	"73"	
+"http://example/b"	"http://example/date"	"2001-01-01T00:00:01Z"	
+"http://example/b"	"http://example/name"	"nameB"	
+"http://example/b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
+"http://example/b"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
diff --git a/tests/core/describe/describe-single.out b/tests/core/describe/describe-single.out
index b896021ee..7d9c6c44d 100644
--- a/tests/core/describe/describe-single.out
+++ b/tests/core/describe/describe-single.out
@@ -1,5 +1,5 @@
-"a"	"http://example/number"	"42"	
-"a"	"http://example/date"	"2000-01-01T00:00:01Z"	
-"a"	"http://example/name"	"nameA"	
-"a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
-"a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
+"http://example/a"	"http://example/number"	"42"	
+"http://example/a"	"http://example/date"	"2000-01-01T00:00:01Z"	
+"http://example/a"	"http://example/name"	"nameA"	
+"http://example/a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://www.w3.org/2000/01/rdf-schema#Resource"	
+"http://example/a"	"http://www.w3.org/1999/02/22-rdf-syntax-ns#type"	"http://example/A"	
diff --git a/tests/core/describe/describe-single.rq b/tests/core/describe/describe-single.rq
index bc781f9a6..fdf0e395c 100644
--- a/tests/core/describe/describe-single.rq
+++ b/tests/core/describe/describe-single.rq
@@ -1 +1 @@
-DESCRIBE <a>
+DESCRIBE example:a
diff --git a/tests/core/expr-ops/data.ttl b/tests/core/expr-ops/data.ttl
index b4e082dbe..ef063a957 100644
--- a/tests/core/expr-ops/data.ttl
+++ b/tests/core/expr-ops/data.ttl
@@ -11,7 +11,7 @@
 :x3 :p "3"^^xsd:integer .
 :x4 :p "4"^^xsd:integer .
 
-<a> a :B .
-<b> a :B .
-<c> a :B .
+<http://example.org/a> a :B .
+<http://example.org/b> a :B .
+<http://example.org/c> a :B .
 
diff --git a/tests/core/expr-ops/query-res-1.out b/tests/core/expr-ops/query-res-1.out
index cdf158597..0c8479943 100644
--- a/tests/core/expr-ops/query-res-1.out
+++ b/tests/core/expr-ops/query-res-1.out
@@ -1 +1 @@
-"c"
+"http://example.org/c"
diff --git a/tests/core/expr-ops/query-res-1.rq b/tests/core/expr-ops/query-res-1.rq
index 8456b7e9e..ae94e55b4 100755
--- a/tests/core/expr-ops/query-res-1.rq
+++ b/tests/core/expr-ops/query-res-1.rq
@@ -1,5 +1,5 @@
 PREFIX : <http://example.org/>
 SELECT ?s WHERE {
     ?s a :B .
-    FILTER((!(?s = <a> || ?s = <b> || ?s = <unknown>))) .
+    FILTER((!(?s = <http://example.org/a> || ?s = <http://example.org/b> || ?s = <unknown>))) .
 }
diff --git a/tests/core/langstring/data.rq b/tests/core/langstring/data.rq
index ae71299ea..4dcd77f71 100644
--- a/tests/core/langstring/data.rq
+++ b/tests/core/langstring/data.rq
@@ -1,16 +1,16 @@
 INSERT {
-	<a> a example:A ;
+	example:a a example:A ;
 	    example:langString "foo"@en ;
 	    example:string "bar" .
 
-	<b> a example:A ;
+	example:b a example:A ;
 	    example:langString "foo"@fr ;
 	    example:string "baz" .
 
-	<c> a example:A ;
+	example:c a example:A ;
 	    example:langString "foo" ;
 	    example:string "bla"@es .
 
-	<d> a example:A ;
+	example:d a example:A ;
 	    example:langString "bleh"@en .
 }
diff --git a/tests/core/langstring/langmatches.out b/tests/core/langstring/langmatches.out
index 22d3c21b7..f0da31cbd 100644
--- a/tests/core/langstring/langmatches.out
+++ b/tests/core/langstring/langmatches.out
@@ -1,2 +1,2 @@
-"a"
-"d"
+"http://example/a"
+"http://example/d"
diff --git a/tests/core/langstring/match-non-langstring.out b/tests/core/langstring/match-non-langstring.out
index cdf158597..80c05abbf 100644
--- a/tests/core/langstring/match-non-langstring.out
+++ b/tests/core/langstring/match-non-langstring.out
@@ -1 +1 @@
-"c"
+"http://example/c"
diff --git a/tests/core/langstring/match-with-langstring.out b/tests/core/langstring/match-with-langstring.out
index 231f150c5..512c727b3 100644
--- a/tests/core/langstring/match-with-langstring.out
+++ b/tests/core/langstring/match-with-langstring.out
@@ -1 +1 @@
-"a"
+"http://example/a"
diff --git a/tests/core/langstring/match-with-non-langstring.out b/tests/core/langstring/match-with-non-langstring.out
index cdf158597..80c05abbf 100644
--- a/tests/core/langstring/match-with-non-langstring.out
+++ b/tests/core/langstring/match-with-non-langstring.out
@@ -1 +1 @@
-"c"
+"http://example/c"
diff --git a/tests/core/langstring/strlang.out b/tests/core/langstring/strlang.out
index 231f150c5..512c727b3 100644
--- a/tests/core/langstring/strlang.out
+++ b/tests/core/langstring/strlang.out
@@ -1 +1 @@
-"a"
+"http://example/a"
diff --git a/tests/core/lists/data-list-in-object.rq b/tests/core/lists/data-list-in-object.rq
index c033f459e..155220973 100644
--- a/tests/core/lists/data-list-in-object.rq
+++ b/tests/core/lists/data-list-in-object.rq
@@ -1,5 +1,5 @@
 INSERT {
-	<a> a example:A ;
+	example:a a example:A ;
 	    example:label "root" ;
 	    example:list ( [ a example:A ; example:label "elem1" ]
 	                   [ a example:A ; example:label "elem2" ]
diff --git a/tests/core/lists/data-list-in-select.rq b/tests/core/lists/data-list-in-select.rq
index c033f459e..155220973 100644
--- a/tests/core/lists/data-list-in-select.rq
+++ b/tests/core/lists/data-list-in-select.rq
@@ -1,5 +1,5 @@
 INSERT {
-	<a> a example:A ;
+	example:a a example:A ;
 	    example:label "root" ;
 	    example:list ( [ a example:A ; example:label "elem1" ]
 	                   [ a example:A ; example:label "elem2" ]
diff --git a/tests/core/property-paths/data-3.rq b/tests/core/property-paths/data-3.rq
index 87da24ec1..0d2bb1330 100644
--- a/tests/core/property-paths/data-3.rq
+++ b/tests/core/property-paths/data-3.rq
@@ -1,12 +1,12 @@
 INSERT {
-  GRAPH <A> {
+  GRAPH <http://example/A> {
     _:a a foaf:Person ;
         foaf:name "a" ;
         foaf:knows _:b .
     _:b a foaf:Person ;
         foaf:name "A_b" .
   }
-  GRAPH <B> {
+  GRAPH <http://example/B> {
     _:a a foaf:Person;
         foaf:knows _:c .
     _:c a foaf:Person ;
diff --git a/tests/core/property-paths/mixed-graphs.rq b/tests/core/property-paths/mixed-graphs.rq
index 4c7bb155e..b6a418103 100644
--- a/tests/core/property-paths/mixed-graphs.rq
+++ b/tests/core/property-paths/mixed-graphs.rq
@@ -1,9 +1,9 @@
 SELECT ?a ?n1 ?n2 {
-  GRAPH <A> {
+  GRAPH <http://example/A> {
     ?u foaf:name ?a ;
        foaf:knows/foaf:name ?n1
   }
-  GRAPH <B> {
+  GRAPH <http://example/B> {
     ?u foaf:knows/foaf:name ?n2
   }
 }
diff --git a/tests/core/turtle/test.ontology b/tests/core/turtle/test.ontology
index 648342cf4..ce1e50ed1 100644
--- a/tests/core/turtle/test.ontology
+++ b/tests/core/turtle/test.ontology
@@ -7,7 +7,7 @@
 @prefix f: <http://example.org/ns3#> .
 @prefix b: <http://example.org/b2#> .
 @prefix bz: <http://example.org/b2> .
-@prefix bar: <bar#> .
+@prefix bar: <http://example.org/bar#> .
 
 foo: a nrl:Namespace ;
 	nrl:prefix "foo" .
@@ -63,8 +63,8 @@ bar:b5 a rdf:Property ;
 	rdfs:domain rdfs:Resource ;
 	rdfs:range rdfs:Resource .
 
-<c1> a rdfs:Resource .
-<c2> a rdfs:Resource .
-<c3> a rdfs:Resource .
+<http://example.org/c1> a rdfs:Resource .
+<http://example.org/c2> a rdfs:Resource .
+<http://example.org/c3> a rdfs:Resource .
 :c4 a rdfs:Resource .
 :c5 a rdfs:Resource .
diff --git a/tests/functional-tests/insertion.py b/tests/functional-tests/insertion.py
index 56390dc48..769aec7ae 100644
--- a/tests/functional-tests/insertion.py
+++ b/tests/functional-tests/insertion.py
@@ -649,7 +649,7 @@ class TrackerStoreDeleteTests (fixtures.TrackerSparqlDirectTest):
                    <test://instance-test-delete-01> a nmm:MusicPiece, nfo:FileDataObject;
                             nfo:fileName '11_song_del.mp3';
                             nfo:genre 'Classic delete';
-                            nmm:musicAlbum '1_Album_delete';
+                            nmm:musicAlbum <test://1_Album_delete>;
                             nmm:performer <urn:uuid:7646001>.
                 }
                 """)
diff --git a/tests/functional-tests/ontology-rollback.py b/tests/functional-tests/ontology-rollback.py
index cb3e8307d..51fda54aa 100644
--- a/tests/functional-tests/ontology-rollback.py
+++ b/tests/functional-tests/ontology-rollback.py
@@ -265,31 +265,31 @@ class SimpleOntologyRollback (OntologyRollbackTestTemplate):
         # test:a_tmp_prop only appeared in the malformed ontology
         with self.assertRaises(GLib.GError):
             self.tracker.update(
-                "INSERT { <t1.1> a test:A ; test:a_tmp_prop 5. }")
+                "INSERT { <http://example/t1.1> a test:A ; test:a_tmp_prop 5. }")
 
         # The domain of test:b_a_domain should be test:A no test:B
         with self.assertRaises(GLib.GError):
             self.tracker.update(
-                "INSERT { <t1.2> a test:B ; test:b_a_domain 5. }")
+                "INSERT { <http://example/t1.2> a test:B ; test:b_a_domain 5. }")
 
         # The domain should be test:B and range be test:A
         with self.assertRaises(GLib.GError):
             self.tracker.update(
-                "INSERT { <t1.3> a test:B . <t1.4> a test:A ; test:a_b_domain_range <t1.3>. }")
+                "INSERT { <http://example/t1.3> a test:B . <t1.4> a test:A ; test:a_b_domain_range <http://example/t1.3>. }")
 
         # test2:C should be subclass of test:B not test:A
         with self.assertRaises(GLib.GError):
             self.tracker.update(
-                "INSERT { <t1.5> a test2:C ; test:b_a_domain 5. }")
+                "INSERT { <http://example/t1.5> a test2:C ; test:b_a_domain 5. }")
 
         self.tracker.update(
-            "INSERT { <t1.6> a test:A ; test:b_a_domain 5. }")
+            "INSERT { <http://example/t1.6> a test:A ; test:b_a_domain 5. }")
 
         self.tracker.update(
-            "INSERT { <t1.7> a test:B ; test:a_b_domain_range <t1.6>. }")
+            "INSERT { <http://example/t1.7> a test:B ; test:a_b_domain_range <http://example/t1.6>. }")
 
         self.tracker.update(
-            "INSERT { <t1.8> a test2:C ; test:b_range_boolean_string \"String\". }")
+            "INSERT { <http://example/t1.8> a test2:C ; test:b_range_boolean_string \"String\". }")
 
     def validate_first_ontology_status(self):
         result = self.tracker.query(
@@ -309,10 +309,10 @@ class SimpleOntologyRollback (OntologyRollbackTestTemplate):
         # and became test:A in the error-free ontology
         with self.assertRaises(GLib.GError):
             self.tracker.update(
-                "INSERT { <t2.1> a test:B ; test:a_b_domain 5. }")
+                "INSERT { <http://example/t2.1> a test:B ; test:a_b_domain 5. }")
 
         self.tracker.update(
-            "INSERT { <t2.2> a test:A ; test:a_b_domain 5. }")
+            "INSERT { <http://example/t2.2> a test:A ; test:a_b_domain 5. }")
 
     def validate_second_ontology_status(self):
         result = self.tracker.query(
@@ -321,7 +321,7 @@ class SimpleOntologyRollback (OntologyRollbackTestTemplate):
         self.assertEqual(result[0][1], XSD_INTEGER)
 
         result = self.tracker.query(
-            "SELECT ?v WHERE { <t2.2> test:a_b_domain ?v }")
+            "SELECT ?v WHERE { <http://example/t2.2> test:a_b_domain ?v }")
         self.assertEqual(result[0][0], "5")
 
 if __name__ == "__main__":
diff --git a/tests/functional-tests/portal.py b/tests/functional-tests/portal.py
index 057ea3f10..1cc0717bc 100644
--- a/tests/functional-tests/portal.py
+++ b/tests/functional-tests/portal.py
@@ -52,14 +52,14 @@ class TestPortal(fixtures.TrackerPortalTest):
         self.update(
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Disallowed;' +
-            'INSERT { GRAPH tracker:Disallowed { <a> a nfo:FileDataObject } };' +
+            'INSERT { GRAPH tracker:Disallowed { <http://example/a> a nfo:FileDataObject } };' +
             'CREATE GRAPH tracker:Allowed;' +
-            'INSERT { GRAPH tracker:Allowed { <b> a nfo:FileDataObject } }')
+            'INSERT { GRAPH tracker:Allowed { <http://example/b> a nfo:FileDataObject } }')
         res = self.query(
             'org.freedesktop.PortalTest',
             'select ?u { ?u a rdfs:Resource }')
         self.assertEqual(len(res), 1)
-        self.assertEqual(res[0][0], 'b')
+        self.assertEqual(res[0][0], 'http://example/b')
 
     def test_04_rows_cols(self):
         self.start_service('org.freedesktop.PortalTest')
@@ -116,10 +116,10 @@ class TestPortal(fixtures.TrackerPortalTest):
 
         self.update(
             'org.freedesktop.PortalTest',
-            'INSERT { GRAPH tracker:Disallowed { <a> a nmm:MusicPiece } }')
+            'INSERT { GRAPH tracker:Disallowed { <http://example/a> a nmm:MusicPiece } }')
         self.update(
             'org.freedesktop.PortalTest',
-            'INSERT { GRAPH tracker:Allowed { <b> a nmm:MusicPiece } }')
+            'INSERT { GRAPH tracker:Allowed { <http://example/b> a nmm:MusicPiece } }')
 
         self.__wait_for_notifier()
         notifier.signal_unsubscribe(signalId);
@@ -127,7 +127,7 @@ class TestPortal(fixtures.TrackerPortalTest):
 
         # Only one event is expected, from the allowed graph
         self.assertEqual(len(self.notifier_events), 1);
-        self.assertEqual(self.notifier_events[0].get_urn(), 'b')
+        self.assertEqual(self.notifier_events[0].get_urn(), 'http://example/b')
         conn.close()
 
     def test_06_id_access(self):
@@ -135,7 +135,7 @@ class TestPortal(fixtures.TrackerPortalTest):
         self.update(
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Allowed;' +
-            'INSERT { GRAPH tracker:Allowed { <b> a nfo:FileDataObject } }')
+            'INSERT { GRAPH tracker:Allowed { <http://example/b> a nfo:FileDataObject } }')
         res = self.query(
             'org.freedesktop.PortalTest',
             'select tracker:id(xsd:string) tracker:uri(1) { }')
@@ -145,10 +145,10 @@ class TestPortal(fixtures.TrackerPortalTest):
 
         res = self.query(
             'org.freedesktop.PortalTest',
-            'select tracker:id(<b>) tracker:uri(tracker:id(<b>)) { }')
+            'select tracker:id(<http://example/b>) tracker:uri(tracker:id(<http://example/b>)) { }')
         self.assertEqual(len(res), 1)
         self.assertNotEqual(res[0][0], '0')
-        self.assertEqual(res[0][1], 'b')
+        self.assertEqual(res[0][1], 'http://example/b')
 
     def test_07_id_access_disallowed(self):
         self.start_service('org.freedesktop.PortalTest')
@@ -157,10 +157,10 @@ class TestPortal(fixtures.TrackerPortalTest):
         self.update(
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Disallowed;' +
-            'INSERT { GRAPH tracker:Disallowed { <b> a nfo:FileDataObject } }')
+            'INSERT { GRAPH tracker:Disallowed { <http://example/b> a nfo:FileDataObject } }')
         res = self.query(
             'org.freedesktop.PortalTest',
-            'select tracker:id(<b>) tracker:uri(tracker:id(<b>)) { }')
+            'select tracker:id(<http://example/b>) tracker:uri(tracker:id(<http://example/b>)) { }')
         self.assertEqual(len(res), 1)
         self.assertEqual(res[0][0], '0')
         self.assertIsNone(res[0][1])
@@ -169,22 +169,22 @@ class TestPortal(fixtures.TrackerPortalTest):
         self.update(
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Allowed;' +
-            'INSERT { GRAPH tracker:Allowed { <b> a nfo:FileDataObject } }')
+            'INSERT { GRAPH tracker:Allowed { <http://example/b> a nfo:FileDataObject } }')
         res = self.query(
             'org.freedesktop.PortalTest',
-            'select tracker:id(<b>) tracker:uri(tracker:id(<b>)) { }')
+            'select tracker:id(<http://example/b>) tracker:uri(tracker:id(<http://example/b>)) { }')
         self.assertEqual(len(res), 1)
         self.assertNotEqual(res[0][0], '0')
-        self.assertEqual(res[0][1], 'b')
+        self.assertEqual(res[0][1], 'http://example/b')
         resourceId = res[0][0];
 
         # Delete resource from allowed graph, ensure it is not visible again
         self.update(
             'org.freedesktop.PortalTest',
-            'DELETE { GRAPH tracker:Allowed { <b> a rdfs:Resource } }')
+            'DELETE { GRAPH tracker:Allowed { <http://example/b> a rdfs:Resource } }')
         res = self.query(
             'org.freedesktop.PortalTest',
-            'select tracker:id(<b>) tracker:uri(tracker:id(<b>)) tracker:uri(' + str(resourceId) + ') { }')
+            'select tracker:id(<http://example/b>) tracker:uri(tracker:id(<http://example/b>)) tracker:uri(' + str(resourceId) + ') { }')
         self.assertEqual(len(res), 1)
         self.assertEqual(res[0][0], '0')
         self.assertIsNone(res[0][1])
@@ -197,15 +197,15 @@ class TestPortal(fixtures.TrackerPortalTest):
         conn = self.create_local_connection()
         self.update(
             'org.freedesktop.PortalTest',
-            'INSERT { GRAPH tracker:Disallowed { <a> a nmm:MusicPiece } }')
+            'INSERT { GRAPH tracker:Disallowed { <http://example/a> a nmm:MusicPiece } }')
         self.update(
             'org.freedesktop.PortalTest',
-            'INSERT { GRAPH tracker:Allowed { <b> a nmm:MusicPiece } }')
+            'INSERT { GRAPH tracker:Allowed { <http://example/b> a nmm:MusicPiece } }')
 
         # Only one resource is expected, from the allowed graph
         cursor = conn.query('select ?u { SERVICE <dbus:org.freedesktop.PortalTest> { ?u a nmm:MusicPiece } }')
         self.assertTrue(cursor.next())
-        self.assertEqual(cursor.get_string(0)[0], 'b')
+        self.assertEqual(cursor.get_string(0)[0], 'http://example/b')
         self.assertFalse(cursor.next())
         cursor.close()
         conn.close()
@@ -216,7 +216,7 @@ class TestPortal(fixtures.TrackerPortalTest):
         self.update(
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Disallowed;' +
-            'INSERT { GRAPH tracker:Disallowed { <a> a nfo:FileDataObject } }')
+            'INSERT { GRAPH tracker:Disallowed { <http://example/a> a nfo:FileDataObject } }')
 
         res = self.query(
             'org.freedesktop.PortalTest',
@@ -240,11 +240,11 @@ class TestPortal(fixtures.TrackerPortalTest):
         self.update(
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Allowed;' +
-            'INSERT { GRAPH tracker:Allowed { <a> a nfo:FileDataObject } }')
+            'INSERT { GRAPH tracker:Allowed { <http://example/a> a nfo:FileDataObject } }')
         self.update(
             'org.freedesktop.InaccessibleService',
             'CREATE GRAPH tracker:Allowed;' +
-            'INSERT { GRAPH tracker:Allowed { <b> a nfo:FileDataObject } }')
+            'INSERT { GRAPH tracker:Allowed { <http://example/b> a nfo:FileDataObject } }')
 
         try:
             exception = None
@@ -274,8 +274,8 @@ class TestPortal(fixtures.TrackerPortalTest):
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Disallowed;' +
             'INSERT { GRAPH tracker:Disallowed { ' +
-            '  <a> a nfo:FileDataObject ; nfo:fileName "A" ; nie:interpretedAs <b1> .' +
-            '  <b1> a nmm:MusicPiece ; nie:isStoredAs <a> ; nie:title "title2" } }')
+            '  <http://example/a> a nfo:FileDataObject ; nfo:fileName "A" ; nie:interpretedAs <http://example/b1> .' +
+            '  <http://example/b1> a nmm:MusicPiece ; nie:isStoredAs <http://example/a> ; nie:title "title2" } }')
 
         # Test property paths with allowed/disallowed graphs in both ends
         res = self.query(
@@ -293,22 +293,22 @@ class TestPortal(fixtures.TrackerPortalTest):
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Allowed;' +
             'INSERT { GRAPH tracker:Allowed { ' +
-            '  <a> a nfo:FileDataObject ; nfo:fileName "A" ; nie:interpretedAs <a1> .' +
-            '  <a1> a nmm:MusicPiece ; nie:isStoredAs <a> ; nie:title "title1" } }')
+            '  <http://example/a> a nfo:FileDataObject ; nfo:fileName "A" ; nie:interpretedAs <http://example/a1> .' +
+            '  <http://example/a1> a nmm:MusicPiece ; nie:isStoredAs <http://example/a> ; nie:title "title1" } }')
 
         # Try the queries again
         res = self.query(
             'org.freedesktop.PortalTest',
             'select ?u ?t { ?u nie:interpretedAs/nie:title ?t }')
         self.assertEqual(len(res), 1)
-        self.assertEqual(res[0][0], 'a')
+        self.assertEqual(res[0][0], 'http://example/a')
         self.assertEqual(res[0][1], 'title1')
 
         res = self.query(
             'org.freedesktop.PortalTest',
             'select ?u ?fn { ?u nie:isStoredAs/nfo:fileName ?fn }')
         self.assertEqual(len(res), 1)
-        self.assertEqual(res[0][0], 'a1')
+        self.assertEqual(res[0][0], 'http://example/a1')
         self.assertEqual(res[0][1], 'A')
 
         res = self.query(
@@ -340,8 +340,8 @@ class TestPortal(fixtures.TrackerPortalTest):
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Disallowed;' +
             'INSERT { GRAPH tracker:Disallowed { ' +
-            '  <a> a nfo:FileDataObject ; nie:interpretedAs <b1> .' +
-            '  <b1> a nmm:MusicPiece ; nie:isStoredAs <a> ; nie:title "apples and oranges" } }')
+            '  <http://example/a> a nfo:FileDataObject ; nie:interpretedAs <http://example/b1> .' +
+            '  <http://example/b1> a nmm:MusicPiece ; nie:isStoredAs <http://example/a> ; nie:title "apples and oranges" } }')
 
         # Query for both keywords, they are expected to be non-visible
         res = self.query(
@@ -359,15 +359,15 @@ class TestPortal(fixtures.TrackerPortalTest):
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Allowed;' +
             'INSERT { GRAPH tracker:Allowed { ' +
-            '  <a> a nfo:FileDataObject ; nfo:fileName "file name" ; nie:interpretedAs <a1> .' +
-            '  <a1> a nmm:MusicPiece ; nie:isStoredAs <a> ; nie:title "apples" } }')
+            '  <http://example/a> a nfo:FileDataObject ; nfo:fileName "file name" ; nie:interpretedAs <http://example/a1> .' +
+            '  <http://example/a1> a nmm:MusicPiece ; nie:isStoredAs <http://example/a> ; nie:title "apples" } }')
 
         # Try the queries again, we should get a match from the allowed graph for 'apples'
         res = self.query(
             'org.freedesktop.PortalTest',
             'select ?u { ?u fts:match "apples" }')
         self.assertEqual(len(res), 1)
-        self.assertEqual(res[0][0], 'a1')
+        self.assertEqual(res[0][0], 'http://example/a1')
 
         res = self.query(
             'org.freedesktop.PortalTest',
@@ -403,7 +403,7 @@ class TestPortal(fixtures.TrackerPortalTest):
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Disallowed;' +
             'INSERT { GRAPH tracker:Disallowed { ' +
-            '  <a> a nfo:FileDataObject ; nfo:fileName "A" . } }')
+            '  <http://example/a> a nfo:FileDataObject ; nfo:fileName "A" . } }')
 
         res = self.query(
             'org.freedesktop.PortalTest',
@@ -412,7 +412,7 @@ class TestPortal(fixtures.TrackerPortalTest):
 
         res = self.query(
             'org.freedesktop.PortalTest',
-            'ASK { <a> ?p "A" }')
+            'ASK { <http://example/a> ?p "A" }')
         self.assertEqual(len(res), 1)
         self.assertNotEqual(res[0][0], 'true')
 
@@ -421,18 +421,18 @@ class TestPortal(fixtures.TrackerPortalTest):
             'org.freedesktop.PortalTest',
             'CREATE GRAPH tracker:Allowed;' +
             'INSERT { GRAPH tracker:Allowed { ' +
-            '  <a> a nfo:FileDataObject ; nfo:fileName "A" . } }')
+            '  <http://example/a> a nfo:FileDataObject ; nfo:fileName "A" . } }')
 
         # Try the queries again
         res = self.query(
             'org.freedesktop.PortalTest',
             'select ?s { ?s ?p "A" }')
         self.assertEqual(len(res), 1)
-        self.assertEqual(res[0][0], 'a')
+        self.assertEqual(res[0][0], 'http://example/a')
 
         res = self.query(
             'org.freedesktop.PortalTest',
-            'ASK { <a> ?p "A" }')
+            'ASK { <http://example/a> ?p "A" }')
         self.assertEqual(len(res), 1)
         self.assertEqual(res[0][0], 'true')
 
diff --git a/tests/libtracker-sparql/serialize/construct-trig.out b/tests/libtracker-sparql/serialize/construct-trig.out
index 65d6809e3..dd99506a3 100644
--- a/tests/libtracker-sparql/serialize/construct-trig.out
+++ b/tests/libtracker-sparql/serialize/construct-trig.out
@@ -15,7 +15,7 @@
 @prefix mfo: <http://tracker.api.gnome.org/ontology/v3/mfo#> .
 
 {
-  <a> <http://example.com/#prop> "Foo" .
+  <http://example/a> <http://example.com/#prop> "Foo" .
 
-  <b> <http://example.com/#prop> "Foo" .
+  <http://example/b> <http://example.com/#prop> "Foo" .
 }
diff --git a/tests/libtracker-sparql/serialize/construct-ttl.out b/tests/libtracker-sparql/serialize/construct-ttl.out
index 432f87a3c..9489c452a 100644
--- a/tests/libtracker-sparql/serialize/construct-ttl.out
+++ b/tests/libtracker-sparql/serialize/construct-ttl.out
@@ -14,6 +14,6 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix mfo: <http://tracker.api.gnome.org/ontology/v3/mfo#> .
 
-<a> <http://example.com/#prop> "Foo" .
+<http://example/a> <http://example.com/#prop> "Foo" .
 
-<b> <http://example.com/#prop> "Foo" .
+<http://example/b> <http://example.com/#prop> "Foo" .
diff --git a/tests/libtracker-sparql/serialize/describe-graph-trig.out b/tests/libtracker-sparql/serialize/describe-graph-trig.out
index 34c832c29..323a1e0d5 100644
--- a/tests/libtracker-sparql/serialize/describe-graph-trig.out
+++ b/tests/libtracker-sparql/serialize/describe-graph-trig.out
@@ -14,33 +14,33 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix mfo: <http://tracker.api.gnome.org/ontology/v3/mfo#> .
 
-GRAPH <B> {
-  <a> nmm:trackNumber 1 .
+GRAPH <http://example/B> {
+  <http://example/a> nmm:trackNumber 1 .
 
-  <b> nmm:beatsPerMinute 120 .
+  <http://example/b> nmm:beatsPerMinute 120 .
 }
 
-GRAPH <A> {
-  <a> nie:title "Aaa" ;
+GRAPH <http://example/A> {
+  <http://example/a> nie:title "Aaa" ;
     dc:title "Aaa" ;
 }
 
-GRAPH <B> {
+GRAPH <http://example/B> {
 
 }
 
-GRAPH <A> {
+GRAPH <http://example/A> {
 }
 
-GRAPH <B> {
+GRAPH <http://example/B> {
 }
 
-GRAPH <A> {
-  <a> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
+GRAPH <http://example/A> {
+  <http://example/a> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
 }
 
-GRAPH <B> {
-  <a> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
+GRAPH <http://example/B> {
+  <http://example/a> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
 
-  <b> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
+  <http://example/b> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
 }
diff --git a/tests/libtracker-sparql/serialize/describe-graph-ttl.out b/tests/libtracker-sparql/serialize/describe-graph-ttl.out
index f6e9b5199..196f83d8e 100644
--- a/tests/libtracker-sparql/serialize/describe-graph-ttl.out
+++ b/tests/libtracker-sparql/serialize/describe-graph-ttl.out
@@ -14,16 +14,16 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix mfo: <http://tracker.api.gnome.org/ontology/v3/mfo#> .
 
-<a> nmm:trackNumber 1 .
+<http://example/a> nmm:trackNumber 1 .
 
-<b> nmm:beatsPerMinute 120 .
+<http://example/b> nmm:beatsPerMinute 120 .
 
-<a> nie:title "Aaa" ;
+<http://example/a> nie:title "Aaa" ;
   dc:title "Aaa" ;
 
 
 
 
-<a> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece, rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
+<http://example/a> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece, rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
 
-<b> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
+<http://example/b> rdf:type rdfs:Resource, nie:InformationElement, nfo:Media, nmm:MusicPiece .
diff --git a/tests/libtracker-sparql/tracker-serialize-test.c b/tests/libtracker-sparql/tracker-serialize-test.c
index 7caa21caa..d37bbd931 100644
--- a/tests/libtracker-sparql/tracker-serialize-test.c
+++ b/tests/libtracker-sparql/tracker-serialize-test.c
@@ -204,24 +204,24 @@ populate_data (TrackerSparqlConnection *conn)
 	GError *error = NULL;
 
 	/* Add some test data in different graphs */
-	res = tracker_resource_new ("a");
+	res = tracker_resource_new ("http://example/a");
 	tracker_resource_set_uri (res, "rdf:type", "nmm:MusicPiece");
 	tracker_resource_set_uri (res, "nie:title", "Aaa");
-	tracker_sparql_connection_update_resource (conn, "A", res, NULL, &error);
+	tracker_sparql_connection_update_resource (conn, "http://example/A", res, NULL, &error);
 	g_assert_no_error (error);
 	g_object_unref (res);
 
-	res = tracker_resource_new ("a");
+	res = tracker_resource_new ("http://example/a");
 	tracker_resource_set_uri (res, "rdf:type", "nmm:MusicPiece");
 	tracker_resource_set_int (res, "nmm:trackNumber", 1);
-	tracker_sparql_connection_update_resource (conn, "B", res, NULL, &error);
+	tracker_sparql_connection_update_resource (conn, "http://example/B", res, NULL, &error);
 	g_assert_no_error (error);
 	g_object_unref (res);
 
-	res = tracker_resource_new ("b");
+	res = tracker_resource_new ("http://example/b");
 	tracker_resource_set_uri (res, "rdf:type", "nmm:MusicPiece");
 	tracker_resource_set_int (res, "nmm:beatsPerMinute", 120);
-	tracker_sparql_connection_update_resource (conn, "B", res, NULL, &error);
+	tracker_sparql_connection_update_resource (conn, "http://example/B", res, NULL, &error);
 	g_assert_no_error (error);
 	g_object_unref (res);
 }