This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 765e0bd Revert workaround to what looks like a ContextConfig bug
around docBase
765e0bd is described below
commit 765e0bdbb5c082ad1ff31b349f43796aad08efae
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Apr 12 16:51:26 2019 +0100
Revert workaround to what looks like a ContextConfig bug around docBase
---
.../org/apache/catalina/webresources/TestAbstractArchiveResource.java | 4 ++--
test/org/apache/catalina/webresources/TestFileResource.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
b/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
index e573d91..9c59fd8 100644
--- a/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
+++ b/test/org/apache/catalina/webresources/TestAbstractArchiveResource.java
@@ -48,7 +48,7 @@ public class TestAbstractArchiveResource extends
TomcatBaseTest {
expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
expectedURL.append("*/WEB-INF/lib/test.jar!/META-INF/resources/index.html");
-
Assert.assertTrue(expectedURL.toString().equalsIgnoreCase(webResource.getURL().toString()));
+ Assert.assertEquals(expectedURL.toString(),
webResource.getURL().toString());
}
@@ -71,7 +71,7 @@ public class TestAbstractArchiveResource extends
TomcatBaseTest {
expectedURL.append(docBase.getCanonicalFile().toURI().toURL().toString());
expectedURL.append("WEB-INF/lib/test-lib.jar!/META-INF/tags/echo.tag");
-
Assert.assertTrue(expectedURL.toString().equalsIgnoreCase(webResource.getURL().toString()));
+ Assert.assertEquals(expectedURL.toString(),
webResource.getURL().toString());
}
}
diff --git a/test/org/apache/catalina/webresources/TestFileResource.java
b/test/org/apache/catalina/webresources/TestFileResource.java
index 2bd7ef3..315212a 100644
--- a/test/org/apache/catalina/webresources/TestFileResource.java
+++ b/test/org/apache/catalina/webresources/TestFileResource.java
@@ -40,6 +40,6 @@ public class TestFileResource extends TomcatBaseTest {
// Build the expected location the same way the webapp base dir is
built
File f = new File("test/webapp/WEB-INF/classes");
-
Assert.assertTrue(f.getCanonicalFile().toURI().toURL().toString().equalsIgnoreCase(out.toString().trim()));
+ Assert.assertEquals(f.getCanonicalFile().toURI().toURL().toString(),
out.toString().trim());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
