cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r577109 - /cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java
Date Tue, 18 Sep 2007 23:42:19 GMT
Author: joerg
Date: Tue Sep 18 16:42:17 2007
New Revision: 577109

URL: http://svn.apache.org/viewvc?rev=577109&view=rev
Log:
back to the original version though it fails at the moment as well (http://marc.info/?l=xml-cocoon-dev&m=119015848312204&w=4);
hoping for a fast sourceresolve 2.2.4 release

Modified:
    cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java?rev=577109&r1=577108&r2=577109&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java
Tue Sep 18 16:42:17 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 {
@@ -42,17 +41,7 @@
         assertTrue("Resolved Source is not an instance of ZipSource.", 
                    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, zipSource.getURI());
     }
     
 }



Mime
View raw message