You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2007/05/08 08:32:10 UTC
svn commit: r536091 -
/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/components/source/impl/ZipSourceTestCase.java
Author: reinhard
Date: Mon May 7 23:32:09 2007
New Revision: 536091
URL: http://svn.apache.org/viewvc?view=rev&rev=536091
Log:
revert test after using excalibur-sourceresolve 2.2.1 instead of 2.2.2 again
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=536091&r1=536090&r2=536091
==============================================================================
--- 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 Mon May 7 23:32:09 2007
@@ -28,6 +28,7 @@
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,7 +43,16 @@
zipSource instanceof ZipSource);
assertEquals("Scheme/protocol is wrong.", "zip", zipSource.getScheme());
String actualZipSourceUri = zipSource.getURI();
- assertEquals("Uri is wrong.", zipSourceUri, actualZipSourceUri);
+ 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);
+ }
}
-}
+}
\ No newline at end of file