svn commit: r1717225 - in /tomcat/trunk/test/org/apache: catalina/filters/ tomcat/unittest/ tomcat/util/scan/ tomcat/websocket/server/

[ma...@apache.org]

Author: markt
Date: Mon Nov 30 10:54:14 2015
New Revision: 1717225

URL: http://svn.apache.org/viewvc?rev=1717225&view=rev
Log:
Move the TesterServletContext since it is used by multiple tests

Added:
    tomcat/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java
      - copied, changed from r1716911, tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java
Removed:
    tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java
Modified:
    tomcat/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java
    tomcat/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java
    tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java

Modified: tomcat/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java?rev=1717225&r1=1717224&r2=1717225&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java (original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TesterFilterConfigs.java Mon Nov 30 10:54:14 2015
@@ -21,6 +21,8 @@ import java.util.Enumeration;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;
 
+import org.apache.tomcat.unittest.TesterServletContext;
+
 public class TesterFilterConfigs {
     public static final String HTTPS_WWW_APACHE_ORG = "https://www.apache.org";
     public static final String HTTP_TOMCAT_APACHE_ORG =

Copied: tomcat/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java (from r1716911, tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java?p2=tomcat/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java&p1=tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java&r1=1716911&r2=1717225&rev=1717225&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TesterServletContext.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/TesterServletContext.java Mon Nov 30 10:54:14 2015
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.catalina.filters;
+package org.apache.tomcat.unittest;
 
 import java.io.InputStream;
 import java.net.MalformedURLException;

Modified: tomcat/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java?rev=1717225&r1=1717224&r2=1717225&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/scan/TestStandardJarScanner.java Mon Nov 30 10:54:14 2015
@@ -27,9 +27,9 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.apache.catalina.filters.TesterServletContext;
 import org.apache.tomcat.JarScanType;
 import org.apache.tomcat.JarScannerCallback;
+import org.apache.tomcat.unittest.TesterServletContext;
 
 public class TestStandardJarScanner {
 

Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1717225&r1=1717224&r2=1717225&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Mon Nov 30 10:54:14 2015
@@ -34,10 +34,10 @@ import org.junit.Test;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleState;
-import org.apache.catalina.filters.TesterServletContext;
 import org.apache.catalina.servlets.DefaultServlet;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.unittest.TesterServletContext;
 import org.apache.tomcat.websocket.TesterEchoServer;
 import org.apache.tomcat.websocket.TesterMessageCountClient.BasicText;
 import org.apache.tomcat.websocket.pojo.TesterUtil.SimpleClient;



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