hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
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 GMT
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<HttpRequest> cap = new Capture<HttpRequest>();
-    	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<HttpRequest> cap = new Capture<HttpRequest>();
+        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);
     }
 }



Mime
View raw message