Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 61280 invoked from network); 23 Apr 2010 19:13:17 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 23 Apr 2010 19:13:17 -0000 Received: (qmail 30952 invoked by uid 500); 23 Apr 2010 19:13:17 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 30916 invoked by uid 500); 23 Apr 2010 19:13:17 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 30909 invoked by uid 99); 23 Apr 2010 19:13:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Apr 2010 19:13:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Apr 2010 19:13:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3156F2388B45; Fri, 23 Apr 2010 19:12:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r937477 [9/9] - in /httpcomponents/httpcore/trunk/httpcore-nio/src: main/java/org/apache/http/impl/nio/ main/java/org/apache/http/impl/nio/codecs/ main/java/org/apache/http/impl/nio/reactor/ main/java/org/apache/http/impl/nio/ssl/ main/java... Date: Fri, 23 Apr 2010 19:11:57 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100423191200.3156F2388B45@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java?rev=937477&r1=937476&r2=937477&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java Fri Apr 23 19:11:53 2010 @@ -52,7 +52,7 @@ import org.apache.http.util.EncodingUtil /** * Buffer tests. * - * + * * @version $Id:TestBuffers.java 503277 2007-02-03 18:22:45 +0000 (Sat, 03 Feb 2007) olegk $ */ public class TestBuffers extends TestCase { @@ -66,23 +66,23 @@ public class TestBuffers extends TestCas public void testInputBufferOperations() throws IOException { ReadableByteChannel channel = new ReadableByteChannelMockup( - new String[] {"stuff;", "more stuff"}, "US-ASCII"); - - ContentDecoder decoder = new MockupDecoder(channel); - + new String[] {"stuff;", "more stuff"}, "US-ASCII"); + + ContentDecoder decoder = new MockupDecoder(channel); + SimpleInputBuffer buffer = new SimpleInputBuffer(4, new DirectByteBufferAllocator()); int count = buffer.consumeContent(decoder); assertEquals(16, count); assertTrue(decoder.isCompleted()); - + byte[] b1 = new byte[5]; - + int len = buffer.read(b1); assertEquals("stuff", EncodingUtils.getAsciiString(b1, 0, len)); - + int c = buffer.read(); assertEquals(';', c); - + byte[] b2 = new byte[1024]; len = buffer.read(b2); @@ -92,7 +92,7 @@ public class TestBuffers extends TestCas assertEquals(-1, buffer.read(b2)); assertEquals(-1, buffer.read(b2, 0, b2.length)); assertTrue(buffer.isEndOfStream()); - + buffer.reset(); assertFalse(buffer.isEndOfStream()); } @@ -103,11 +103,11 @@ public class TestBuffers extends TestCas HttpParams params = new BasicHttpParams(); SessionOutputBuffer outbuf = new SessionOutputBufferImpl(1024, 128, params); HttpTransportMetricsImpl metrics = new HttpTransportMetricsImpl(); - + ContentEncoder encoder = new MockupEncoder(channel, outbuf, metrics); - - SimpleOutputBuffer buffer = new SimpleOutputBuffer(4, new DirectByteBufferAllocator()); - + + SimpleOutputBuffer buffer = new SimpleOutputBuffer(4, new DirectByteBufferAllocator()); + buffer.write(EncodingUtils.getAsciiBytes("stuff")); buffer.write(';'); buffer.produceContent(encoder); @@ -115,15 +115,15 @@ public class TestBuffers extends TestCas buffer.write(EncodingUtils.getAsciiBytes("more ")); buffer.write(EncodingUtils.getAsciiBytes("stuff")); buffer.produceContent(encoder); - + byte[] content = outstream.toByteArray(); assertEquals("stuff;more stuff", EncodingUtils.getAsciiString(content)); } public void testBufferInfo() throws Exception { SimpleOutputBuffer buffer = new SimpleOutputBuffer(8, new DirectByteBufferAllocator()); - BufferInfo bufferinfo = buffer; - + BufferInfo bufferinfo = buffer; + assertEquals(0, bufferinfo.length()); assertEquals(8, bufferinfo.available()); buffer.write(new byte[] {'1', '2', '3', '4'}); @@ -133,20 +133,20 @@ public class TestBuffers extends TestCas assertEquals(12, bufferinfo.length()); assertEquals(0, bufferinfo.available()); } - + public void testInputBufferNullInput() throws IOException { SimpleInputBuffer buffer = new SimpleInputBuffer(4, new DirectByteBufferAllocator()); assertEquals(0, buffer.read(null)); assertEquals(0, buffer.read(null, 0, 0)); } - + public void testOutputBufferNullInput() throws IOException { SimpleOutputBuffer buffer = new SimpleOutputBuffer(4, new DirectByteBufferAllocator()); buffer.write(null); buffer.write(null, 0, 10); assertFalse(buffer.hasData()); } - + public void testDirectByteBufferAllocator() { DirectByteBufferAllocator allocator = new DirectByteBufferAllocator(); ByteBuffer buffer = allocator.allocate(1); @@ -155,13 +155,13 @@ public class TestBuffers extends TestCas assertEquals(0, buffer.position()); assertEquals(1, buffer.limit()); assertEquals(1, buffer.capacity()); - + buffer = allocator.allocate(2048); assertTrue(buffer.isDirect()); assertEquals(0, buffer.position()); assertEquals(2048, buffer.limit()); assertEquals(2048, buffer.capacity()); - + buffer = allocator.allocate(0); assertTrue(buffer.isDirect()); assertEquals(0, buffer.position()); @@ -177,18 +177,18 @@ public class TestBuffers extends TestCas assertEquals(0, buffer.position()); assertEquals(1, buffer.limit()); assertEquals(1, buffer.capacity()); - + buffer = allocator.allocate(2048); assertFalse(buffer.isDirect()); assertEquals(0, buffer.position()); assertEquals(2048, buffer.limit()); assertEquals(2048, buffer.capacity()); - + buffer = allocator.allocate(0); assertFalse(buffer.isDirect()); assertEquals(0, buffer.position()); assertEquals(0, buffer.limit()); assertEquals(0, buffer.capacity()); } - + }