Ignore:
Timestamp:
05/06/10 07:11:48 (13 years ago)
Author:
Mark Evenson
Message:

Fix JAR-PATHNAME tests.

Use explicit version in LOAD of jar via http URL to account for
changes in FASL versions.

Mark JAR-PATHNAME.MERGE-PATHNAMES.5 as expected failure under win32,
as it includes the DEVICE a merged pathname (as it should).

Use pathname for JAR-PATHNAME.TRANSLATE.1 instead of namestring.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/test/lisp/abcl/jar-pathname.lisp

    r12617 r12654  
    125125;;; XXX come up with a better abstraction
    126126
     127(defvar *url-jar-pathname-base*
     128  "jar:http://abcl-dynamic-install.googlecode.com/files/baz-20100505a.jar!/")
     129
     130(defmacro load-url-relative (path)
     131  `(load (format nil "~A~A" *url-jar-pathname-base* ,path)))
     132
    127133(progn
    128134  (deftest jar-pathname.load.11
    129       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/foo")
     135      (load-url-relative "foo")
    130136    t)
    131137
    132138  (deftest jar-pathname.load.12
    133       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/bar")
     139      (load-url-relative "bar")
    134140    t)
    135141
    136142  (deftest jar-pathname.load.13
    137       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/bar.abcl")
     143      (load-url-relative "bar.abcl")
    138144    t)
    139145
    140146  (deftest jar-pathname.load.14
    141       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/eek")
     147      (load-url-relative "eek")
    142148    t)
    143149
    144150  (deftest jar-pathname.load.15
    145       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/eek.lisp")
     151      (load-url-relative "eek.lisp")
    146152    t)
    147153
    148154  (deftest jar-pathname.load.16
    149       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/foo")
     155      (load-url-relative "a/b/foo")
    150156    t)
    151157
    152158  (deftest jar-pathname.load.17
    153       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/bar")
     159      (load-url-relative "a/b/bar")
    154160    t)
    155161
    156162  (deftest jar-pathname.load.18
    157       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/bar.abcl")
     163      (load-url-relative "a/b/bar.abcl")
    158164    t)
    159165
    160166  (deftest jar-pathname.load.19
    161       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/eek")
     167      (load-url-relative "a/b/eek")
    162168    t)
    163169
    164170  (deftest jar-pathname.load.20
    165       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/eek.lisp")
     171      (load-url-relative "a/b/eek.lisp")
    166172    t))
    167 
    168173
    169174(deftest jar-pathname.probe-file.1
     
    215220     "jar:file:baz.jar!/foo" "/a/b/c")
    216221  #p"jar:file:/a/b/baz.jar!/foo")
     222
     223
     224;;; Under win32, we get the device in the merged path
     225#+windows
     226(push 'jar-pathname.merge-pathnames.5 *expected-failures*)
    217227
    218228(deftest jar-pathname.merge-pathnames.5
     
    333343
    334344(deftest jar-pathname.translate.1
    335     (namestring
    336      (translate-pathname "jar:file:/a/b/c.jar!/d/e/f.lisp"
    337                          "jar:file:/**/*.jar!/**/*.*"
    338                          "/foo/**/*.*"))
    339   "/foo/d/e/f.lisp")
     345    (translate-pathname "jar:file:/a/b/c.jar!/d/e/f.lisp"
     346      "jar:file:/**/*.jar!/**/*.*"
     347      "/foo/**/*.*")
     348  #p"/foo/d/e/f.lisp")
    340349
    341350     
Note: See TracChangeset for help on using the changeset viewer.