Author: jboynes
Date: Mon Jul 29 00:01:15 2013
New Revision: 1507874
URL: http://svn.apache.org/r1507874
Log:
Test case should assert SCI is actually loaded
Modified:
tomcat/trunk/test/org/apache/jasper/servlet/TestJasperInitializer.java
Modified: tomcat/trunk/test/org/apache/jasper/servlet/TestJasperInitializer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/servlet/TestJasperInitializer.java?rev=1507874&r1=1507873&r2=1507874&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/servlet/TestJasperInitializer.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/servlet/TestJasperInitializer.java Mon
Jul 29 00:01:15 2013
@@ -16,23 +16,34 @@
*/
package org.apache.jasper.servlet;
-import java.util.ServiceLoader;
+import java.io.File;
+import java.util.Collection;
import javax.servlet.ServletContainerInitializer;
+import javax.servlet.ServletContext;
+import org.junit.Assert;
import org.junit.Test;
-/**
- *
- */
-public class TestJasperInitializer {
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.startup.WebappServiceLoader;
+
+public class TestJasperInitializer extends TomcatBaseTest {
@Test
- public void testServiceLoader() {
- ServiceLoader<ServletContainerInitializer> initializers =
- ServiceLoader.load(ServletContainerInitializer.class);
- for (ServletContainerInitializer initializer : initializers) {
- System.out.println(initializer.getClass().getName());
- }
+ public void testServiceLoader() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+ File appDir = new File("test/webapp");
+ // app dir is relative to server home
+ StandardContext standardContext = (StandardContext)
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+ tomcat.start();
+
+ ServletContext context = standardContext.getServletContext();
+ WebappServiceLoader<ServletContainerInitializer> loader = new
WebappServiceLoader<>(context);
+ Collection<ServletContainerInitializer> initializers =
loader.load(ServletContainerInitializer.class);
+ Assert.assertEquals(1, initializers.size());
+ Assert.assertTrue(initializers.iterator().next() instanceof
JasperInitializer);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
