This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new cee4789 Update test for WebappServiceLoader changes cee4789 is described below commit cee47895a383505bb616ac14ca8176ec049e137f Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Jan 16 20:55:36 2020 +0000 Update test for WebappServiceLoader changes --- .../catalina/startup/TestWebappServiceLoader.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/org/apache/catalina/startup/TestWebappServiceLoader.java b/test/org/apache/catalina/startup/TestWebappServiceLoader.java index 5e083f6..6a0f18d 100644 --- a/test/org/apache/catalina/startup/TestWebappServiceLoader.java +++ b/test/org/apache/catalina/startup/TestWebappServiceLoader.java @@ -32,6 +32,9 @@ import org.junit.Before; import org.junit.Test; import org.apache.catalina.Context; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.WebResourceRoot; +import org.apache.catalina.webresources.StandardRoot; import org.apache.tomcat.unittest.TesterContext; import org.easymock.EasyMock; import org.easymock.IMocksControl; @@ -101,6 +104,8 @@ public class TestWebappServiceLoader { List<String> jars = Arrays.asList("jar1.jar", "dir/"); EasyMock.expect(servletContext.getAttribute(ServletContext.ORDERED_LIBS)) .andReturn(jars); + EasyMock.expect(servletContext.getResource("/WEB-INF/classes/" + CONFIG_FILE)) + .andReturn(null); EasyMock.expect(servletContext.getResource("/WEB-INF/lib/jar1.jar")) .andReturn(url1); loader.parseConfigFile(EasyMock.isA(LinkedHashSet.class), EasyMock.eq(sci1)); @@ -181,10 +186,19 @@ public class TestWebappServiceLoader { private static class ExtendedTesterContext extends TesterContext { private final ServletContext servletContext; private final ClassLoader parent; + private final WebResourceRoot resources; public ExtendedTesterContext(ServletContext servletContext, ClassLoader parent) { this.servletContext = servletContext; this.parent = parent; + // Empty resources - any non-null returns will be mocked on the + // ServletContext + this.resources = new StandardRoot(this); + try { + this.resources.start(); + } catch (LifecycleException e) { + throw new IllegalStateException(e); + } } @Override @@ -202,5 +216,9 @@ public class TestWebappServiceLoader { return parent; } + @Override + public WebResourceRoot getResources() { + return resources; + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org