From f61412c8289ceb16ac9203aeb743514c1561fcc0 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Thu, 16 Apr 2009 05:09:03 +0000 Subject: [PATCH] More tolerance in CookieEncoderTest --- .../handler/codec/http/CookieEncoderTest.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java b/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java index a6d17b7263..034ee00efc 100644 --- a/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java +++ b/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java @@ -55,11 +55,21 @@ public class CookieEncoderTest { String encodedCookie = encoder.encode(); long currentTime = System.currentTimeMillis(); - assertTrue( - encodedCookie.equals(result.replace("XXX", df.format(new Date(currentTime + 50000)))) || - encodedCookie.equals(result.replace("XXX", df.format(new Date(currentTime + 50750)))) || - encodedCookie.equals(result.replace("XXX", df.format(new Date(currentTime + 49250))))); + boolean fail = true; + // +/- 10-second tolerance + for (int delta = 0; delta <= 20000; delta += 250) { + if (encodedCookie.equals(result.replace( + "XXX", df.format(new Date(currentTime + 40000 + delta))))) { + fail = false; + break; + } + } + + if (fail) { + fail("Expected: " + result + ", Actual: " + encodedCookie); + } } + @Test public void testEncodingSingleCookieV1() { String result = "myCookie=myValue;Max-Age=50;Path=\"/apathsomewhere\";Domain=.adomainsomewhere;Secure;Comment=\"this is a Comment\";Version=1";