Move and rename the aliases support test.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@939287 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/org/apache/catalina/core/TestStandardContextAliases.java b/test/org/apache/catalina/core/TestStandardContextAliases.java
new file mode 100644 (file)
index 0000000..7a24518
--- /dev/null
+++ b/test/org/apache/catalina/core/TestStandardContextAliases.java
@@ -0,0 +1,106 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.catalina.core;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestStandardContextAliases extends TomcatBaseTest {
+
+    public void testDirContextAliases() throws Exception {
+        Tomcat tomcat = getTomcatInstance();
+
+        // Must have a real docBase - just use temp
+        StandardContext ctx = (StandardContext) 
+            tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
+        
+        File lib = new File("webapps/examples/WEB-INF/lib");
+        ctx.setAliases("/WEB-INF/lib=" + lib.getCanonicalPath());
+        
+        Tomcat.addServlet(ctx, "test", new TestServlet());
+        ctx.addServletMapping("/", "test");
+        
+        tomcat.start();
+
+        ByteChunk res = getUrl("http://localhost:" + getPort() + "/");
+
+        String result = res.toString();
+        
+        assertTrue(result.indexOf("00-PASS") > -1);
+        assertTrue(result.indexOf("01-PASS") > -1);
+        assertTrue(result.indexOf("02-PASS") > -1);
+    }
+
+
+    /**
+     * Looks for the JSTL JARs in WEB-INF/lib.
+     */
+    public static class TestServlet extends HttpServlet {
+
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+                throws ServletException, IOException {
+            
+            resp.setContentType("text/plain");
+            
+            ServletContext context = getServletContext();
+            
+            // Check resources individually
+            URL url = context.getResource("/WEB-INF/lib/jstl.jar");
+            if (url != null) {
+                resp.getWriter().write("00-PASS\n");
+            }
+            
+            url = context.getResource("/WEB-INF/lib/standard.jar");
+            if (url != null) {
+                resp.getWriter().write("01-PASS\n");
+            }
+            
+            // Check a directory listing
+            Set<String> libs = context.getResourcePaths("/WEB-INF/lib");
+            if (libs == null) {
+                return;
+            }
+            
+            if (!libs.contains("/WEB-INF/lib/jstl.jar")) {
+                return;
+            }
+            if (!libs.contains("/WEB-INF/lib/standard.jar")) {
+                return;
+            }
+
+            resp.getWriter().write("02-PASS\n");
+        }
+        
+    }
+}

diff --git a/test/org/apache/naming/resources/TestBaseDirContext.java b/test/org/apache/naming/resources/TestBaseDirContext.java
deleted file mode 100644 (file)
index 9479527..0000000
--- a/test/org/apache/naming/resources/TestBaseDirContext.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.naming.resources;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Set;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.tomcat.util.buf.ByteChunk;
-
-public class TestBaseDirContext extends TomcatBaseTest {
-
-    public void testDirContextAliases() throws Exception {
-        Tomcat tomcat = getTomcatInstance();
-
-        // Must have a real docBase - just use temp
-        StandardContext ctx = (StandardContext) 
-            tomcat.addContext("/", System.getProperty("java.io.tmpdir"));
-        
-        File lib = new File("webapps/examples/WEB-INF/lib");
-        ctx.setAliases("/WEB-INF/lib=" + lib.getCanonicalPath());
-        
-        Tomcat.addServlet(ctx, "test", new TestServlet());
-        ctx.addServletMapping("/", "test");
-        
-        tomcat.start();
-
-        ByteChunk res = getUrl("http://localhost:" + getPort() + "/");
-
-        String result = res.toString();
-        
-        assertTrue(result.indexOf("00-PASS") > -1);
-        assertTrue(result.indexOf("01-PASS") > -1);
-        assertTrue(result.indexOf("02-PASS") > -1);
-    }
-
-
-    /**
-     * Looks for the JSTL JARs in WEB-INF/lib.
-     */
-    public static class TestServlet extends HttpServlet {
-
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-                throws ServletException, IOException {
-            
-            resp.setContentType("text/plain");
-            
-            ServletContext context = getServletContext();
-            
-            // Check resources individually
-            URL url = context.getResource("/WEB-INF/lib/jstl.jar");
-            if (url != null) {
-                resp.getWriter().write("00-PASS\n");
-            }
-            
-            url = context.getResource("/WEB-INF/lib/standard.jar");
-            if (url != null) {
-                resp.getWriter().write("01-PASS\n");
-            }
-            
-            // Check a directory listing
-            Set<String> libs = context.getResourcePaths("/WEB-INF/lib");
-            if (libs == null) {
-                return;
-            }
-            
-            if (!libs.contains("/WEB-INF/lib/jstl.jar")) {
-                return;
-            }
-            if (!libs.contains("/WEB-INF/lib/standard.jar")) {
-                return;
-            }
-
-            resp.getWriter().write("02-PASS\n");
-        }
-        
-    }
-}