From 4bce0925039b3791779149ec7bec69b5359b3e56 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 24 Dec 2011 20:08:44 +0000
Subject: Improve URI resolution to cover most of the abnormal cases from
 RFC3986. Improve test coverage of uri.c.

git-svn-id: http://svn.drobilla.net/serd/trunk@266 490d8e77-9747-427b-9fa3-0b8f29cee8a0
---
 tests/test-uri.out | 14 ++++++++++++++
 tests/test-uri.ttl | 24 +++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/test-uri.out b/tests/test-uri.out
index 1517d2e4..8c984f79 100644
--- a/tests/test-uri.out
+++ b/tests/test-uri.out
@@ -21,6 +21,20 @@
 <http://a/> <http://www.w3.org/2002/07/owl#sameAs> <http://a/> .
 <http://a/> <http://www.w3.org/2002/07/owl#sameAs> <http://a/> .
 <http://a/g> <http://www.w3.org/2002/07/owl#sameAs> <http://a/g> .
+<http://a/g> <http://www.w3.org/2002/07/owl#sameAs> <http://a/g> .
+<http://a/g> <http://www.w3.org/2002/07/owl#sameAs> <http://a/g> .
+<http://a/g> <http://www.w3.org/2002/07/owl#sameAs> <http://a/g> .
+<http://a/g> <http://www.w3.org/2002/07/owl#sameAs> <http://a/g> .
+<http://a/b/c/g.> <http://www.w3.org/2002/07/owl#sameAs> <http://a/b/c/g.> .
+<http://a/b/c/.g> <http://www.w3.org/2002/07/owl#sameAs> <http://a/b/c/.g> .
+<http://a/b/c/g..> <http://www.w3.org/2002/07/owl#sameAs> <http://a/b/c/g..> .
+<http://a/b/c/..g> <http://www.w3.org/2002/07/owl#sameAs> <http://a/b/c/..g> .
+<http://a/b/g> <http://www.w3.org/2002/07/owl#sameAs> <http://a/b/g> .
+<http://a/b/c/g?y/./x> <http://www.w3.org/2002/07/owl#sameAs> <http://a/b/c/g?y/./x> .
+<http://a/b/c/g?y/../x> <http://www.w3.org/2002/07/owl#sameAs> <http://a/b/c/g?y/../x> .
+<http://a/b/c/g#s/./x> <http://www.w3.org/2002/07/owl#sameAs> <http://a/b/c/g#s/./x> .
+<http://a/b/c/g#s/../x> <http://www.w3.org/2002/07/owl#sameAs> <http://a/b/c/g#s/../x> .
+<http://a/.g> <http://www.w3.org/2002/07/owl#sameAs> <http://a/.g> .
 <http://A?aquery> <http://www.w3.org/2002/07/owl#sameAs> <http://A?aquery> .
 <http://A#afragment> <http://www.w3.org/2002/07/owl#sameAs> <http://A#afragment> .
 <http://a/b/c/d;p?aquery> <http://www.w3.org/2002/07/owl#sameAs> <http://a/b/c/d;p?aquery> .
diff --git a/tests/test-uri.ttl b/tests/test-uri.ttl
index 22799360..cbc699ab 100644
--- a/tests/test-uri.ttl
+++ b/tests/test-uri.ttl
@@ -29,7 +29,29 @@
 <../../>  owl:sameAs <http://a/> .
 <../../g> owl:sameAs <http://a/g> .
 
+# 5.4.2. Abnormal Examples
+<../../../g>    owl:sameAs <http://a/g> .
+<../../../../g> owl:sameAs <http://a/g> .
+</./g>          owl:sameAs <http://a/g> .
+</../g>         owl:sameAs <http://a/g> .
+<g.>            owl:sameAs <http://a/b/c/g.> .
+<.g>            owl:sameAs <http://a/b/c/.g> .
+<g..>           owl:sameAs <http://a/b/c/g..> .
+<..g>           owl:sameAs <http://a/b/c/..g> .
+<./../g>        owl:sameAs <http://a/b/g> .
+# Serd only resolves the leading components
+#<./g/.>         owl:sameAs <http://a/b/c/g/> .
+#<g/./h>         owl:sameAs <http://a/b/c/g/h> .
+#<g/../h>        owl:sameAs <http://a/b/c/h> .
+#<g;x=1/./y>     owl:sameAs <http://a/b/c/g;x=1/y> .
+#<g;x=1/../y>    owl:sameAs <http://a/b/c/y> .
+<g?y/./x>       owl:sameAs <http://a/b/c/g?y/./x> .
+<g?y/../x>      owl:sameAs <http://a/b/c/g?y/../x> .
+<g#s/./x>       owl:sameAs <http://a/b/c/g#s/./x> .
+<g#s/../x>      owl:sameAs <http://a/b/c/g#s/../x> .
+      
 # Additional tests for Serd
+</.g>                owl:sameAs <http://a/.g> . 
 <http://A?aquery>    owl:sameAs <http://A?aquery> .
 <http://A#afragment> owl:sameAs <http://A#afragment> .
 <?aquery>            owl:sameAs <http://a/b/c/d;p?aquery> .
@@ -41,4 +63,4 @@
 
 @base <http://C#cfragment> .
 
-</bar>       owl:sameAs <http://C/bar> .
+</bar> owl:sameAs <http://C/bar> .
-- 
cgit v1.2.1