Author: markt
Date: Wed Oct 3 11:26:43 2018
New Revision: 1842705
URL: http://svn.apache.org/viewvc?rev=1842705&view=rev
Log:
Alternative fix for case sensitivity issue.
Resource URLs are generated from canonical file paths so the expected paths
need to be canonical as well.
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java?rev=1842705&r1=1842704&r2=1842705&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
Wed Oct 3 11:26:43 2018
@@ -18,7 +18,6 @@ package org.apache.catalina.webresources
import java.io.File;
-import org.apache.tomcat.util.compat.JrePlatform;
import org.junit.Assert;
import org.junit.Test;
@@ -46,18 +45,10 @@ public class TestAbstractArchiveResource
ctx.getResources().getClassLoaderResource("/META-INF/resources/index.html");
StringBuilder expectedURL = new StringBuilder("jar:war:");
-
expectedURL.append(docBase.getAbsoluteFile().toURI().toURL().toString());
+
expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
expectedURL.append("*/WEB-INF/lib/test.jar!/META-INF/resources/index.html");
- String expected = expectedURL.toString();
- String actual = webResource.getURL().toString();
-
- if (JrePlatform.IS_WINDOWS){
- expected = expected.toLowerCase();
- actual = actual.toLowerCase();
- }
-
- Assert.assertEquals(expected, actual);
+ Assert.assertEquals(expectedURL.toString(),
webResource.getURL().toString());
}
@@ -77,18 +68,10 @@ public class TestAbstractArchiveResource
ctx.getResources().getClassLoaderResource("/META-INF/tags/echo.tag");
StringBuilder expectedURL = new StringBuilder("jar:");
-
expectedURL.append(docBase.getAbsoluteFile().toURI().toURL().toString());
+
expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
expectedURL.append("WEB-INF/lib/test-lib.jar!/META-INF/tags/echo.tag");
- String expected = expectedURL.toString();
- String actual = webResource.getURL().toString();
-
- if (JrePlatform.IS_WINDOWS){
- expected = expected.toLowerCase();
- actual = actual.toLowerCase();
- }
-
- Assert.assertEquals(expected, actual);
+ Assert.assertEquals(expectedURL.toString(),
webResource.getURL().toString());
}
}
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java?rev=1842705&r1=1842704&r2=1842705&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/webresources/TestFileResource.java
Wed Oct 3 11:26:43 2018
@@ -20,7 +20,6 @@ import java.io.File;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tomcat.util.compat.JrePlatform;
import org.junit.Assert;
import org.junit.Test;
@@ -41,15 +40,6 @@ public class TestFileResource extends To
// Build the expected location the same way the webapp base dir is
built
File f = new File("test/webapp/WEB-INF/classes");
-
- String expected = f.toURI().toURL().toString();
- String actual = out.toString().trim();
-
- if (JrePlatform.IS_WINDOWS){
- expected = expected.toLowerCase();
- actual = actual.toLowerCase();
- }
-
- Assert.assertEquals(expected, actual);
+ Assert.assertEquals(f.getCanonicalFile().toURI().toURL().toString(),
out.toString().trim());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
