Changeset 12610

Timestamp:

04/15/10 14:36:59 (13 years ago)

Author:

Mark Evenson

Message:

Separate jar and URL pathname tests into distinct files.

Location:

trunk/abcl

Files:

• abcl.asd (modified) (1 diff)
• test/lisp/abcl/jar-pathname.lisp (moved) (moved from trunk/abcl/test/lisp/abcl/jar-file.lisp) (15 diffs)
• test/lisp/abcl/url-pathname.lisp (added)

trunk/abcl/abcl.asd

@@ -36 +36 @@
                       (:file "mop-tests" :depends-on ("mop-tests-setup"))
                       (:file "file-system-tests")
-                      (:file "jar-file" :depend-on ("pathname-test"))
+                      (:file "jar-pathname" :depend-on ("pathname-test"))
+                      (:file "url-pathname")
                       (:file "math-tests")
                       (:file "misc-tests")

trunk/abcl/test/lisp/abcl/jar-pathname.lisp

@@ -72 +72 @@
        ,@body)))
 
-#+nil
-(defmacro with-jar-file-init (&rest body)
-  `(progv '(*default-pathname-defaults*) '(,*abcl-test-directory*)
-    (unless *jar-file-init*
-      (load-init))
-    ,@body))
-
-(deftest jar-file.load.1
+(deftest jar-pathname.load.1
     (with-jar-file-init
       (load "jar:file:baz.jar!/foo"))
   t)
 
-(deftest jar-file.load.2
+(deftest jar-pathname.load.2
     (with-jar-file-init
       (load "jar:file:baz.jar!/bar"))
   t)
 
-(deftest jar-file.load.3
+(deftest jar-pathname.load.3
     (with-jar-file-init
       (load "jar:file:baz.jar!/bar.abcl"))
   t)
 
-(deftest jar-file.load.4
+(deftest jar-pathname.load.4
     (with-jar-file-init
       (load "jar:file:baz.jar!/eek"))
   t)
 
-(deftest jar-file.load.5
+(deftest jar-pathname.load.5
     (with-jar-file-init
       (load "jar:file:baz.jar!/eek.lisp"))
   t)
 
-(deftest jar-file.load.6
+(deftest jar-pathname.load.6
     (with-jar-file-init
       (load "jar:file:baz.jar!/a/b/foo"))
   t)
 
-(deftest jar-file.load.7
+(deftest jar-pathname.load.7
     (with-jar-file-init
       (load "jar:file:baz.jar!/a/b/bar"))
   t)
 
-(deftest jar-file.load.8
+(deftest jar-pathname.load.8
     (with-jar-file-init
       (load "jar:file:baz.jar!/a/b/bar.abcl"))
   t)
 
-(deftest jar-file.load.9
+(deftest jar-pathname.load.9
     (with-jar-file-init
       (load "jar:file:baz.jar!/a/b/eek"))
   t)
 
-(deftest jar-file.load.10
+(deftest jar-pathname.load.10
     (with-jar-file-init
       (load "jar:file:baz.jar!/a/b/eek.lisp"))
@@ -133 +126 @@
 
 (progn 
-  (deftest jar-file.load.11
+  (deftest jar-pathname.load.11
       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/foo")
     t)
 
-  (deftest jar-file.load.12
+  (deftest jar-pathname.load.12
       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/bar")
     t)
 
-  (deftest jar-file.load.13
+  (deftest jar-pathname.load.13
       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/bar.abcl")
     t)
 
-  (deftest jar-file.load.14
+  (deftest jar-pathname.load.14
       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/eek")
     t)
 
-  (deftest jar-file.load.15
+  (deftest jar-pathname.load.15
       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/eek.lisp")
     t)
 
-  (deftest jar-file.load.16
+  (deftest jar-pathname.load.16
       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/foo")
     t)
 
-  (deftest jar-file.load.17
+  (deftest jar-pathname.load.17
       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/bar")
     t)
 
-  (deftest jar-file.load.18
+  (deftest jar-pathname.load.18
       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/bar.abcl")
     t)
 
-  (deftest jar-file.load.19
+  (deftest jar-pathname.load.19
       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/eek")
     t)
 
-  (deftest jar-file.load.20
+  (deftest jar-pathname.load.20
       (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/eek.lisp")
     t))
 
 
-(deftest jar-file.probe-file.1
+(deftest jar-pathname.probe-file.1
     (with-jar-file-init
         (probe-file "jar:file:baz.jar!/eek.lisp"))
@@ -180 +173 @@
               (namestring *abcl-test-directory*)))
 
-(deftest jar-file.probe-file.2
+(deftest jar-pathname.probe-file.2
     (with-jar-file-init
         (probe-file "jar:file:baz.jar!/a/b/bar.abcl"))
@@ -186 +179 @@
               (namestring *abcl-test-directory*)))
 
-(deftest jar-file.probe-file.3
+(deftest jar-pathname.probe-file.3
     (with-jar-file-init
         (probe-file "jar:jar:file:baz.jar!/a/b/bar.abcl!/bar._"))
@@ -192 +185 @@
                        (namestring *abcl-test-directory*)))
 
-(deftest jar-file.probe-file.4
+(deftest jar-pathname.probe-file.4
     (with-jar-file-init
         (probe-file "jar:file:baz.jar!/a/b"))
   nil)
 
-(deftest jar-file.probe-file.5
+(deftest jar-pathname.probe-file.5
     (with-jar-file-init
         (probe-file "jar:file:baz.jar!/a/b/"))
@@ -203 +196 @@
                        (namestring *abcl-test-directory*)))
 
-(deftest jar-file.merge-pathnames.1
+(deftest jar-pathname.merge-pathnames.1
     (merge-pathnames 
      "/bar.abcl" #p"jar:file:baz.jar!/foo")
   #p"jar:file:baz.jar!/bar.abcl")
 
-(deftest jar-file.merge-pathnames.2
+(deftest jar-pathname.merge-pathnames.2
     (merge-pathnames 
      "bar.abcl" #p"jar:file:baz.jar!/foo/")
   #p"jar:file:baz.jar!/foo/bar.abcl")
 
-(deftest jar-file.merge-pathnames.3
+(deftest jar-pathname.merge-pathnames.3
     (merge-pathnames 
      "jar:file:baz.jar!/foo" "bar")
   #p"jar:file:baz.jar!/foo")
 
-(deftest jar-file.merge-pathnames.4
+(deftest jar-pathname.merge-pathnames.4
     (merge-pathnames 
      "jar:file:baz.jar!/foo" "/a/b/c")
   #p"jar:file:/a/b/baz.jar!/foo")
 
-(deftest jar-file.merge-pathnames.5
+(deftest jar-pathname.merge-pathnames.5
     (merge-pathnames "jar:file:/a/b/c/foo.jar!/bar/baz.lisp")
   #p"jar:file:/a/b/c/foo.jar!/bar/baz.lisp")
 
-(deftest jar-file.truename.1
+(deftest jar-pathname.truename.1
     (signals-error (truename "jar:file:baz.jar!/foo")
                    'file-error)
   t)
 
-(deftest jar-file.pathname.1
+(deftest jar-pathname.1
     (let* ((p #p"jar:file:foo/baz.jar!/")
            (d (first (pathname-device p))))
@@ -239 +232 @@
   (:relative "foo") "baz" "jar")
 
-(deftest jar-file.pathname.2
+(deftest jar-pathname.2
     (let* ((p #p"jar:file:baz.jar!/foo.abcl")
            (d (first (pathname-device p))))
@@ -248 +241 @@
    (:absolute) "foo" "abcl")
    
-(deftest jar-file.pathname.3
+(deftest jar-pathname.3
     (let* ((p #p"jar:jar:file:baz.jar!/foo.abcl!/")
            (d0 (first (pathname-device p)))
@@ -258 +251 @@
   "foo" "abcl")
 
-(deftest jar-file.pathname.4
+(deftest jar-pathname.4
     (let* ((p #p"jar:jar:file:a/baz.jar!/b/c/foo.abcl!/this/that/foo-20.cls")
            (d0 (first (pathname-device p)))
@@ -270 +263 @@
   (:absolute "this" "that") "foo-20" "cls")
 
-(deftest jar-file.pathname.5
+(deftest jar-pathname.5
     (let* ((p #p"jar:jar:file:a/foo/baz.jar!/b/c/foo.abcl!/armed/bear/bar-1.cls")
            (d0 (first (pathname-device p)))
@@ -282 +275 @@
   (:absolute "armed" "bear") "bar-1" "cls")
 
-(deftest jar-file.pathname.6
+(deftest jar-pathname.6
     (let* ((p #p"jar:http://example.org/abcl.jar!/org/armedbear/lisp/Version.class")
            (d (first (pathname-device p))))
-
       (values 
-       d
-       (pathname-directory p) (pathname-name p) (pathname-type p)))
+       (pathname-url-p d)
+       (namestring d)
+       (pathname-directory p) (pathname-name p) (pathname-type p)))
+  t
   "http://example.org/abcl.jar" 
   (:absolute "org" "armedbear" "lisp") "Version" "class")
 
-(deftest jar-file.pathname.7
+(deftest jar-pathname.7
     (let* ((p #p"jar:jar:http://example.org/abcl.jar!/foo.abcl!/foo-1.cls")
            (d (pathname-device p))
@@ -298 +292 @@
            (d1 (second d)))
       (values
-       d0 
+       (pathname-url-p d0)
+       (namestring d0)
        (pathname-name d1) (pathname-type d1)
        (pathname-name p) (pathname-type p)))
+  t
   "http://example.org/abcl.jar"
   "foo" "abcl"
   "foo-1" "cls")
 
-(deftest jar-file.pathname.8
+(deftest jar-pathname.8
     (let* ((p #p"jar:file:/a/b/foo.jar!/")
            (d (first (pathname-device p))))
@@ -312 +308 @@
   (:ABSOLUTE "a" "b") "foo" "jar")
 
-(deftest jar-file.pathname.9
+(deftest jar-pathname.9
     (let* ((p #p"jar:file:a/b/foo.jar!/c/d/foo.lisp")
            (d (first (pathname-device p))))
@@ -321 +317 @@
   (:absolute "c" "d") "foo" "lisp")
 
-(deftest jar-file.pathname-match-p.1
+(deftest jar-pathname.match-p.1
     (pathname-match-p "jar:file:/a/b/some.jar!/a/system/def.asd"
                       "jar:file:/**/*.jar!/**/*.asd")
   t)
 
-(deftest jar-file.pathname-match-p.2
+(deftest jar-pathname.match-p.2
     (pathname-match-p "/a/system/def.asd"
                       "jar:file:/**/*.jar!/**/*.asd")
   nil)
 
-(deftest jar-file.pathname-match-p.3
+(deftest jar-pathname.match-p.3
     (pathname-match-p "jar:file:/a/b/some.jar!/a/system/def.asd"
                       "/**/*.asd")
   nil)
 
-(deftest jar-file.translate-pathname.1
+(deftest jar-pathname.translate.1
     (namestring
      (translate-pathname "jar:file:/a/b/c.jar!/d/e/f.lisp" 
@@ -343 +339 @@
   "/foo/d/e/f.lisp")
 
-;; URL Pathname tests
-(deftest pathname-url.1
-    (let* ((p #p"http://example.org/a/b/foo.lisp")
-           (host (pathname-host p)))
-      (values 
-       (check-physical-pathname p '(:absolute "a" "b") "foo" "lisp")
-       (and (consp host)
-            (equal (getf host :scheme) 
-                   "http")
-            (equal (getf host :authority)
-                   "example.org"))))
-  (t t))
-