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

[Mark Evenson]

Author: mevenson
Date: Thu May  6 03:11:48 2010
New Revision: 12654

Log:
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.



Modified:
   trunk/abcl/test/lisp/abcl/jar-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 May  6 03:11:48 2010
@@ -124,48 +124,53 @@
 ;;; wrapped in PROGN for easy disabling without a network connection
 ;;; XXX come up with a better abstraction
 
+(defvar *url-jar-pathname-base*
+  "jar:http://abcl-dynamic-install.googlecode.com/files/baz-20100505a.jar!/")
+
+(defmacro load-url-relative (path) 
+  `(load (format nil "~A~A" *url-jar-pathname-base* ,path)))
+
 (progn 
   (deftest jar-pathname.load.11
-      (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/foo")
+      (load-url-relative "foo")
     t)
 
   (deftest jar-pathname.load.12
-      (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/bar")
+      (load-url-relative "bar")
     t)
 
   (deftest jar-pathname.load.13
-      (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/bar.abcl")
+      (load-url-relative "bar.abcl")
     t)
 
   (deftest jar-pathname.load.14
-      (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/eek")
+      (load-url-relative "eek")
     t)
 
   (deftest jar-pathname.load.15
-      (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/eek.lisp")
+      (load-url-relative "eek.lisp")
     t)
 
   (deftest jar-pathname.load.16
-      (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/foo")
+      (load-url-relative "a/b/foo")
     t)
 
   (deftest jar-pathname.load.17
-      (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/bar")
+      (load-url-relative "a/b/bar")
     t)
 
   (deftest jar-pathname.load.18
-      (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/bar.abcl")
+      (load-url-relative "a/b/bar.abcl")
     t)
 
   (deftest jar-pathname.load.19
-      (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/eek")
+      (load-url-relative "a/b/eek")
     t)
 
   (deftest jar-pathname.load.20
-      (load "jar:http://abcl-dynamic-install.googlecode.com/files/baz.jar!/a/b/eek.lisp")
+      (load-url-relative "a/b/eek.lisp")
     t))
 
-
 (deftest jar-pathname.probe-file.1
     (with-jar-file-init
         (probe-file "jar:file:baz.jar!/eek.lisp"))
@@ -215,6 +220,11 @@
      "jar:file:baz.jar!/foo" "/a/b/c")
   #p"jar:file:/a/b/baz.jar!/foo")
 
+
+;;; Under win32, we get the device in the merged path
+#+windows 
+(push 'jar-pathname.merge-pathnames.5 *expected-failures*)
+
 (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")
@@ -332,11 +342,10 @@
   nil)
 
 (deftest jar-pathname.translate.1
-    (namestring
-     (translate-pathname "jar:file:/a/b/c.jar!/d/e/f.lisp" 
-                         "jar:file:/**/*.jar!/**/*.*" 
-                         "/foo/**/*.*"))
-  "/foo/d/e/f.lisp")
+    (translate-pathname "jar:file:/a/b/c.jar!/d/e/f.lisp" 
+			"jar:file:/**/*.jar!/**/*.*" 
+			"/foo/**/*.*")
+  #p"/foo/d/e/f.lisp")