Author: markt
Date: Mon Feb 27 15:12:48 2017
New Revision: 1784583
URL: http://svn.apache.org/viewvc?rev=1784583&view=rev
Log:
Follow-up to r1784565
Fix failing unit tests
Use consistent format for attributes
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java?rev=1784583&r1=1784582&r2=1784583&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
Mon Feb 27 15:12:48 2017
@@ -128,7 +128,7 @@ public class Rfc6265CookieProcessor exte
// browsers. See http://tomcat.markmail.org/thread/g6sipbofsjossacn
// Wdy, DD-Mon-YY HH:MM:SS GMT ( Expires Netscape format )
- header.append ("; Expires=");
+ header.append (";Expires=");
// To expire immediately we need to set the time in past
if (maxAge == 0) {
header.append(ANCIENT_DATE);
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java?rev=1784583&r1=1784582&r2=1784583&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
Mon Feb 27 15:12:48 2017
@@ -187,7 +187,7 @@ public class TestCookieProcessorGenerati
@Test
public void v1TestMaxAgeZero() {
- doV1TestMaxAge(0, "foo=bar; Version=1; Max-Age=0",
"foo=bar;Max-Age=0");
+ doV1TestMaxAge(0, "foo=bar; Version=1; Max-Age=0",
"foo=bar;Max-Age=0;Expires=Thu, 01-Jan-1970 00:00:10 GMT");
}
@Test
@@ -302,7 +302,14 @@ public class TestCookieProcessorGenerati
}
Assert.assertNotNull("Failed to throw IAE", e);
} else {
- Assert.assertEquals(expected,
cookieProcessor.generateHeader(cookie));
+ if (cookieProcessor instanceof Rfc6265CookieProcessor &&
+ cookie.getMaxAge() > 0) {
+ // Expires attribute will depend on time cookie is generated so
+ // use a modified test
+
Assert.assertTrue(cookieProcessor.generateHeader(cookie).startsWith(expected));
+ } else {
+ Assert.assertEquals(expected,
cookieProcessor.generateHeader(cookie));
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
