[tomcat] branch 8.5.x updated: Simplify test. Correct comments.

[markt]

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 d176d48  Simplify test. Correct comments.
d176d48 is described below

commit d176d488c3c7e5653601dc25e846b50a836473f8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Aug 2 10:03:38 2019 +0100

    Simplify test. Correct comments.
---
 test/org/apache/catalina/startup/TestListener.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/org/apache/catalina/startup/TestListener.java 
b/test/org/apache/catalina/startup/TestListener.java
index a7b1c38..cfd62b7 100644
--- a/test/org/apache/catalina/startup/TestListener.java
+++ b/test/org/apache/catalina/startup/TestListener.java
@@ -40,8 +40,8 @@ public class TestListener extends TomcatBaseTest {
     public void testServletContainerInitializer() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        Context context = tomcat.addContext("",
-                System.getProperty("java.io.tmpdir"));
+        // No file system docBase required
+        Context context = tomcat.addContext("", null);
 
         context.addServletContainerInitializer(new SCI(), null);
         tomcat.start();
@@ -57,15 +57,15 @@ public class TestListener extends TomcatBaseTest {
     public void testServletContextListener() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        Context context = tomcat.addContext("",
-                System.getProperty("java.io.tmpdir"));
+        // No file system docBase required
+        Context context = tomcat.addContext("", null);
 
         // SCL2 pretends to be in web.xml, and tries to install a
-        // ServletContextInitializer.
+        // ServletContainerInitializer.
         context.addApplicationListener(SCL2.class.getName());
         tomcat.start();
 
-        //check that the ServletContextInitializer wasn't initialized.
+        //check that the ServletContainerInitializer wasn't initialized.
         Assert.assertFalse(SCL3.initialized);
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org