hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1222861 - in /httpcomponents/httpclient/branches/4.1.x/httpclient-cache/src/test/java/org/apache/http: client/cache/TestHttpCacheJiraNumber1147.java impl/client/cache/TestHttpCacheJiraNumber1147.java
Date Fri, 23 Dec 2011 21:49:11 GMT
Author: olegk
Date: Fri Dec 23 21:49:11 2011
New Revision: 1222861

URL: http://svn.apache.org/viewvc?rev=1222861&view=rev
Log:
Rewrote test case for HTTPCLIENT-1147: removed dependency on an external resource; removed
hard-coded cache directory location

Added:
    httpcomponents/httpclient/branches/4.1.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java
  (with props)
Removed:
    httpcomponents/httpclient/branches/4.1.x/httpclient-cache/src/test/java/org/apache/http/client/cache/TestHttpCacheJiraNumber1147.java

Added: httpcomponents/httpclient/branches/4.1.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.1.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java?rev=1222861&view=auto
==============================================================================
--- httpcomponents/httpclient/branches/4.1.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java
(added)
+++ httpcomponents/httpclient/branches/4.1.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java
Fri Dec 23 21:49:11 2011
@@ -0,0 +1,113 @@
+package org.apache.http.impl.client.cache;
+
+import java.io.File;
+import java.util.Date;
+
+import junit.framework.Assert;
+
+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpVersion;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.cache.HttpCacheStorage;
+import org.apache.http.client.cache.ResourceFactory;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.cache.CacheConfig;
+import org.apache.http.impl.client.cache.CachingHttpClient;
+import org.apache.http.impl.client.cache.FileResourceFactory;
+import org.apache.http.impl.client.cache.ManagedHttpCacheStorage;
+import org.apache.http.impl.cookie.DateUtils;
+import org.apache.http.message.BasicHttpResponse;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.EntityUtils;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestHttpCacheJiraNumber1147 {
+
+    private File cacheDir;
+
+    private void removeCache() {
+        if (this.cacheDir != null) {
+            File[] files = this.cacheDir.listFiles();
+            for (File cacheFile : files) {
+                cacheFile.delete();
+            }
+            this.cacheDir.delete();
+            this.cacheDir = null;
+        }
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        cacheDir = File.createTempFile("cachedir", "");
+        if (cacheDir.exists()) {
+            cacheDir.delete();
+        }
+        cacheDir.mkdir();
+    }
+    
+    @After
+    public void cleanUp() {
+        removeCache();
+    }
+    
+    @Test
+    public void testIssue1147() throws Exception {
+        CacheConfig cacheConfig = new CacheConfig();
+        cacheConfig.setSharedCache(true);
+        cacheConfig.setMaxObjectSizeBytes(262144); //256kb
+
+        ResourceFactory resourceFactory = new FileResourceFactory(cacheDir);
+        HttpCacheStorage httpCacheStorage = new ManagedHttpCacheStorage(cacheConfig);
+
+        HttpClient client = EasyMock.createMock(HttpClient.class);
+        HttpGet get = new HttpGet("http://somehost/");
+        HttpContext context = new BasicHttpContext();
+        HttpHost target = new HttpHost("somehost");
+
+        Date now = new Date();
+        Date tenSecondsAgo = new Date(now.getTime() - 10 * 1000L);
+        
+        HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
+        response.setEntity(HttpTestUtils.makeBody(128));
+        response.setHeader("Content-Length", "128");
+        response.setHeader("ETag", "\"etag\"");
+        response.setHeader("Cache-Control", "public, max-age=3600");
+        response.setHeader("Last-Modified", DateUtils.formatDate(tenSecondsAgo));
+        
+        EasyMock.expect(client.execute(
+                EasyMock.eq(target),
+                EasyMock.isA(HttpRequest.class),
+                EasyMock.same(context))).andReturn(response);
+        EasyMock.replay(client);
+        
+        CachingHttpClient t = new CachingHttpClient(client, resourceFactory, httpCacheStorage,
cacheConfig);
+
+        HttpResponse response1 = t.execute(get, context);
+        Assert.assertEquals(200, response1.getStatusLine().getStatusCode());
+        EntityUtils.consume(response1.getEntity());
+        
+        EasyMock.verify(client);
+        
+        removeCache();
+
+        EasyMock.reset(client);
+        EasyMock.expect(client.execute(
+                EasyMock.eq(target),
+                EasyMock.isA(HttpRequest.class),
+                EasyMock.same(context))).andReturn(response);
+        EasyMock.replay(client);
+        
+        HttpResponse response2 = t.execute(get, context);
+        Assert.assertEquals(200, response2.getStatusLine().getStatusCode());
+        EntityUtils.consume(response2.getEntity());
+
+        EasyMock.verify(client);
+    }
+
+}

Propchange: httpcomponents/httpclient/branches/4.1.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/branches/4.1.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient/branches/4.1.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message