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 2011/05/10 15:15:03 UTC

svn commit: r1101455 - in /httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http: impl/ impl/entity/ impl/io/ mockup/

Author: olegk
Date: Tue May 10 13:15:03 2011
New Revision: 1101455

URL: http://svn.apache.org/viewvc?rev=1101455&view=rev
Log:
Test case restructuring

Added:
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/SessionInputBufferMockup.java
      - copied, changed from r1101452, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/SessionOutputBufferMockup.java
      - copied, changed from r1101452, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/SessionOutputBufferMockup.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TimeoutByteArrayInputStream.java
      - copied, changed from r1101452, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TimeoutByteArrayInputStream.java
Removed:
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/SessionOutputBufferMockup.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TimeoutByteArrayInputStream.java
Modified:
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestSessionBuffers.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestChunkCoding.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthInputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityInputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestMessageParser.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestSessionBuffers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestSessionBuffers.java?rev=1101455&r1=1101454&r2=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestSessionBuffers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestSessionBuffers.java Tue May 10 13:15:03 2011
@@ -32,9 +32,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.http.impl.io.SessionInputBufferMockup;
+import org.apache.http.impl.io.SessionOutputBufferMockup;
 import org.apache.http.io.HttpTransportMetrics;
-import org.apache.http.mockup.SessionInputBufferMockup;
-import org.apache.http.mockup.SessionOutputBufferMockup;
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.params.HttpParams;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java?rev=1101455&r1=1101454&r2=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java Tue May 10 13:15:03 2011
@@ -35,8 +35,8 @@ import org.apache.http.ProtocolException
 import org.apache.http.impl.io.ChunkedInputStream;
 import org.apache.http.impl.io.ContentLengthInputStream;
 import org.apache.http.impl.io.IdentityInputStream;
+import org.apache.http.impl.io.SessionInputBufferMockup;
 import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.mockup.SessionInputBufferMockup;
 import org.apache.http.params.CoreProtocolPNames;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java?rev=1101455&r1=1101454&r2=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java Tue May 10 13:15:03 2011
@@ -36,8 +36,8 @@ import org.apache.http.entity.ByteArrayE
 import org.apache.http.impl.io.ChunkedOutputStream;
 import org.apache.http.impl.io.ContentLengthOutputStream;
 import org.apache.http.impl.io.IdentityOutputStream;
+import org.apache.http.impl.io.SessionOutputBufferMockup;
 import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.mockup.SessionOutputBufferMockup;
 import org.apache.http.params.CoreProtocolPNames;
 import org.junit.Assert;
 import org.junit.Test;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/SessionInputBufferMockup.java (from r1101452, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/SessionInputBufferMockup.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/SessionInputBufferMockup.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java&r1=1101452&r2=1101455&rev=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/SessionInputBufferMockup.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/SessionInputBufferMockup.java Tue May 10 13:15:03 2011
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.mockup;
+package org.apache.http.impl.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/SessionOutputBufferMockup.java (from r1101452, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/SessionOutputBufferMockup.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/SessionOutputBufferMockup.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/SessionOutputBufferMockup.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/SessionOutputBufferMockup.java&r1=1101452&r2=1101455&rev=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/SessionOutputBufferMockup.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/SessionOutputBufferMockup.java Tue May 10 13:15:03 2011
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.mockup;
+package org.apache.http.impl.io;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestChunkCoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestChunkCoding.java?rev=1101455&r1=1101454&r2=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestChunkCoding.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestChunkCoding.java Tue May 10 13:15:03 2011
@@ -36,9 +36,6 @@ import java.io.OutputStream;
 import org.apache.http.Header;
 import org.apache.http.MalformedChunkCodingException;
 import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.mockup.SessionInputBufferMockup;
-import org.apache.http.mockup.SessionOutputBufferMockup;
-import org.apache.http.mockup.TimeoutByteArrayInputStream;
 import org.apache.http.util.EncodingUtils;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthInputStream.java?rev=1101455&r1=1101454&r2=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthInputStream.java Tue May 10 13:15:03 2011
@@ -31,7 +31,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.http.mockup.SessionInputBufferMockup;
 import org.apache.http.util.EncodingUtils;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthOutputStream.java?rev=1101455&r1=1101454&r2=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthOutputStream.java Tue May 10 13:15:03 2011
@@ -31,7 +31,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.http.mockup.SessionOutputBufferMockup;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityInputStream.java?rev=1101455&r1=1101454&r2=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityInputStream.java Tue May 10 13:15:03 2011
@@ -28,7 +28,6 @@
 package org.apache.http.impl.io;
 
 import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.mockup.SessionInputBufferMockup;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityOutputStream.java?rev=1101455&r1=1101454&r2=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityOutputStream.java Tue May 10 13:15:03 2011
@@ -31,7 +31,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.http.mockup.SessionOutputBufferMockup;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestMessageParser.java?rev=1101455&r1=1101454&r2=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestMessageParser.java Tue May 10 13:15:03 2011
@@ -35,7 +35,6 @@ import org.apache.http.NameValuePair;
 import org.apache.http.ProtocolException;
 import org.apache.http.io.SessionInputBuffer;
 import org.apache.http.message.BufferedHeader;
-import org.apache.http.mockup.SessionInputBufferMockup;
 import org.junit.Assert;
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java?rev=1101455&r1=1101454&r2=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java Tue May 10 13:15:03 2011
@@ -41,8 +41,6 @@ import org.apache.http.RequestLine;
 import org.apache.http.impl.DefaultHttpRequestFactory;
 import org.apache.http.io.SessionInputBuffer;
 import org.apache.http.message.BasicLineParser;
-import org.apache.http.mockup.SessionInputBufferMockup;
-import org.apache.http.mockup.TimeoutByteArrayInputStream;
 import org.apache.http.params.BasicHttpParams;
 import org.junit.Assert;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java?rev=1101455&r1=1101454&r2=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java Tue May 10 13:15:03 2011
@@ -37,8 +37,6 @@ import org.apache.http.StatusLine;
 import org.apache.http.impl.DefaultHttpResponseFactory;
 import org.apache.http.io.SessionInputBuffer;
 import org.apache.http.message.BasicLineParser;
-import org.apache.http.mockup.SessionInputBufferMockup;
-import org.apache.http.mockup.TimeoutByteArrayInputStream;
 import org.apache.http.params.BasicHttpParams;
 import org.junit.Assert;
 import org.junit.Test;

Copied: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TimeoutByteArrayInputStream.java (from r1101452, httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TimeoutByteArrayInputStream.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TimeoutByteArrayInputStream.java?p2=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TimeoutByteArrayInputStream.java&p1=httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TimeoutByteArrayInputStream.java&r1=1101452&r2=1101455&rev=1101455&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/TimeoutByteArrayInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TimeoutByteArrayInputStream.java Tue May 10 13:15:03 2011
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.mockup;
+package org.apache.http.impl.io;
 
 import java.io.IOException;
 import java.io.InputStream;