Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 43522 invoked from network); 11 Dec 2010 11:57:31 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Dec 2010 11:57:31 -0000 Received: (qmail 29837 invoked by uid 500); 11 Dec 2010 11:57:31 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 29793 invoked by uid 500); 11 Dec 2010 11:57:31 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 29785 invoked by uid 99); 11 Dec 2010 11:57:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Dec 2010 11:57:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Dec 2010 11:57:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C217E23889EB; Sat, 11 Dec 2010 11:57:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1044639 - /httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java Date: Sat, 11 Dec 2010 11:57:09 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101211115709.C217E23889EB@eris.apache.org> Author: olegk Date: Sat Dec 11 11:57:09 2010 New Revision: 1044639 URL: http://svn.apache.org/viewvc?rev=1044639&view=rev Log: TABS -> SPACES Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java?rev=1044639&r1=1044638&r2=1044639&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java (original) +++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java Sat Dec 11 11:57:09 2010 @@ -806,63 +806,63 @@ public class TestProtocolRecommendations assertNull(captured.getFirstHeader("If-Match")); assertNull(captured.getFirstHeader("If-Unmodified-Since")); } - + /* "If an entity tag was assigned to a cached representation, the * forwarded request SHOULD be conditional and include the entity * tags in an If-None-Match header field from all its cache entries * for the resource." - * + * * http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.6 */ @Test public void testSendsAllVariantEtagsInConditionalRequest() - throws Exception { - HttpRequest req1 = new BasicHttpRequest("GET","/",HttpVersion.HTTP_1_1); - req1.setHeader("User-Agent","agent1"); - HttpResponse resp1 = HttpTestUtils.make200Response(); - resp1.setHeader("Cache-Control","max-age=3600"); - resp1.setHeader("Vary","User-Agent"); - resp1.setHeader("Etag","\"etag1\""); - - backendExpectsAnyRequest().andReturn(resp1); - - HttpRequest req2 = new BasicHttpRequest("GET","/",HttpVersion.HTTP_1_1); - req2.setHeader("User-Agent","agent2"); - HttpResponse resp2 = HttpTestUtils.make200Response(); - resp2.setHeader("Cache-Control","max-age=3600"); - resp2.setHeader("Vary","User-Agent"); - resp2.setHeader("Etag","\"etag2\""); - - backendExpectsAnyRequest().andReturn(resp2); - - Capture cap = new Capture(); - HttpRequest req3 = new BasicHttpRequest("GET","/",HttpVersion.HTTP_1_1); - req3.setHeader("User-Agent","agent3"); - HttpResponse resp3 = HttpTestUtils.make200Response(); - - EasyMock.expect(mockBackend.execute(EasyMock.eq(host), - EasyMock.capture(cap), (HttpContext)EasyMock.isNull())) - .andReturn(resp3); - - replayMocks(); - impl.execute(host,req1); - impl.execute(host,req2); - impl.execute(host,req3); - verifyMocks(); - - HttpRequest captured = cap.getValue(); - boolean foundEtag1 = false; - boolean foundEtag2 = false; - for(Header h : captured.getHeaders("If-None-Match")) { - for(String etag : h.getValue().split(",")) { - if ("\"etag1\"".equals(etag.trim())) { - foundEtag1 = true; - } - if ("\"etag2\"".equals(etag.trim())) { - foundEtag2 = true; - } - } - } - assertTrue(foundEtag1 && foundEtag2); + throws Exception { + HttpRequest req1 = new BasicHttpRequest("GET","/",HttpVersion.HTTP_1_1); + req1.setHeader("User-Agent","agent1"); + HttpResponse resp1 = HttpTestUtils.make200Response(); + resp1.setHeader("Cache-Control","max-age=3600"); + resp1.setHeader("Vary","User-Agent"); + resp1.setHeader("Etag","\"etag1\""); + + backendExpectsAnyRequest().andReturn(resp1); + + HttpRequest req2 = new BasicHttpRequest("GET","/",HttpVersion.HTTP_1_1); + req2.setHeader("User-Agent","agent2"); + HttpResponse resp2 = HttpTestUtils.make200Response(); + resp2.setHeader("Cache-Control","max-age=3600"); + resp2.setHeader("Vary","User-Agent"); + resp2.setHeader("Etag","\"etag2\""); + + backendExpectsAnyRequest().andReturn(resp2); + + Capture cap = new Capture(); + HttpRequest req3 = new BasicHttpRequest("GET","/",HttpVersion.HTTP_1_1); + req3.setHeader("User-Agent","agent3"); + HttpResponse resp3 = HttpTestUtils.make200Response(); + + EasyMock.expect(mockBackend.execute(EasyMock.eq(host), + EasyMock.capture(cap), (HttpContext)EasyMock.isNull())) + .andReturn(resp3); + + replayMocks(); + impl.execute(host,req1); + impl.execute(host,req2); + impl.execute(host,req3); + verifyMocks(); + + HttpRequest captured = cap.getValue(); + boolean foundEtag1 = false; + boolean foundEtag2 = false; + for(Header h : captured.getHeaders("If-None-Match")) { + for(String etag : h.getValue().split(",")) { + if ("\"etag1\"".equals(etag.trim())) { + foundEtag1 = true; + } + if ("\"etag2\"".equals(etag.trim())) { + foundEtag2 = true; + } + } + } + assertTrue(foundEtag1 && foundEtag2); } }