Author: markt
Date: Mon Jun 6 15:20:11 2016
New Revision: 1747028
URL: http://svn.apache.org/viewvc?rev=1747028&view=rev
Log:
Unit test adjustments for change to default cookie name validator
Modified:
tomcat/trunk/test/javax/servlet/http/TestCookie.java
tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
Modified: tomcat/trunk/test/javax/servlet/http/TestCookie.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/servlet/http/TestCookie.java?rev=1747028&r1=1747027&r2=1747028&view=diff
==============================================================================
--- tomcat/trunk/test/javax/servlet/http/TestCookie.java (original)
+++ tomcat/trunk/test/javax/servlet/http/TestCookie.java Mon Jun 6 15:20:11
2016
@@ -129,9 +129,9 @@ public class TestCookie {
@Test
public void strictNamingImpliesRFC2109() {
- // Not using strict naming here so this should be OK
+ // Needs to be something RFC6265 allows, but strict naming does not.
@SuppressWarnings("unused")
- Cookie cookie = new Cookie("@Foo", null);
+ Cookie cookie = new Cookie("$Foo", null);
}
public static void checkCharInName(CookieNameValidator validator, BitSet
allowed) {
Modified: tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java?rev=1747028&r1=1747027&r2=1747028&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java Mon Jun
6 15:20:11 2016
@@ -82,7 +82,7 @@ public abstract class CookiesBaseTest ex
new CookieServlet("na/me", "value"));
ctx.addServletMapping("/invalidFwd", "invalidFwd");
Tomcat.addServlet(ctx, "invalidStrict",
- new CookieServlet("na?me", "value"));
+ new CookieServlet("$name", "value"));
ctx.addServletMapping("/invalidStrict", "invalidStrict");
Tomcat.addServlet(ctx, "valid", new CookieServlet("name", "value"));
ctx.addServletMapping("/valid", "valid");
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java?rev=1747028&r1=1747027&r2=1747028&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
Mon Jun 6 15:20:11 2016
@@ -54,7 +54,7 @@ public class TestCookiesNoStrictNamingSy
res = getUrl("http://localhost:"; + getPort() + "/blank");
assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/invalidFwd");
- assertEquals("Cookie name ok", res.toString());
+ assertEquals("Cookie name fail", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/invalidStrict");
assertEquals("Cookie name ok", res.toString());
res = getUrl("http://localhost:"; + getPort() + "/valid");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
