From eddeaa64e6449ecb720a467dd0dc172de76a284c Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Mon, 24 Feb 2014 16:49:54 +0000 Subject: [PATCH] Avoid warnings: the static method should be accessed directly git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1571346 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/http/impl/client/cache/AbstractProtocolTest.java | 2 +- .../impl/client/cache/TestAsynchronousValidationRequest.java | 2 +- .../http/impl/client/cache/TestAsynchronousValidator.java | 2 +- .../apache/http/impl/client/cache/TestCacheKeyGenerator.java | 2 +- .../impl/client/cache/TestCachedHttpResponseGenerator.java | 2 +- .../client/cache/TestCachedResponseSuitabilityChecker.java | 2 +- .../org/apache/http/impl/client/cache/TestCachingExec.java | 2 +- .../apache/http/impl/client/cache/TestCachingExecChain.java | 2 +- .../org/apache/http/impl/client/cache/TestCombinedEntity.java | 2 +- .../impl/client/cache/TestImmediateSchedulingStrategy.java | 2 +- .../apache/http/impl/client/cache/TestProtocolDeviations.java | 4 ++-- .../http/impl/client/cache/TestProtocolRequirements.java | 2 +- .../client/cache/ehcache/TestEhcacheProtocolRequirements.java | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java index 360932470..5072143e6 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java @@ -42,7 +42,7 @@ import org.apache.http.conn.routing.HttpRoute; import org.apache.http.impl.execchain.ClientExecChain; import org.apache.http.message.BasicHttpRequest; import org.easymock.IExpectationSetters; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Before; public abstract class AbstractProtocolTest { diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestAsynchronousValidationRequest.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestAsynchronousValidationRequest.java index a109de053..1b2471ee0 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestAsynchronousValidationRequest.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestAsynchronousValidationRequest.java @@ -41,7 +41,7 @@ import org.apache.http.client.methods.HttpRequestWrapper; import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.message.BasicHeader; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestAsynchronousValidator.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestAsynchronousValidator.java index 9fda7caac..d4ac617c8 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestAsynchronousValidator.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestAsynchronousValidator.java @@ -42,7 +42,7 @@ import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.message.BasicHeader; import org.easymock.Capture; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheKeyGenerator.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheKeyGenerator.java index b566ee6cb..9990b978d 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheKeyGenerator.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheKeyGenerator.java @@ -34,7 +34,7 @@ import org.apache.http.client.cache.HttpCacheEntry; import org.apache.http.client.methods.HttpGet; import org.apache.http.message.BasicHeader; import org.apache.http.message.BasicHttpRequest; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedHttpResponseGenerator.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedHttpResponseGenerator.java index f62b7a34f..285060111 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedHttpResponseGenerator.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedHttpResponseGenerator.java @@ -33,7 +33,7 @@ import org.apache.http.HttpResponse; import org.apache.http.client.cache.HttpCacheEntry; import org.apache.http.client.utils.DateUtils; import org.apache.http.message.BasicHeader; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java index 073502613..4b46041cc 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java @@ -36,7 +36,7 @@ import org.apache.http.client.cache.HttpCacheEntry; import org.apache.http.client.utils.DateUtils; import org.apache.http.message.BasicHeader; import org.apache.http.message.BasicHttpRequest; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java index 2683c9382..6aaf73782 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java @@ -64,7 +64,7 @@ import org.apache.http.message.BasicHttpResponse; import org.apache.http.message.BasicStatusLine; import org.apache.http.protocol.HTTP; import org.easymock.IExpectationSetters; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExecChain.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExecChain.java index 75f1268ab..9da744d7d 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExecChain.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExecChain.java @@ -80,7 +80,7 @@ import org.apache.http.message.BasicHttpResponse; import org.apache.http.util.EntityUtils; import org.easymock.Capture; import org.easymock.IExpectationSetters; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCombinedEntity.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCombinedEntity.java index 43775cb27..17cf5bbd1 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCombinedEntity.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCombinedEntity.java @@ -30,7 +30,7 @@ import java.io.ByteArrayInputStream; import org.apache.http.client.cache.Resource; import org.apache.http.util.EntityUtils; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestImmediateSchedulingStrategy.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestImmediateSchedulingStrategy.java index 5d20b2c09..d8cabf710 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestImmediateSchedulingStrategy.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestImmediateSchedulingStrategy.java @@ -26,7 +26,7 @@ */ package org.apache.http.impl.client.cache; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java index a154a6cf9..0df43d305 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java @@ -50,7 +50,7 @@ import org.apache.http.message.BasicHttpEntityEnclosingRequest; import org.apache.http.message.BasicHttpRequest; import org.apache.http.message.BasicHttpResponse; import org.easymock.Capture; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -220,7 +220,7 @@ public class TestProtocolDeviations { final byte[] bytes = new byte[128]; new Random().nextBytes(bytes); - final HttpEntity mockBody = EasyMock.createMockBuilder(ByteArrayEntity.class).withConstructor( + final HttpEntity mockBody = org.easymock.classextension.EasyMock.createMockBuilder(ByteArrayEntity.class).withConstructor( new Object[] { bytes }).addMockedMethods("getContentLength").createNiceMock(); org.easymock.EasyMock.expect(mockBody.getContentLength()).andReturn(-1L).anyTimes(); post.setEntity(mockBody); diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java index 754bc98a8..ffd5671c7 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java @@ -59,7 +59,7 @@ import org.apache.http.message.BasicHttpRequest; import org.apache.http.message.BasicHttpResponse; import org.apache.http.protocol.HTTP; import org.easymock.Capture; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheProtocolRequirements.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheProtocolRequirements.java index d51d8d0b3..ddda48e45 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheProtocolRequirements.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheProtocolRequirements.java @@ -37,7 +37,7 @@ import org.apache.http.impl.client.cache.CachingExec; import org.apache.http.impl.client.cache.HeapResourceFactory; import org.apache.http.impl.client.cache.TestProtocolRequirements; import org.apache.http.impl.execchain.ClientExecChain; -import org.easymock.classextension.EasyMock; +import org.easymock.EasyMock; import org.junit.After; import org.junit.AfterClass; import org.junit.Before;