Changeset 36964 in project for release/5/uri-generic/trunk/tests


Ignore:
Timestamp:
12/04/18 22:03:55 (4 months ago)
Author:
sjamaan
Message:

uri-generic: Apply changes from relative-paths branch manually

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/5/uri-generic/trunk/tests/run.scm

    r36554 r36964  
    1111    ("http://ex/x/y/z" "http://ex/x/r" "../r")
    1212
    13     ("http://ex/x/y"  "http://ex/x/q/r" "./q/r")
    14     ("http://ex/x/y"  "http://ex/x/q/r#s" "./q/r#s")
    15     ("http://ex/x/y"  "http://ex/x/q/r#s/t" "./q/r#s/t")
     13    ("http://ex/x/y"  "http://ex/x/q/r" "q/r")
     14    ("http://ex/x/y"  "http://ex/x/q/r#s" "q/r#s")
     15    ("http://ex/x/y"  "http://ex/x/q/r#s/t" "q/r#s/t")
    1616    ("http://ex/x/y"  "ftp://ex/x/q/r" "ftp://ex/x/q/r")
    17     ("http://ex/x/y"  "http://ex/x/y"   "")
    18     ("http://ex/x/y/" "http://ex/x/y/"  "")
    19     ("http://ex/x/y/pdq" "http://ex/x/y/pdq" "")
    20     ("http://ex/x/y/" "http://ex/x/y/z/" "./z/")
    21     ("file:/swap/test/animal.rdf" "file:/swap/test/animal.rdf#Animal" "#Animal")
     17    ("http://ex/x/y"  "http://ex/x/y"   "y")
     18    ("http://ex/x/y/" "http://ex/x/y/"  ".")
     19    ("http://ex/x/y/pdq" "http://ex/x/y/pdq" "pdq")
     20    ("http://ex/x/y/" "http://ex/x/y/z/" "z/")
     21    ("file:/swap/test/animal.rdf" "file:/swap/test/animal.rdf#Animal" "animal.rdf#Animal")
    2222    ("file:/e/x/y/z" "file:/e/x/abc" "../abc")
    23     ("file:/example2/x/y/z" "file:/example/x/abc" "/example/x/abc")   
     23    ("file:/example2/x/y/z" "file:/example/x/abc" "../../../example/x/abc")
    2424    ("file:/ex/x/y/z" "file:/ex/x/r" "../r")
    25     ("file:/ex/x/y/z" "file:/r" "/r")       
    26     ("file:/ex/x/y" "file:/ex/x/q/r" "./q/r")
    27     ("file:/ex/x/y" "file:/ex/x/q/r#s" "./q/r#s")
    28     ("file:/ex/x/y" "file:/ex/x/q/r#" "./q/r#")
    29     ("file:/ex/x/y" "file:/ex/x/q/r#s/t" "./q/r#s/t")
     25    ("file:/ex/x/y/z" "file:/r" "../../../r")
     26    ("file:/ex/x/y" "file:/ex/x/q/r" "q/r")
     27    ("file:/ex/x/y" "file:/ex/x/q/r#s" "q/r#s")
     28    ("file:/ex/x/y" "file:/ex/x/q/r#" "q/r#")
     29    ("file:/ex/x/y" "file:/ex/x/q/r#s/t" "q/r#s/t")
    3030    ("file:/ex/x/y" "ftp://ex/x/q/r" "ftp://ex/x/q/r")
    31     ("file:/ex/x/y" "file:/ex/x/y" "")
    32     ("file:/ex/x/y/" "file:/ex/x/y/" "")
    33     ("file:/ex/x/y/pdq" "file:/ex/x/y/pdq" "")
    34     ("file:/ex/x/y/" "file:/ex/x/y/z/" "./z/")
     31    ("file:/ex/x/y" "file:/ex/x/y" "y")
     32    ("file:/ex/x/y/" "file:/ex/x/y/" ".")
     33    ("file:/ex/x/y/pdq" "file:/ex/x/y/pdq" "pdq")
     34    ("file:/ex/x/y/" "file:/ex/x/y/z/" "z/")
    3535    ("file:/devel/WWW/2000/10/swap/test/reluri-1.n3" "file://meetings.example.com/cal#m1"
    3636     "//meetings.example.com/cal#m1")
    3737    ("file:/home/connolly/w3ccvs/WWW/2000/10/swap/test/reluri-1.n3" "file://meetings.example.com/cal#m1"
    3838     "//meetings.example.com/cal#m1")
    39     ("file:/some/dir/foo" "file:/some/dir/#blort" "./#blort")
    40     ("file:/some/dir/foo" "file:/some/dir/#" "./#")
     39    ("file:/some/dir/foo" "file:/some/dir/#blort" ".#blort")
     40    ("file:/some/dir/foo" "file:/some/dir/#" ".#")
    4141    ;; From Graham Klyne Thu 20 Feb 2003 18:08:17 +0000
    42     ("http://example/x/y%2Fz"  "http://example/x/abc"     "./abc")
    43     ("http://example/x/y/z"    "http://example/x%2Fabc"   "/x%2Fabc")
    44     ("http://example/x/y%2Fz"  "http://example/x%2Fabc"   "/x%2Fabc")
    45     ("http://example/x%2Fy/z"  "http://example/x%2Fy/abc" "./abc")
     42    ("http://example/x/y%2Fz"  "http://example/x/abc"     "abc")
     43    ("http://example/x/y/z"    "http://example/x%2Fabc"   "../../x%2Fabc")
     44    ("http://example/x/y%2Fz"  "http://example/x%2Fabc"   "../x%2Fabc")
     45    ("http://example/x%2Fy/z"  "http://example/x%2Fy/abc" "abc")
    4646    ;; Ryan Lee
    47     ("http://example/x/abc.efg" "http://example/x/" "./")
     47    ("http://example/x/abc.efg" "http://example/x/" ".")
    4848    ))
    4949
     
    145145
    146146(define reverse-extra-cases
    147   `((,base ,base "")
    148     (,base "http://a/b/c/e" "./e")
    149     (,base "http://a/b/c/" "./")  ;; Not sure if the trailing slash belongs here
     147  `((,base ,base "d;p")
     148    (,base "http://a/b/c/e" "e")
     149    (,base "http://a/b/c/" ".")
    150150    (,base "http://a/b/e" "../e")
    151151    (,base "http://a/b/c" "../c") ;; Slightly weird: dir in base, file in target
    152     (,base "http://a/b/" "../")
    153     (,base "http://a/" "/") ;; or "../../"
     152    (,base "http://a/b/" "..")
     153    (,base "http://a/" "../..") ;; or "/", but that's not convenient
    154154    (,base "http://a" "//a") ; No relative representation possible
    155155    (,base "http://b" "//b")
     
    157157    (,base "http://b/c" "//b/c")
    158158    (,base "ftp://a/b/c/d;p?q" "ftp://a/b/c/d;p?q")
    159     (,base "ftp://x/y/z;a?b" "ftp://x/y/z;a?b")))
     159    (,base "ftp://x/y/z;a?b" "ftp://x/y/z;a?b")
     160    ;; Found by Jim Ursetto.  This would become "", which is not
     161    ;; right when both are directories (see second case)
     162    ("/foo/bar" "/foo/bar" "bar")
     163    ("/foo/bar/" "/foo/bar/" ".")))
    160164
    161165(test-group "uri test"
Note: See TracChangeset for help on using the changeset viewer.