You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jh...@apache.org on 2007/05/03 00:31:05 UTC

svn commit: r534640 - /cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java

Author: jheymans
Date: Wed May  2 15:31:04 2007
New Revision: 534640

URL: http://svn.apache.org/viewvc?view=rev&rev=534640
Log:
this is fixed in the latest sourceresolver release

Modified:
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java

Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java?view=diff&rev=534640&r1=534639&r2=534640
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java Wed May  2 15:31:04 2007
@@ -28,7 +28,6 @@
 
     public void testURIHandling() throws Exception {
         final String zipSourceUri = "zip:file://test.zip!/test.xml";
-        final String brokenMacOsXSourceUri = "zip:file:/test.zip!/test.xml";
         Source zipSource;
         SourceResolver resolver = null;
         try {
@@ -43,16 +42,7 @@
                    zipSource instanceof ZipSource);
         assertEquals("Scheme/protocol is wrong.", "zip", zipSource.getScheme());
         String actualZipSourceUri = zipSource.getURI();
-        int index = actualZipSourceUri.indexOf("file://");
-        if (index != -1) {
-            assertEquals("Uri is wrong.", zipSourceUri, actualZipSourceUri);
-        } else {
-            // FIXME: special treatment for OS specific return value, should be
-            //        removed after an update of Excalibur source resolve
-            //        - https://issues.apache.org/jira/browse/COCOON-2022
-            //        - http://thread.gmane.org/gmane.comp.apache.excalibur.devel/2107
-            assertEquals("Uri is wrong.", brokenMacOsXSourceUri, actualZipSourceUri);
-        }
+        assertEquals("Uri is wrong.", zipSourceUri, actualZipSourceUri);
     }
     
 }