Author: rjung
Date: Fri Feb 12 22:37:01 2016
New Revision: 1730137
URL: http://svn.apache.org/viewvc?rev=1730137&view=rev
Log:
Fix test compilation. Thanks Violeta.
(never do last minute changes)
Split test in 3 sections:
- general prefix/suffix combinations, all
combinations permitted
- permit/suffix combinations, permit if suffix
is not empty
- deny/suffix combinations, deny if suffix
is not empty
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java?rev=1730137&r1=1730136&r2=1730137&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java Fri
Feb 12 22:37:01 2016
@@ -75,7 +75,7 @@ public class TestWebappClassLoader exten
"some/path/test"
};
- String[] prefixesPermit = new String[]{
+ String[] prefixes = new String[]{
"",
"resources",
"WEB-INF",
@@ -83,12 +83,15 @@ public class TestWebappClassLoader exten
"WEB-INF.lib",
"org",
"org.apache",
- "org.apache.tomcat.jdbc",
"javax",
- "javax.servlet.jsp.jstl",
"com.mycorp"
};
+ String[] prefixesPermit = new String[]{
+ "org.apache.tomcat.jdbc",
+ "javax.servlet.jsp.jstl",
+ };
+
String[] prefixesDeny = new String[]{
"org.apache.catalina",
"org.apache.coyote",
@@ -106,7 +109,7 @@ public class TestWebappClassLoader exten
try (WebappClassLoader loader = new WebappClassLoader()) {
String name;
- for (String prefix : prefixesPermit) {
+ for (String prefix : prefixes) {
for (String suffix : classSuffixes) {
name = prefix + "." + suffix;
Assert.assertTrue("Class '" + name + "' failed permit
filter",
@@ -116,6 +119,11 @@ public class TestWebappClassLoader exten
Assert.assertTrue("Class '" + name + "' failed permit
filter",
!loader.filter(name, true));
}
+ if (suffix.equals("")) {
+ name = prefix;
+ Assert.assertTrue("Class '" + name + "' failed permit
filter",
+ !loader.filter(name, true));
+ }
}
prefix = prefix.replace('.', '/');
for (String suffix : resourceSuffixes) {
@@ -127,12 +135,30 @@ public class TestWebappClassLoader exten
Assert.assertTrue("Resource '" + name + "' failed
permit filter",
!loader.filter(name, false));
}
+ if (suffix.equals("")) {
+ name = prefix;
+ Assert.assertTrue("Resource '" + name + "' failed
permit filter",
+ !loader.filter(name, false));
+ }
+ }
+ }
+
+ for (String prefix : prefixesPermit) {
+ for (String suffix : classSuffixes) {
+ name = prefix + "." + suffix;
+ Assert.assertTrue("Class '" + name + "' failed permit
filter",
+ !loader.filter(name, true));
+ }
+ prefix = prefix.replace('.', '/');
+ for (String suffix : resourceSuffixes) {
+ name = prefix + "/" + suffix;
+ Assert.assertTrue("Resource '" + name + "' failed permit
filter",
+ !loader.filter(name, false));
}
}
for (String prefix : prefixesDeny) {
for (String suffix : classSuffixes) {
- if (prefix.equals("")) {
name = prefix + "." + suffix;
Assert.assertTrue("Class '" + name + "' failed deny
filter",
loader.filter(name, true));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
