Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 80843 invoked from network); 15 Sep 2010 20:01:22 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Sep 2010 20:01:22 -0000 Received: (qmail 97940 invoked by uid 500); 15 Sep 2010 20:01:22 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 97898 invoked by uid 500); 15 Sep 2010 20:01:22 -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 97891 invoked by uid 99); 15 Sep 2010 20:01:22 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Sep 2010 20:01:22 +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; Wed, 15 Sep 2010 20:01:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5123D2388A38; Wed, 15 Sep 2010 20:00:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r997480 [2/2] - in /httpcomponents/httpclient/trunk/httpclient-cache/src: main/java/org/apache/http/client/cache/ main/java/org/apache/http/impl/client/cache/ test/java/org/apache/http/client/ test/java/org/apache/http/client/cache/ test/ja... Date: Wed, 15 Sep 2010 20:00:42 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100915200043.5123D2388A38@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java?rev=997480&r1=997479&r2=997480&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java (original) +++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedHttpCacheStorage.java Wed Sep 15 20:00:41 2010 @@ -41,7 +41,7 @@ import org.apache.http.client.cache.Http import org.apache.http.client.cache.HttpCacheUpdateCallback; import org.apache.http.client.cache.HttpCacheUpdateException; import org.apache.http.impl.client.cache.CacheConfig; -import org.apache.http.impl.client.cache.CacheEntry; +import org.apache.http.impl.client.cache.HttpTestUtils; import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; @@ -74,7 +74,7 @@ public class TestMemcachedHttpCacheStora @Test public void testCachePut() throws IOException, HttpCacheUpdateException { final String url = "foo"; - final HttpCacheEntry value = new CacheEntry(); + final HttpCacheEntry value = HttpTestUtils.makeCacheEntry(); mockSerializer.writeTo(EasyMock.isA(HttpCacheEntry.class), EasyMock .isA(OutputStream.class)); EasyMock.expect( @@ -89,7 +89,7 @@ public class TestMemcachedHttpCacheStora public void testCacheGet() throws UnsupportedEncodingException, IOException, HttpCacheUpdateException { final String url = "foo"; - final HttpCacheEntry cacheEntry = new CacheEntry(); + final HttpCacheEntry cacheEntry = HttpTestUtils.makeCacheEntry(); EasyMock.expect(mockMemcachedClient.get(url)).andReturn(new byte[] {}); EasyMock.expect( mockSerializer.readFrom(EasyMock.isA(InputStream.class))) @@ -126,7 +126,7 @@ public class TestMemcachedHttpCacheStora public void testCacheUpdateNullEntry() throws IOException, HttpCacheUpdateException { final String url = "foo"; - final HttpCacheEntry updatedValue = new CacheEntry(); + final HttpCacheEntry updatedValue = HttpTestUtils.makeCacheEntry(); HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() { public HttpCacheEntry update(HttpCacheEntry old) { @@ -154,8 +154,8 @@ public class TestMemcachedHttpCacheStora @Test public void testCacheUpdate() throws IOException, HttpCacheUpdateException { final String url = "foo"; - final HttpCacheEntry existingValue = new CacheEntry(); - final HttpCacheEntry updatedValue = new CacheEntry(); + final HttpCacheEntry existingValue = HttpTestUtils.makeCacheEntry(); + final HttpCacheEntry updatedValue = HttpTestUtils.makeCacheEntry(); CASValue v = new CASValue(1234, new byte[] {}); @@ -189,8 +189,8 @@ public class TestMemcachedHttpCacheStora public void testSingleCacheUpdateRetry() throws IOException, HttpCacheUpdateException { final String url = "foo"; - final HttpCacheEntry existingValue = new CacheEntry(); - final HttpCacheEntry updatedValue = new CacheEntry(); + final HttpCacheEntry existingValue = HttpTestUtils.makeCacheEntry(); + final HttpCacheEntry updatedValue = HttpTestUtils.makeCacheEntry(); CASValue v = new CASValue(1234, new byte[] {}); HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() { @@ -229,8 +229,8 @@ public class TestMemcachedHttpCacheStora public void testCacheUpdateFail() throws IOException, HttpCacheUpdateException { final String url = "foo"; - final HttpCacheEntry existingValue = new CacheEntry(); - final HttpCacheEntry updatedValue = new CacheEntry(); + final HttpCacheEntry existingValue = HttpTestUtils.makeCacheEntry(); + final HttpCacheEntry updatedValue = HttpTestUtils.makeCacheEntry(); CASValue v = new CASValue(1234, new byte[] {}); HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {