[armedbear-cvs] r12616 - trunk/abcl/test/lisp/abcl

[Mark Evenson]

Author: mevenson
Date: Thu Apr 15 10:54:08 2010
New Revision: 12616

Log:
All URL/JAR tests now passing.



Modified:
   trunk/abcl/test/lisp/abcl/jar-pathname.lisp
   trunk/abcl/test/lisp/abcl/url-pathname.lisp

Modified: trunk/abcl/test/lisp/abcl/jar-pathname.lisp
==============================================================================
--- trunk/abcl/test/lisp/abcl/jar-pathname.lisp	(original)
+++ trunk/abcl/test/lisp/abcl/jar-pathname.lisp	Thu Apr 15 10:54:08 2010
@@ -278,7 +278,7 @@
     (let* ((p #p"jar:http://example.org/abcl.jar!/org/armedbear/lisp/Version.class")
            (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)))
   t
@@ -291,7 +291,7 @@
            (d0 (first d))
            (d1 (second d)))
       (values
-       (pathname-url-p d0)
+       (system:pathname-url-p d0)
        (namestring d0)
        (pathname-name d1) (pathname-type d1)
        (pathname-name p) (pathname-type p)))

Modified: trunk/abcl/test/lisp/abcl/url-pathname.lisp
==============================================================================
--- trunk/abcl/test/lisp/abcl/url-pathname.lisp	(original)
+++ trunk/abcl/test/lisp/abcl/url-pathname.lisp	Thu Apr 15 10:54:08 2010
@@ -1,7 +1,7 @@
 (in-package #:abcl.test.lisp)
 
 ;; 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)))
       (values 
@@ -11,20 +11,21 @@
                    "http")
             (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")
\ No newline at end of file