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

[cz...@apache.org]

Author: cziegeler
Date: Fri Jul 20 06:28:11 2007
New Revision: 557994

URL: http://svn.apache.org/viewvc?view=rev&rev=557994
Log:
Correc test case after update of excalibur source resolve.

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=557994&r1=557993&r2=557994
==============================================================================
--- 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 Fri Jul 20 06:28:11 2007
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,8 +27,7 @@
 public class ZipSourceTestCase extends ContainerTestCase {
 
     public void testURIHandling() throws Exception {
-        final String zipSourceUri = "zip:file://test.zip!/test.xml";
-        final String brokenMacOsXSourceUri = "zip:file:/test.zip!/test.xml";
+        final String zipSourceUri = "zip:file:///test.zip!/test.xml";
         Source zipSource;
         SourceResolver resolver = null;
         try {
@@ -39,20 +38,11 @@
         } finally {
             getManager().release(resolver);
         }
-        assertTrue("Resolved Source is not an instance of ZipSource.", 
+        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, actualZipSourceUri);
     }
-    
+
 }