You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2015/11/25 16:17:56 UTC
svn commit: r1716435 [4/5] - in /httpcomponents/httpcore/trunk:
httpcore-ab/src/main/java/org/apache/hc/core5/http/benchmark/
httpcore-ab/src/test/java/org/apache/hc/core5/http/benchmark/
httpcore-osgi/src/test/java/org/apache/hc/core5/http/osgi/ httpc...
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultContentLengthStrategy.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/entity/TestDefaultContentLengthStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultContentLengthStrategy.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultContentLengthStrategy.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/entity/TestDefaultContentLengthStrategy.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/entity/TestDefaultContentLengthStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultContentLengthStrategy.java Wed Nov 25 15:17:53 2015
@@ -25,14 +25,14 @@
*
*/
-package org.apache.hc.core5.http.impl.entity;
+package org.apache.hc.core5.http.impl;
+import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.HttpMessage;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.NotImplementedException;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.ProtocolVersion;
-import org.apache.hc.core5.http.entity.ContentLengthStrategy;
import org.apache.hc.core5.http.message.AbstractHttpMessage;
import org.junit.Assert;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/SessionInputBufferMock.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/SessionInputBufferMock.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/SessionInputBufferMock.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/SessionInputBufferMock.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/SessionInputBufferMock.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/SessionInputBufferMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/SessionInputBufferMock.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -33,8 +33,6 @@ import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.hc.core5.http.impl.io.SessionInputBufferImpl;
/**
* {@link org.apache.hc.core5.http.io.SessionInputBuffer} mockup implementation.
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferMock.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/SessionOutputBufferMock.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferMock.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferMock.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/SessionOutputBufferMock.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/SessionOutputBufferMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/SessionOutputBufferMock.java Wed Nov 25 15:17:53 2015
@@ -25,15 +25,12 @@
*
*/
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
import java.io.ByteArrayOutputStream;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
-import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
-import org.apache.hc.core5.http.impl.io.SessionOutputBufferImpl;
-
/**
* {@link org.apache.hc.core5.http.io.SessionOutputBuffer} mockup implementation.
*
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestBHttpConnectionBase.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestBHttpConnectionBase.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestBHttpConnectionBase.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestBHttpConnectionBase.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestBHttpConnectionBase.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestBHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestBHttpConnectionBase.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -35,14 +35,11 @@ import java.net.Socket;
import java.net.SocketException;
import java.net.SocketTimeoutException;
+import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.entity.ContentLengthStrategy;
-import org.apache.hc.core5.http.impl.io.ChunkedInputStream;
-import org.apache.hc.core5.http.impl.io.ContentLengthInputStream;
-import org.apache.hc.core5.http.impl.io.IdentityInputStream;
import org.apache.hc.core5.http.message.BasicHttpResponse;
import org.junit.Assert;
import org.junit.Before;
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestChunkCoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestChunkCoding.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestChunkCoding.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestChunkCoding.java Wed Nov 25 15:17:53 2015
@@ -41,8 +41,6 @@ import org.apache.hc.core5.http.MessageC
import org.apache.hc.core5.http.TrailerSupplier;
import org.apache.hc.core5.http.TruncatedChunkException;
import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.impl.SessionInputBufferMock;
-import org.apache.hc.core5.http.impl.SessionOutputBufferMock;
import org.apache.hc.core5.http.io.SessionInputBuffer;
import org.apache.hc.core5.http.message.BasicHeader;
import org.junit.Assert;
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestContentLengthInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestContentLengthInputStream.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestContentLengthInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestContentLengthInputStream.java Wed Nov 25 15:17:53 2015
@@ -33,7 +33,6 @@ import java.io.InputStream;
import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.http.Consts;
-import org.apache.hc.core5.http.impl.SessionInputBufferMock;
import org.apache.hc.core5.http.io.SessionInputBuffer;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestContentLengthOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestContentLengthOutputStream.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestContentLengthOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestContentLengthOutputStream.java Wed Nov 25 15:17:53 2015
@@ -31,7 +31,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.hc.core5.http.impl.SessionOutputBufferMock;
import org.junit.Assert;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultBHttpClientConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultBHttpClientConnection.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultBHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -42,11 +42,7 @@ import org.apache.hc.core5.http.config.M
import org.apache.hc.core5.http.entity.ByteArrayEntity;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.core5.http.impl.entity.DefaultContentLengthStrategy;
-import org.apache.hc.core5.http.impl.io.ChunkedInputStream;
-import org.apache.hc.core5.http.impl.io.ContentLengthInputStream;
-import org.apache.hc.core5.http.impl.io.DefaultHttpRequestWriterFactory;
-import org.apache.hc.core5.http.impl.io.DefaultHttpResponseParserFactory;
+import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.junit.Assert;
import org.junit.Before;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultBHttpServerConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultBHttpServerConnection.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/TestDefaultBHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.impl;
+package org.apache.hc.core5.http.impl.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -41,11 +41,7 @@ import org.apache.hc.core5.http.Protocol
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.entity.StringEntity;
-import org.apache.hc.core5.http.impl.entity.DefaultContentLengthStrategy;
-import org.apache.hc.core5.http.impl.io.ChunkedInputStream;
-import org.apache.hc.core5.http.impl.io.ContentLengthInputStream;
-import org.apache.hc.core5.http.impl.io.DefaultHttpRequestParserFactory;
-import org.apache.hc.core5.http.impl.io.DefaultHttpResponseWriterFactory;
+import org.apache.hc.core5.http.impl.DefaultContentLengthStrategy;
import org.apache.hc.core5.http.message.BasicHttpResponse;
import org.junit.Assert;
import org.junit.Before;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestHttpRequestExecutor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestHttpRequestExecutor.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestHttpRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java Wed Nov 25 15:17:53 2015
@@ -25,20 +25,22 @@
*
*/
-package org.apache.hc.core5.http.protocol;
+package org.apache.hc.core5.http.impl.io;
import java.io.IOException;
import org.apache.hc.core5.http.HeaderElements;
-import org.apache.hc.core5.http.HttpClientConnection;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.ProtocolException;
+import org.apache.hc.core5.http.io.HttpClientConnection;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestHttpService.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestHttpService.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/protocol/TestHttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.protocol;
+package org.apache.hc.core5.http.impl.io;
import java.io.InputStream;
@@ -36,15 +36,21 @@ import org.apache.hc.core5.http.HttpHead
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpResponseFactory;
-import org.apache.hc.core5.http.HttpServerConnection;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.MethodNotSupportedException;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.UnsupportedHttpVersionException;
import org.apache.hc.core5.http.entity.InputStreamEntity;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
+import org.apache.hc.core5.http.io.HttpRequestHandlerMapper;
+import org.apache.hc.core5.http.io.HttpServerConnection;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.HttpExpectationVerifier;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestIdentityInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestIdentityInputStream.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestIdentityInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestIdentityInputStream.java Wed Nov 25 15:17:53 2015
@@ -27,7 +27,6 @@
package org.apache.hc.core5.http.impl.io;
-import org.apache.hc.core5.http.impl.SessionInputBufferMock;
import org.apache.hc.core5.http.io.SessionInputBuffer;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestIdentityOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestIdentityOutputStream.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestIdentityOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestIdentityOutputStream.java Wed Nov 25 15:17:53 2015
@@ -31,7 +31,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.hc.core5.http.impl.SessionOutputBufferMock;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestMessageParser.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestMessageParser.java Wed Nov 25 15:17:53 2015
@@ -34,7 +34,6 @@ import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HeaderElement;
import org.apache.hc.core5.http.NameValuePair;
import org.apache.hc.core5.http.ProtocolException;
-import org.apache.hc.core5.http.impl.SessionInputBufferMock;
import org.apache.hc.core5.http.io.SessionInputBuffer;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java Wed Nov 25 15:17:53 2015
@@ -37,7 +37,6 @@ import org.apache.hc.core5.http.MessageC
import org.apache.hc.core5.http.RequestLine;
import org.apache.hc.core5.http.UnsupportedHttpVersionException;
import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.impl.SessionInputBufferMock;
import org.apache.hc.core5.http.io.SessionInputBuffer;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java Wed Nov 25 15:17:53 2015
@@ -38,7 +38,6 @@ import org.apache.hc.core5.http.NoHttpRe
import org.apache.hc.core5.http.StatusLine;
import org.apache.hc.core5.http.UnsupportedHttpVersionException;
import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.impl.SessionInputBufferMock;
import org.apache.hc.core5.http.io.SessionInputBuffer;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java?rev=1716435&r1=1716434&r2=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java Wed Nov 25 15:17:53 2015
@@ -36,8 +36,6 @@ import java.nio.charset.CodingErrorActio
import org.apache.hc.core5.http.Consts;
import org.apache.hc.core5.http.MessageConstraintException;
import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.impl.SessionInputBufferMock;
-import org.apache.hc.core5.http.impl.SessionOutputBufferMock;
import org.apache.hc.core5.http.io.HttpTransportMetrics;
import org.apache.hc.core5.util.CharArrayBuffer;
import org.junit.Assert;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ByteChannelMock.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ByteChannelMock.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ByteChannelMock.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ByteChannelMock.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ByteChannelMock.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ByteChannelMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ByteChannelMock.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http;
+package org.apache.hc.core5.http.impl.nio;
import java.io.IOException;
import java.nio.ByteBuffer;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/CodecTestUtils.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/CodecTestUtils.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/CodecTestUtils.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/CodecTestUtils.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/CodecTestUtils.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/CodecTestUtils.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/CodecTestUtils.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
import java.io.File;
import java.io.FileInputStream;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ContentDecoderMock.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentDecoderMock.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ContentDecoderMock.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ContentDecoderMock.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentDecoderMock.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentDecoderMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ContentDecoderMock.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.util;
+package org.apache.hc.core5.http.impl.nio;
import java.io.IOException;
import java.nio.ByteBuffer;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ContentEncoderMock.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ContentEncoderMock.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ContentEncoderMock.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/ContentEncoderMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ContentEncoderMock.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.util;
+package org.apache.hc.core5.http.impl.nio;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -33,7 +33,6 @@ import java.nio.channels.WritableByteCha
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
import org.apache.hc.core5.http.nio.SessionOutputBuffer;
-import org.apache.hc.core5.http.nio.codecs.AbstractContentEncoder;
import org.apache.hc.core5.util.Asserts;
public class ContentEncoderMock extends AbstractContentEncoder {
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ExceptionEventTest.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/ExceptionEventTest.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ExceptionEventTest.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ExceptionEventTest.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/ExceptionEventTest.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/ExceptionEventTest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ExceptionEventTest.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
import java.util.Date;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ReadableByteChannelMock.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ReadableByteChannelMock.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ReadableByteChannelMock.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ReadableByteChannelMock.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ReadableByteChannelMock.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/ReadableByteChannelMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/ReadableByteChannelMock.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http;
+package org.apache.hc.core5.http.impl.nio;
import java.io.IOException;
import java.nio.ByteBuffer;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncClientExchangeHandler.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncClientExchangeHandler.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncClientExchangeHandler.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncClientExchangeHandler.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
import java.util.concurrent.ExecutionException;
@@ -36,6 +36,8 @@ import org.apache.hc.core5.http.message.
import org.apache.hc.core5.http.message.BasicHttpResponse;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestProducer;
+import org.apache.hc.core5.http.nio.HttpAsyncResponseConsumer;
import org.apache.hc.core5.http.nio.NHttpClientConnection;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestConsumer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestConsumer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestConsumer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestConsumer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestConsumer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestConsumer.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestHandler.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestHandler.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestHandler.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestHandler.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestHandler.java Wed Nov 25 15:17:53 2015
@@ -25,15 +25,17 @@
*
*/
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.message.BasicRequestLine;
+import org.apache.hc.core5.http.nio.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.http.protocol.HttpRequestHandler;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestProducer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestProducer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestProducer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestProducer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestProducer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncRequestProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncRequestProducer.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseConsumer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseConsumer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseConsumer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseConsumer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseConsumer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseConsumer.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseProducer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseProducer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseProducer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseProducer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseProducer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestBasicAsyncResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBasicAsyncResponseProducer.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBuffers.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBuffers.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBuffers.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/util/TestBuffers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestBuffers.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.util;
+package org.apache.hc.core5.http.impl.nio;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -35,12 +35,12 @@ import java.nio.channels.ReadableByteCha
import java.nio.channels.WritableByteChannel;
import org.apache.hc.core5.http.Consts;
-import org.apache.hc.core5.http.ReadableByteChannelMock;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.ContentEncoder;
import org.apache.hc.core5.http.nio.SessionOutputBuffer;
-import org.apache.hc.core5.http.nio.SessionOutputBufferImpl;
+import org.apache.hc.core5.util.DirectByteBufferAllocator;
+import org.apache.hc.core5.util.HeapByteBufferAllocator;
import org.junit.Assert;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestChunkDecoder.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestChunkDecoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestChunkDecoder.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestChunkDecoder.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -36,12 +36,10 @@ import org.apache.hc.core5.http.Consts;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.MalformedChunkCodingException;
import org.apache.hc.core5.http.MessageConstraintException;
-import org.apache.hc.core5.http.ReadableByteChannelMock;
import org.apache.hc.core5.http.TruncatedChunkException;
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
import org.apache.hc.core5.http.nio.SessionInputBuffer;
-import org.apache.hc.core5.http.nio.SessionInputBufferImpl;
import org.junit.Assert;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestChunkEncoder.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestChunkEncoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestChunkEncoder.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestChunkEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestChunkEncoder.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -33,11 +33,9 @@ import java.nio.ByteBuffer;
import org.apache.hc.core5.http.Consts;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.TrailerSupplier;
-import org.apache.hc.core5.http.WritableByteChannelMock;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
import org.apache.hc.core5.http.message.BasicHeader;
import org.apache.hc.core5.http.nio.SessionOutputBuffer;
-import org.apache.hc.core5.http.nio.SessionOutputBufferImpl;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Matchers;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestContentChannel.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestContentChannel.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestContentChannel.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestContentChannel.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestContentChannel.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestContentChannel.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestContentChannel.java Wed Nov 25 15:17:53 2015
@@ -24,7 +24,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.times;
@@ -32,6 +32,8 @@ import static org.mockito.Mockito.verify
import java.nio.ByteBuffer;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpClientConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpClientConnection.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpClientConnection.java Wed Nov 25 15:17:53 2015
@@ -24,14 +24,13 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
import java.nio.ByteBuffer;
import java.nio.channels.ByteChannel;
import java.nio.channels.SelectionKey;
import java.util.LinkedList;
-import org.apache.hc.core5.http.ByteChannelMock;
import org.apache.hc.core5.http.Consts;
import org.apache.hc.core5.http.HeaderElements;
import org.apache.hc.core5.http.HttpEntity;
@@ -39,14 +38,16 @@ import org.apache.hc.core5.http.HttpHead
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.ReadableByteChannelMock;
-import org.apache.hc.core5.http.WritableByteChannelMock;
import org.apache.hc.core5.http.entity.StringEntity;
import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.core5.http.nio.codecs.LengthDelimitedDecoder;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.nio.NHttpClientEventHandler;
+import org.apache.hc.core5.http.nio.NHttpConnection;
import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;
import org.apache.hc.core5.http.nio.entity.NStringEntity;
-import org.apache.hc.core5.http.nio.util.SimpleInputBuffer;
import org.apache.hc.core5.reactor.IOSession;
import org.junit.Assert;
import org.junit.Before;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpServerConnection.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpServerConnection.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestDefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestDefaultNHttpServerConnection.java Wed Nov 25 15:17:53 2015
@@ -24,28 +24,29 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
import java.nio.ByteBuffer;
import java.nio.channels.ByteChannel;
import java.nio.channels.SelectionKey;
import java.util.LinkedList;
-import org.apache.hc.core5.http.ByteChannelMock;
import org.apache.hc.core5.http.Consts;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.ReadableByteChannelMock;
-import org.apache.hc.core5.http.WritableByteChannelMock;
import org.apache.hc.core5.http.entity.StringEntity;
import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.hc.core5.http.nio.codecs.LengthDelimitedDecoder;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.NHttpConnection;
+import org.apache.hc.core5.http.nio.NHttpServerConnection;
+import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;
import org.apache.hc.core5.http.nio.entity.NStringEntity;
-import org.apache.hc.core5.http.nio.util.SimpleInputBuffer;
import org.apache.hc.core5.reactor.IOSession;
import org.junit.Assert;
import org.junit.Before;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestErrorResponseProducer.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestErrorResponseProducer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestErrorResponseProducer.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestErrorResponseProducer.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestErrorResponseProducer.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestErrorResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestErrorResponseProducer.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequestExecutor.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequestExecutor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequestExecutor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequestExecutor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequestExecutor.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequestExecutor.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
import java.io.IOException;
import java.net.SocketTimeoutException;
@@ -37,14 +37,15 @@ import org.apache.hc.core5.http.HttpExce
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncRequestExecutor.State;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.message.BasicHttpResponse;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.HttpAsyncClientExchangeHandler;
import org.apache.hc.core5.http.nio.NHttpClientConnection;
import org.apache.hc.core5.http.nio.NHttpConnection;
import org.apache.hc.core5.http.nio.entity.NStringEntity;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestExecutor.State;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.junit.After;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequester.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequester.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequester.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncRequester.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncRequester.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@@ -33,9 +33,11 @@ import java.util.concurrent.Future;
import org.apache.hc.core5.concurrent.FutureCallback;
import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncRequester.ConnRequestCallback;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestProducer;
+import org.apache.hc.core5.http.nio.HttpAsyncResponseConsumer;
import org.apache.hc.core5.http.nio.NHttpClientConnection;
-import org.apache.hc.core5.http.nio.pool.BasicNIOPoolEntry;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequester.ConnRequestCallback;
+import org.apache.hc.core5.http.pool.nio.BasicNIOPoolEntry;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncService.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncService.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncService.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncService.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncService.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestHttpAsyncService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpAsyncService.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
import java.io.IOException;
import java.net.SocketTimeoutException;
@@ -42,17 +42,22 @@ import org.apache.hc.core5.http.HttpResp
import org.apache.hc.core5.http.HttpResponseFactory;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncService.Incoming;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncService.Outgoing;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncService.PipelineEntry;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncService.State;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.message.BasicHttpResponse;
import org.apache.hc.core5.http.nio.ContentDecoder;
import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.HttpAsyncExpectationVerifier;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestHandler;
+import org.apache.hc.core5.http.nio.HttpAsyncResponseProducer;
import org.apache.hc.core5.http.nio.NHttpConnection;
import org.apache.hc.core5.http.nio.NHttpServerConnection;
import org.apache.hc.core5.http.nio.entity.NStringEntity;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncService.Incoming;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncService.Outgoing;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncService.PipelineEntry;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncService.State;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpMessageParser.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpMessageParser.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpMessageParser.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestHttpMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestHttpMessageParser.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -44,7 +44,6 @@ import org.apache.hc.core5.http.Unsuppor
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.nio.NHttpMessageParser;
import org.apache.hc.core5.http.nio.SessionInputBuffer;
-import org.apache.hc.core5.http.nio.SessionInputBufferImpl;
import org.junit.Assert;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestIdentityDecoder.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestIdentityDecoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestIdentityDecoder.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestIdentityDecoder.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
import java.io.File;
import java.io.IOException;
@@ -35,10 +35,8 @@ import java.nio.channels.FileChannel;
import java.nio.channels.ReadableByteChannel;
import org.apache.hc.core5.http.Consts;
-import org.apache.hc.core5.http.ReadableByteChannelMock;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
import org.apache.hc.core5.http.nio.SessionInputBuffer;
-import org.apache.hc.core5.http.nio.SessionInputBufferImpl;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestIdentityEncoder.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestIdentityEncoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestIdentityEncoder.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestIdentityEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestIdentityEncoder.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
import java.io.File;
import java.io.IOException;
@@ -34,10 +34,8 @@ import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import org.apache.hc.core5.http.Consts;
-import org.apache.hc.core5.http.WritableByteChannelMock;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
import org.apache.hc.core5.http.nio.SessionOutputBuffer;
-import org.apache.hc.core5.http.nio.SessionOutputBufferImpl;
import org.apache.hc.core5.util.CharArrayBuffer;
import org.junit.After;
import org.junit.Assert;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestLengthDelimitedDecoder.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestLengthDelimitedDecoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestLengthDelimitedDecoder.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestLengthDelimitedDecoder.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
import java.io.File;
import java.io.IOException;
@@ -36,10 +36,8 @@ import java.nio.channels.ReadableByteCha
import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.http.Consts;
-import org.apache.hc.core5.http.ReadableByteChannelMock;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
import org.apache.hc.core5.http.nio.SessionInputBuffer;
-import org.apache.hc.core5.http.nio.SessionInputBufferImpl;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestLengthDelimitedEncoder.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestLengthDelimitedEncoder.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestLengthDelimitedEncoder.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/codecs/TestLengthDelimitedEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestLengthDelimitedEncoder.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.codecs;
+package org.apache.hc.core5.http.impl.nio;
import java.io.File;
import java.io.IOException;
@@ -34,10 +34,8 @@ import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import org.apache.hc.core5.http.Consts;
-import org.apache.hc.core5.http.WritableByteChannelMock;
import org.apache.hc.core5.http.impl.io.HttpTransportMetricsImpl;
import org.apache.hc.core5.http.nio.SessionOutputBuffer;
-import org.apache.hc.core5.http.nio.SessionOutputBufferImpl;
import org.apache.hc.core5.util.CharArrayBuffer;
import org.junit.After;
import org.junit.Assert;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestNHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestNHttpConnectionBase.java Wed Nov 25 15:17:53 2015
@@ -24,21 +24,22 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.nio.channels.ByteChannel;
import java.nio.channels.SelectionKey;
+import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.entity.ContentLengthStrategy;
import org.apache.hc.core5.http.message.BasicHttpResponse;
-import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
+import org.apache.hc.core5.http.nio.NHttpConnection;
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.util.CharArrayBuffer;
+import org.apache.hc.core5.util.HeapByteBufferAllocator;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestSessionInOutBuffers.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestSessionInOutBuffers.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/TestSessionInOutBuffers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio;
+package org.apache.hc.core5.http.impl.nio;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -45,10 +45,12 @@ import java.util.Collection;
import org.apache.hc.core5.http.Consts;
import org.apache.hc.core5.http.MessageConstraintException;
import org.apache.hc.core5.http.config.MessageConstraints;
-import org.apache.hc.core5.http.nio.util.ByteBufferAllocator;
-import org.apache.hc.core5.http.nio.util.DirectByteBufferAllocator;
-import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
+import org.apache.hc.core5.http.nio.SessionInputBuffer;
+import org.apache.hc.core5.http.nio.SessionOutputBuffer;
+import org.apache.hc.core5.util.ByteBufferAllocator;
import org.apache.hc.core5.util.CharArrayBuffer;
+import org.apache.hc.core5.util.DirectByteBufferAllocator;
+import org.apache.hc.core5.util.HeapByteBufferAllocator;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestUriHttpAsyncRequestHandlerMapper.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestUriHttpAsyncRequestHandlerMapper.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestUriHttpAsyncRequestHandlerMapper.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestUriHttpAsyncRequestHandlerMapper.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestUriHttpAsyncRequestHandlerMapper.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/protocol/TestUriHttpAsyncRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/TestUriHttpAsyncRequestHandlerMapper.java Wed Nov 25 15:17:53 2015
@@ -25,10 +25,11 @@
*
*/
-package org.apache.hc.core5.http.nio.protocol;
+package org.apache.hc.core5.http.impl.nio;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestHandler;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.UriPatternMatcher;
import org.junit.Assert;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/WritableByteChannelMock.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/WritableByteChannelMock.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/WritableByteChannelMock.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/WritableByteChannelMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/impl/nio/WritableByteChannelMock.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http;
+package org.apache.hc.core5.http.impl.nio;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -33,8 +33,7 @@ import java.nio.channels.ClosedChannelEx
import java.nio.channels.WritableByteChannel;
import java.nio.charset.Charset;
-import org.apache.hc.core5.http.nio.util.ExpandableBuffer;
-import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
+import org.apache.hc.core5.util.HeapByteBufferAllocator;
public class WritableByteChannelMock implements WritableByteChannel {
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/RndTestPatternGenerator.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/RndTestPatternGenerator.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/RndTestPatternGenerator.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/RndTestPatternGenerator.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/RndTestPatternGenerator.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/RndTestPatternGenerator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/RndTestPatternGenerator.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
import java.util.Random;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/SimpleRequestHandler.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/SimpleRequestHandler.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/SimpleRequestHandler.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/SimpleRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/SimpleRequestHandler.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
import java.io.IOException;
@@ -35,9 +35,9 @@ import org.apache.hc.core5.http.HttpRequ
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.entity.ContentType;
import org.apache.hc.core5.http.entity.EntityUtils;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.nio.entity.NStringEntity;
import org.apache.hc.core5.http.protocol.HttpContext;
-import org.apache.hc.core5.http.protocol.HttpRequestHandler;
final class SimpleRequestHandler implements HttpRequestHandler {
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java (from r1716083, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java&r1=1716083&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestClientOutOfSequenceResponse.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestClientOutOfSequenceResponse.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
import java.net.ServerSocket;
import java.net.Socket;
@@ -40,8 +40,8 @@ import org.apache.hc.core5.http.HttpResp
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.config.ConnectionConfig;
import org.apache.hc.core5.http.message.BasicHttpRequest;
-import org.apache.hc.core5.http.nio.pool.BasicNIOConnFactory;
-import org.apache.hc.core5.http.nio.testserver.HttpClientNio;
+import org.apache.hc.core5.http.pool.nio.BasicNIOConnFactory;
+import org.apache.hc.core5.http.testserver.nio.HttpClientNio;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestCustomSSL.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestCustomSSL.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestCustomSSL.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestCustomSSL.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestCustomSSL.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
import java.io.IOException;
import java.math.BigInteger;
@@ -42,17 +42,17 @@ import org.apache.hc.core5.http.HttpExce
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestHandler;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.nio.NHttpConnection;
-import org.apache.hc.core5.http.nio.pool.BasicNIOConnFactory;
-import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestHandler;
-import org.apache.hc.core5.http.nio.testserver.ClientConnectionFactory;
-import org.apache.hc.core5.http.nio.testserver.HttpClientNio;
-import org.apache.hc.core5.http.nio.testserver.HttpServerNio;
-import org.apache.hc.core5.http.nio.testserver.ServerConnectionFactory;
+import org.apache.hc.core5.http.pool.nio.BasicNIOConnFactory;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
-import org.apache.hc.core5.http.protocol.HttpRequestHandler;
+import org.apache.hc.core5.http.testserver.nio.ClientConnectionFactory;
+import org.apache.hc.core5.http.testserver.nio.HttpClientNio;
+import org.apache.hc.core5.http.testserver.nio.HttpServerNio;
+import org.apache.hc.core5.http.testserver.nio.ServerConnectionFactory;
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.apache.hc.core5.reactor.ssl.SSLSetupHandler;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestDefaultListeningIOReactor.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestDefaultListeningIOReactor.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestDefaultListeningIOReactor.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestDefaultListeningIOReactor.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestDefaultListeningIOReactor.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestDefaultListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestDefaultListeningIOReactor.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
import java.io.IOException;
import java.net.BindException;
@@ -36,9 +36,9 @@ import java.util.concurrent.TimeUnit;
import org.apache.hc.core5.http.HttpResponseInterceptor;
import org.apache.hc.core5.http.config.ConnectionConfig;
-import org.apache.hc.core5.http.nio.DefaultHttpServerIODispatch;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncService;
-import org.apache.hc.core5.http.nio.protocol.UriHttpAsyncRequestHandlerMapper;
+import org.apache.hc.core5.http.impl.nio.DefaultHttpServerIODispatch;
+import org.apache.hc.core5.http.impl.nio.HttpAsyncService;
+import org.apache.hc.core5.http.impl.nio.UriHttpAsyncRequestHandlerMapper;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
import org.apache.hc.core5.http.protocol.ResponseConnControl;
Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlerCancellable.java (from r1716084, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlerCancellable.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlerCancellable.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java&r1=1716084&r2=1716435&rev=1716435&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/nio/integration/TestHttpAsyncHandlerCancellable.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/hc/core5/http/integration/TestHttpAsyncHandlerCancellable.java Wed Nov 25 15:17:53 2015
@@ -25,7 +25,7 @@
*
*/
-package org.apache.hc.core5.http.nio.integration;
+package org.apache.hc.core5.http.integration;
import java.io.BufferedWriter;
import java.io.IOException;
@@ -43,16 +43,16 @@ import org.apache.hc.core5.http.HttpResp
import org.apache.hc.core5.http.HttpVersion;
import org.apache.hc.core5.http.entity.BasicHttpEntity;
import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.impl.nio.BasicAsyncRequestConsumer;
import org.apache.hc.core5.http.message.BasicHttpResponse;
import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.HttpAsyncExchange;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestConsumer;
+import org.apache.hc.core5.http.nio.HttpAsyncRequestHandler;
+import org.apache.hc.core5.http.nio.HttpAsyncResponseProducer;
import org.apache.hc.core5.http.nio.IOControl;
-import org.apache.hc.core5.http.nio.protocol.BasicAsyncRequestConsumer;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncExchange;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestConsumer;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncRequestHandler;
-import org.apache.hc.core5.http.nio.protocol.HttpAsyncResponseProducer;
-import org.apache.hc.core5.http.nio.testserver.HttpCoreNIOTestBase;
import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.testserver.nio.HttpCoreNIOTestBase;
import org.apache.hc.core5.reactor.ListenerEndpoint;
import org.junit.After;
import org.junit.Assert;