Update cookie tests. Remove obsolete test

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

diff --git a/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java b/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
index 5995539..f7f18bd 100644 (file)
--- a/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
+++ b/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
@@ -51,7 +51,7 @@ public class TestCookiesNoFwdStrictSysProps extends CookiesBaseTest {
         res = getUrl("http://localhost:" + getPort() + "/invalidFwd");
         assertEquals("Cookie name ok", res.toString());
         res = getUrl("http://localhost:" + getPort() + "/invalidStrict");
-        assertEquals("Cookie name ok", res.toString()); // Will auto switch
+        assertEquals("Cookie name fail", res.toString());
         res = getUrl("http://localhost:" + getPort() + "/valid");
         assertEquals("Cookie name ok", res.toString());
 

diff --git a/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java b/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
index 74a1df1..130a65f 100644 (file)
--- a/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
+++ b/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
@@ -51,9 +51,9 @@ public class TestCookiesStrictSysProps extends CookiesBaseTest {
         res = getUrl("http://localhost:" + getPort() + "/blank");
         assertEquals("Cookie name fail", res.toString());
         res = getUrl("http://localhost:" + getPort() + "/invalidFwd");
-        assertEquals("Cookie name ok", res.toString()); // Will auto-switch
+        assertEquals("Cookie name fail", res.toString());
         res = getUrl("http://localhost:" + getPort() + "/invalidStrict");
-        assertEquals("Cookie name ok", res.toString()); // Will auto-switch
+        assertEquals("Cookie name fail", res.toString());
         res = getUrl("http://localhost:" + getPort() + "/valid");
         assertEquals("Cookie name ok", res.toString());
         

diff --git a/test/org/apache/tomcat/util/http/TestCookiesSwitchSysProps.java b/test/org/apache/tomcat/util/http/TestCookiesSwitchSysProps.java
deleted file mode 100644 (file)
index 02ef693..0000000
--- a/test/org/apache/tomcat/util/http/TestCookiesSwitchSysProps.java
+++ /dev/null
@@ -1,75 +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.tomcat.util.http;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.catalina.startup.Tomcat;
-import org.apache.tomcat.util.buf.ByteChunk;
-
-/**
- * Test case for {@link Cookies}. <b>Note</b> because of the use of <code>final
- * static</code> constants in {@link Cookies}, each of these tests must be
- * executed in a new JVM instance. The tests have been place in separate classes
- * to facilitate this when running the unit tests via Ant.
- */
-public class TestCookiesSwitchSysProps extends CookiesBaseTest {
-
-    @Override
-    public void testCookiesInstance() throws Exception {
-
-        System.setProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
-                "true");
-        System.setProperty(
-                "org.apache.tomcat.util.http.ServerCookie.ALLOW_VERSION_SWITCH",
-                "true");
-        
-        Tomcat tomcat = getTomcatInstance();
-        
-        addServlets(tomcat);
-        
-        tomcat.start();
-        
-        ByteChunk res = getUrl("http://localhost:" + getPort() + "/invalid");
-        assertEquals("Cookie name fail", res.toString());
-        res = getUrl("http://localhost:" + getPort() + "/null");
-        assertEquals("Cookie name fail", res.toString());
-        res = getUrl("http://localhost:" + getPort() + "/blank");
-        assertEquals("Cookie name fail", res.toString());
-        res = getUrl("http://localhost:" + getPort() + "/invalidFwd");
-        assertEquals("Cookie name ok", res.toString()); // Will auto-switch
-        res = getUrl("http://localhost:" + getPort() + "/invalidStrict");
-        assertEquals("Cookie name ok", res.toString()); // Will auto-switch
-        res = getUrl("http://localhost:" + getPort() + "/valid");
-        assertEquals("Cookie name ok", res.toString());
-
-        // Need to read response headers to test version switching
-        Map<String,List<String>> headers = new HashMap<String,List<String>>();
-        getUrl("http://localhost:" + getPort() + "/switch", res, headers);
-        List<String> cookieHeaders = headers.get("Set-Cookie");
-        for (String cookieHeader : cookieHeaders) {
-            if (cookieHeader.contains("name=")) {
-                assertTrue(cookieHeader.contains("name=\"val?ue\""));
-            }
-        }
-        
-    }
-        
-}