Changeset 12616

Timestamp:

04/15/10 14:54:08 (14 years ago)

Author:

Mark Evenson

Message:

All URL/JAR tests now passing.

Location:

trunk/abcl/test/lisp/abcl

Files:

• jar-pathname.lisp (modified) (2 diffs)
• url-pathname.lisp (modified) (2 diffs)

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

@@ -279 +279 @@
            (d (first (pathname-device p))))
       (values 
-       (pathname-url-p d)
+       (system:pathname-url-p d)
        (namestring d)
        (pathname-directory p) (pathname-name p) (pathname-type p)))
@@ -292 +292 @@
            (d1 (second d)))
       (values
-       (pathname-url-p d0)
+       (system:pathname-url-p d0)
        (namestring d0)
        (pathname-name d1) (pathname-type d1)

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

@@ -2 +2 @@
 
 ;; URL Pathname tests
-(deftest pathname-url.1
+(deftest url-pathname.1
     (let* ((p #p"http://example.org/a/b/foo.lisp")
            (host (pathname-host p)))
@@ -12 +12 @@
             (equal (getf host :authority)
                    "example.org"))))
-  (t t))
+  t t)
 
-(deftest pathname-url.2
-    (let* ((p #p"http://example.org/a/b/foo.lisp?query=this#that-fragment")
+(deftest url-pathname.2
+    (let* ((p (pathname "http://example.org/a/b/foo.lisp?query=this#that-fragment"))
            (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")
-            (equal (getf host :query)
-                   "query=this")
-            (equal (getf host :fragment)
-                   "that-fragment"))))
-  (t t))
+       (consp host)
+       (getf host :scheme) 
+       (getf host :authority)
+       (getf host :query)
+       (getf host :fragment)))
+  t 
+  t
+  "http"
+  "example.org"
+  "query=this"  
+  "that-fragment")