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 2018/08/21 15:01:26 UTC
[15/32] httpcomponents-core git commit: Use camel-case for ivars and
param names; don't nest with else clauses unnecessarily;
comment intention of empty blocks;
use "readLen" name for local var instead of "i" or other cryptic name to hold
read length of
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestMessageParser.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestMessageParser.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestMessageParser.java
index 3bac6d1..ee0908f 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestMessageParser.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestMessageParser.java
@@ -53,8 +53,8 @@ public class TestMessageParser {
" \r\n" +
"\r\n";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
- final Header[] headers = AbstractMessageParser.parseHeaders(inbuffer, inputStream, -1, -1, null);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final Header[] headers = AbstractMessageParser.parseHeaders(inBuffer, inputStream, -1, -1, null);
Assert.assertNotNull(headers);
Assert.assertEquals(3, headers.length);
Assert.assertEquals("header1", headers[0].getName());
@@ -70,8 +70,8 @@ public class TestMessageParser {
final String s = "header1: stuff; param1 = value1; param2 = \"value 2\" \r\n" +
"\r\n";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
- final Header[] headers = AbstractMessageParser.parseHeaders(inbuffer, inputStream, -1, -1, null);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final Header[] headers = AbstractMessageParser.parseHeaders(inBuffer, inputStream, -1, -1, null);
Assert.assertNotNull(headers);
Assert.assertEquals(1, headers.length);
Assert.assertEquals("header1: stuff; param1 = value1; param2 = \"value 2\" ", headers[0].toString());
@@ -83,9 +83,9 @@ public class TestMessageParser {
"header1: stuff\r\n" +
"\r\n";
final ByteArrayInputStream inputStream1 = new ByteArrayInputStream(s1.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer1 = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final SessionInputBuffer inBuffer1 = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
try {
- AbstractMessageParser.parseHeaders(inbuffer1, inputStream1, -1, -1, null);
+ AbstractMessageParser.parseHeaders(inBuffer1, inputStream1, -1, -1, null);
Assert.fail("ProtocolException should have been thrown");
} catch (final ProtocolException ex) {
// expected
@@ -94,9 +94,9 @@ public class TestMessageParser {
"header1: stuff\r\n" +
"\r\n";
final ByteArrayInputStream inputStream2 = new ByteArrayInputStream(s2.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer2 = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final SessionInputBuffer inBuffer2 = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
try {
- AbstractMessageParser.parseHeaders(inbuffer2, inputStream2, -1, -1, null);
+ AbstractMessageParser.parseHeaders(inBuffer2, inputStream2, -1, -1, null);
Assert.fail("ProtocolException should have been thrown");
} catch (final ProtocolException ex) {
// expected
@@ -109,8 +109,8 @@ public class TestMessageParser {
" header1: stuff\r\n" +
"header2: stuff \r\n";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
- final Header[] headers = AbstractMessageParser.parseHeaders(inbuffer, inputStream, -1, -1, null);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final Header[] headers = AbstractMessageParser.parseHeaders(inBuffer, inputStream, -1, -1, null);
Assert.assertNotNull(headers);
Assert.assertEquals(2, headers.length);
Assert.assertEquals("header1", headers[0].getName());
@@ -123,8 +123,8 @@ public class TestMessageParser {
public void testEmptyDataStream() throws Exception {
final String s = "";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
- final Header[] headers = AbstractMessageParser.parseHeaders(inbuffer, inputStream, -1, -1, null);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final Header[] headers = AbstractMessageParser.parseHeaders(inBuffer, inputStream, -1, -1, null);
Assert.assertNotNull(headers);
Assert.assertEquals(0, headers.length);
}
@@ -137,9 +137,9 @@ public class TestMessageParser {
"header3: stuff\r\n" +
"\r\n";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
try {
- AbstractMessageParser.parseHeaders(inbuffer, inputStream, 2, -1, null);
+ AbstractMessageParser.parseHeaders(inBuffer, inputStream, 2, -1, null);
Assert.fail("IOException should have been thrown");
} catch (final IOException ex) {
// expected
@@ -154,9 +154,9 @@ public class TestMessageParser {
" stuff\r\n" +
"\r\n";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
try {
- AbstractMessageParser.parseHeaders(inbuffer, inputStream, 2, 15, null);
+ AbstractMessageParser.parseHeaders(inBuffer, inputStream, 2, 15, null);
Assert.fail("IOException should have been thrown");
} catch (final IOException ex) {
// expected
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
index e78b3e6..462e293 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestRequestParser.java
@@ -53,10 +53,10 @@ public class TestRequestParser {
"Cookie: c1=stuff\r\n" +
"\r\n";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
final DefaultHttpRequestParser parser = new DefaultHttpRequestParser();
- final ClassicHttpRequest httprequest = parser.parse(inbuffer, inputStream);
+ final ClassicHttpRequest httprequest = parser.parse(inBuffer, inputStream);
Assert.assertEquals("GET", httprequest.getMethod());
Assert.assertEquals("/", httprequest.getPath());
@@ -67,10 +67,10 @@ public class TestRequestParser {
@Test(expected = ConnectionClosedException.class)
public void testConnectionClosedException() throws Exception {
final ByteArrayInputStream inputStream = new ByteArrayInputStream(new byte[] {});
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16);
final DefaultHttpRequestParser parser = new DefaultHttpRequestParser();
- parser.parse(inbuffer, inputStream);
+ parser.parse(inBuffer, inputStream);
}
@Test
@@ -82,11 +82,11 @@ public class TestRequestParser {
"Host: localhost\r\n" +
"\r\n";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
final DefaultHttpRequestParser parser = new DefaultHttpRequestParser(
H1Config.custom().setMaxEmptyLineCount(3).build());
- final ClassicHttpRequest httprequest = parser.parse(inbuffer, inputStream);
+ final ClassicHttpRequest httprequest = parser.parse(inBuffer, inputStream);
Assert.assertEquals("GET", httprequest.getMethod());
Assert.assertEquals("/", httprequest.getPath());
@@ -104,11 +104,11 @@ public class TestRequestParser {
"Host: localhost\r\n" +
"\r\n";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
final DefaultHttpRequestParser parser = new DefaultHttpRequestParser(
H1Config.custom().setMaxEmptyLineCount(3).build());
- parser.parse(inbuffer, inputStream);
+ parser.parse(inBuffer, inputStream);
}
@Test
@@ -120,7 +120,7 @@ public class TestRequestParser {
"Coo\000kie: c1=stuff\r\n" +
"\000\r\n";
final TimeoutByteArrayInputStream inputStream = new TimeoutByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16);
final DefaultHttpRequestParser parser = new DefaultHttpRequestParser();
@@ -129,7 +129,7 @@ public class TestRequestParser {
ClassicHttpRequest httprequest = null;
for (int i = 0; i < 10; i++) {
try {
- httprequest = parser.parse(inbuffer, inputStream);
+ httprequest = parser.parse(inBuffer, inputStream);
break;
} catch (final InterruptedIOException ex) {
timeoutCount++;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
index 09bae3b..480ee87 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestResponseParser.java
@@ -54,10 +54,10 @@ public class TestResponseParser {
"Set-Cookie: c1=stuff\r\n" +
"\r\n";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
final DefaultHttpResponseParser parser = new DefaultHttpResponseParser();
- final ClassicHttpResponse httpresponse = parser.parse(inbuffer, inputStream);
+ final ClassicHttpResponse httpresponse = parser.parse(inBuffer, inputStream);
Assert.assertEquals(200, httpresponse.getCode());
Assert.assertEquals("OK", httpresponse.getReasonPhrase());
@@ -68,10 +68,10 @@ public class TestResponseParser {
@Test(expected = NoHttpResponseException.class)
public void testConnectionClosedException() throws Exception {
final ByteArrayInputStream inputStream = new ByteArrayInputStream(new byte[] {});
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16);
final DefaultHttpResponseParser parser = new DefaultHttpResponseParser();
- parser.parse(inbuffer, inputStream);
+ parser.parse(inBuffer, inputStream);
}
@Test
@@ -83,11 +83,11 @@ public class TestResponseParser {
"Server: whatever\r\n" +
"\r\n";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
final DefaultHttpResponseParser parser = new DefaultHttpResponseParser(
H1Config.custom().setMaxEmptyLineCount(3).build());
- final ClassicHttpResponse httpresponse = parser.parse(inbuffer, inputStream);
+ final ClassicHttpResponse httpresponse = parser.parse(inBuffer, inputStream);
Assert.assertEquals(200, httpresponse.getCode());
Assert.assertEquals("OK", httpresponse.getReasonPhrase());
@@ -105,11 +105,11 @@ public class TestResponseParser {
"Server: whatever\r\n" +
"\r\n";
final ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.US_ASCII.newDecoder());
final DefaultHttpResponseParser parser = new DefaultHttpResponseParser(
H1Config.custom().setMaxEmptyLineCount(3).build());
- parser.parse(inbuffer, inputStream);
+ parser.parse(inBuffer, inputStream);
}
@Test
@@ -121,7 +121,7 @@ public class TestResponseParser {
"Set-Coo\000kie: c1=stuff\r\n" +
"\000\r\n";
final TimeoutByteArrayInputStream inputStream = new TimeoutByteArrayInputStream(s.getBytes(StandardCharsets.US_ASCII));
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16);
final DefaultHttpResponseParser parser = new DefaultHttpResponseParser();
@@ -130,7 +130,7 @@ public class TestResponseParser {
ClassicHttpResponse httpresponse = null;
for (int i = 0; i < 10; i++) {
try {
- httpresponse = parser.parse(inbuffer, inputStream);
+ httpresponse = parser.parse(inBuffer, inputStream);
break;
} catch (final InterruptedIOException ex) {
timeoutCount++;
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
index 64f8891..5b48379 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestSessionInOutBuffers.java
@@ -51,14 +51,14 @@ public class TestSessionInOutBuffers {
@Test
public void testBasicBufferProperties() throws Exception {
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16);
final ByteArrayInputStream inputStream = new ByteArrayInputStream(new byte[] { 1, 2 , 3});
- Assert.assertEquals(16, inbuffer.capacity());
- Assert.assertEquals(16, inbuffer.available());
- Assert.assertEquals(0, inbuffer.length());
- inbuffer.read(inputStream);
- Assert.assertEquals(14, inbuffer.available());
- Assert.assertEquals(2, inbuffer.length());
+ Assert.assertEquals(16, inBuffer.capacity());
+ Assert.assertEquals(16, inBuffer.available());
+ Assert.assertEquals(0, inBuffer.length());
+ inBuffer.read(inputStream);
+ Assert.assertEquals(14, inBuffer.available());
+ Assert.assertEquals(2, inBuffer.length());
final SessionOutputBuffer outbuffer = new SessionOutputBufferImpl(16);
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -106,20 +106,20 @@ public class TestSessionInOutBuffers {
}
Assert.assertEquals(expected, bytesWritten);
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16);
final ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
for (final String teststr : teststrs) {
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals(teststr, chbuffer.toString());
}
chbuffer.clear();
- Assert.assertEquals(-1, inbuffer.readLine(chbuffer, inputStream));
+ Assert.assertEquals(-1, inBuffer.readLine(chbuffer, inputStream));
chbuffer.clear();
- Assert.assertEquals(-1, inbuffer.readLine(chbuffer, inputStream));
- tmetrics = inbuffer.getMetrics();
+ Assert.assertEquals(-1, inBuffer.readLine(chbuffer, inputStream));
+ tmetrics = inBuffer.getMetrics();
final long bytesRead = tmetrics.getBytesTransferred();
Assert.assertEquals(expected, bytesRead);
}
@@ -179,41 +179,41 @@ public class TestSessionInOutBuffers {
bytesWritten = outbuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(8 + 14 + 2 + 15 + 2 + 16 + 2 + 1, bytesWritten);
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16);
final ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
final CharArrayBuffer chbuffer = new CharArrayBuffer(16);
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals("a", chbuffer.toString());
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals("", chbuffer.toString());
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals("\r", chbuffer.toString());
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals("", chbuffer.toString());
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals(s1, chbuffer.toString());
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals(s2, chbuffer.toString());
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals(s3, chbuffer.toString());
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals("a", chbuffer.toString());
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
- Assert.assertEquals(-1, inbuffer.readLine(chbuffer, inputStream));
+ inBuffer.readLine(chbuffer, inputStream);
+ Assert.assertEquals(-1, inBuffer.readLine(chbuffer, inputStream));
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
- Assert.assertEquals(-1, inbuffer.readLine(chbuffer, inputStream));
- final long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ inBuffer.readLine(chbuffer, inputStream);
+ Assert.assertEquals(-1, inBuffer.readLine(chbuffer, inputStream));
+ final long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(bytesWritten, bytesRead);
}
@@ -252,19 +252,19 @@ public class TestSessionInOutBuffers {
}
Assert.assertEquals(expected, bytesWritten);
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(1024);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(1024);
final ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
for (final String teststr : teststrs) {
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals(teststr, chbuffer.toString());
}
chbuffer.clear();
- Assert.assertEquals(-1, inbuffer.readLine(chbuffer, inputStream));
+ Assert.assertEquals(-1, inBuffer.readLine(chbuffer, inputStream));
chbuffer.clear();
- Assert.assertEquals(-1, inbuffer.readLine(chbuffer, inputStream));
- final long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertEquals(-1, inBuffer.readLine(chbuffer, inputStream));
+ final long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(expected, bytesRead);
}
@@ -298,13 +298,13 @@ public class TestSessionInOutBuffers {
Assert.assertEquals(out[i], tmp[i]);
}
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16);
final ByteArrayInputStream inputStream = new ByteArrayInputStream(tmp);
// these read operations will have no effect
- Assert.assertEquals(0, inbuffer.read(null, 0, 10, inputStream));
- Assert.assertEquals(0, inbuffer.read(null, inputStream));
- long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertEquals(0, inBuffer.read(null, 0, 10, inputStream));
+ Assert.assertEquals(0, inBuffer.read(null, inputStream));
+ long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(0, bytesRead);
final byte[] in = new byte[40];
@@ -315,19 +315,19 @@ public class TestSessionInOutBuffers {
if (chunk > remaining) {
chunk = remaining;
}
- final int l = inbuffer.read(in, off, chunk, inputStream);
- if (l == -1) {
+ final int readLen = inBuffer.read(in, off, chunk, inputStream);
+ if (readLen == -1) {
break;
}
- off += l;
- remaining -= l;
+ off += readLen;
+ remaining -= readLen;
}
for (int i = 0; i < out.length; i++) {
Assert.assertEquals(out[i], in[i]);
}
- Assert.assertEquals(-1, inbuffer.read(tmp, inputStream));
- Assert.assertEquals(-1, inbuffer.read(tmp, inputStream));
- bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertEquals(-1, inBuffer.read(tmp, inputStream));
+ Assert.assertEquals(-1, inBuffer.read(tmp, inputStream));
+ bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(out.length, bytesRead);
}
@@ -353,18 +353,18 @@ public class TestSessionInOutBuffers {
Assert.assertEquals(out[i], tmp[i]);
}
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16);
final ByteArrayInputStream inputStream = new ByteArrayInputStream(tmp);
final byte[] in = new byte[40];
for (int i = 0; i < in.length; i++) {
- in[i] = (byte)inbuffer.read(inputStream);
+ in[i] = (byte)inBuffer.read(inputStream);
}
for (int i = 0; i < out.length; i++) {
Assert.assertEquals(out[i], in[i]);
}
- Assert.assertEquals(-1, inbuffer.read(inputStream));
- Assert.assertEquals(-1, inbuffer.read(inputStream));
- final long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertEquals(-1, inBuffer.read(inputStream));
+ Assert.assertEquals(-1, inBuffer.read(inputStream));
+ final long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(out.length, bytesRead);
}
@@ -398,19 +398,19 @@ public class TestSessionInOutBuffers {
final String s = "a very looooooooooooooooooooooooooooooooooooooooooong line\r\n";
final byte[] tmp = s.getBytes(StandardCharsets.US_ASCII);
// no limit
- final SessionInputBuffer inbuffer1 = new SessionInputBufferImpl(5);
+ final SessionInputBuffer inBuffer1 = new SessionInputBufferImpl(5);
final InputStream inputStream1 = new ByteArrayInputStream(tmp);
final CharArrayBuffer chbuffer = new CharArrayBuffer(16);
- inbuffer1.readLine(chbuffer, inputStream1);
- final long bytesRead = inbuffer1.getMetrics().getBytesTransferred();
+ inBuffer1.readLine(chbuffer, inputStream1);
+ final long bytesRead = inBuffer1.getMetrics().getBytesTransferred();
Assert.assertEquals(60, bytesRead);
// 15 char limit
- final SessionInputBuffer inbuffer2 = new SessionInputBufferImpl(5, 15);
+ final SessionInputBuffer inBuffer2 = new SessionInputBufferImpl(5, 15);
final InputStream inputStream2 = new ByteArrayInputStream(tmp);
try {
chbuffer.clear();
- inbuffer2.readLine(chbuffer, inputStream2);
+ inBuffer2.readLine(chbuffer, inputStream2);
Assert.fail("MessageConstraintException expected");
} catch (final MessageConstraintException ex) {
}
@@ -421,19 +421,19 @@ public class TestSessionInOutBuffers {
final String s = "just a line\r\n";
final byte[] tmp = s.getBytes(StandardCharsets.US_ASCII);
// no limit
- final SessionInputBuffer inbuffer1 = new SessionInputBufferImpl(25);
+ final SessionInputBuffer inBuffer1 = new SessionInputBufferImpl(25);
final InputStream inputStream1 = new ByteArrayInputStream(tmp);
final CharArrayBuffer chbuffer = new CharArrayBuffer(16);
- inbuffer1.readLine(chbuffer, inputStream1);
- final long bytesRead = inbuffer1.getMetrics().getBytesTransferred();
+ inBuffer1.readLine(chbuffer, inputStream1);
+ final long bytesRead = inBuffer1.getMetrics().getBytesTransferred();
Assert.assertEquals(13, bytesRead);
// 10 char limit
- final SessionInputBuffer inbuffer2 = new SessionInputBufferImpl(25, 10);
+ final SessionInputBuffer inBuffer2 = new SessionInputBufferImpl(25, 10);
final InputStream inputStream2 = new ByteArrayInputStream(tmp);
try {
chbuffer.clear();
- inbuffer2.readLine(chbuffer, inputStream2);
+ inBuffer2.readLine(chbuffer, inputStream2);
Assert.fail("MessageConstraintException expected");
} catch (final MessageConstraintException ex) {
}
@@ -443,10 +443,10 @@ public class TestSessionInOutBuffers {
public void testLineLimit3() throws Exception {
final String s = "012345678\r\nblaaaaaaaaaaaaaaaaaah";
final byte[] tmp = s.getBytes(StandardCharsets.US_ASCII);
- final SessionInputBuffer inbuffer1 = new SessionInputBufferImpl(128);
+ final SessionInputBuffer inBuffer1 = new SessionInputBufferImpl(128);
final ByteArrayInputStream inputStream = new ByteArrayInputStream(tmp);
final CharArrayBuffer chbuffer = new CharArrayBuffer(16);
- inbuffer1.readLine(chbuffer, inputStream);
+ inBuffer1.readLine(chbuffer, inputStream);
Assert.assertEquals("012345678", chbuffer.toString());
}
@@ -454,14 +454,14 @@ public class TestSessionInOutBuffers {
public void testReadLineFringeCase1() throws Exception {
final String s = "abc\r\n";
final byte[] tmp = s.getBytes(StandardCharsets.US_ASCII);
- final SessionInputBuffer inbuffer1 = new SessionInputBufferImpl(128);
+ final SessionInputBuffer inBuffer1 = new SessionInputBufferImpl(128);
final ByteArrayInputStream inputStream = new ByteArrayInputStream(tmp);
- Assert.assertEquals('a', inbuffer1.read(inputStream));
- Assert.assertEquals('b', inbuffer1.read(inputStream));
- Assert.assertEquals('c', inbuffer1.read(inputStream));
- Assert.assertEquals('\r', inbuffer1.read(inputStream));
+ Assert.assertEquals('a', inBuffer1.read(inputStream));
+ Assert.assertEquals('b', inBuffer1.read(inputStream));
+ Assert.assertEquals('c', inBuffer1.read(inputStream));
+ Assert.assertEquals('\r', inBuffer1.read(inputStream));
final CharArrayBuffer chbuffer = new CharArrayBuffer(16);
- Assert.assertEquals(0, inbuffer1.readLine(chbuffer, inputStream));
+ Assert.assertEquals(0, inBuffer1.readLine(chbuffer, inputStream));
}
static final int SWISS_GERMAN_HELLO [] = {
@@ -511,25 +511,25 @@ public class TestSessionInOutBuffers {
(s3.getBytes(StandardCharsets.UTF_8).length + 2)) * 10;
Assert.assertEquals(expected, bytesWritten);
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.UTF_8.newDecoder());
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.UTF_8.newDecoder());
final ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
for (int i = 0; i < 10; i++) {
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals(s1, chbuffer.toString());
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals(s2, chbuffer.toString());
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals(s3, chbuffer.toString());
}
chbuffer.clear();
- Assert.assertEquals(-1, inbuffer.readLine(chbuffer, inputStream));
+ Assert.assertEquals(-1, inBuffer.readLine(chbuffer, inputStream));
chbuffer.clear();
- Assert.assertEquals(-1, inbuffer.readLine(chbuffer, inputStream));
- final long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertEquals(-1, inBuffer.readLine(chbuffer, inputStream));
+ final long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(expected, bytesRead);
}
@@ -552,11 +552,11 @@ public class TestSessionInOutBuffers {
outbuffer.writeLine(chbuffer, outputStream);
outbuffer.flush(outputStream);
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.UTF_8.newDecoder());
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.UTF_8.newDecoder());
final ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
chbuffer.clear();
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals(s, chbuffer.toString());
}
@@ -580,22 +580,22 @@ public class TestSessionInOutBuffers {
final long expected = ((s1.getBytes(StandardCharsets.ISO_8859_1).length + 2)) * 10 + 2;
Assert.assertEquals(expected, bytesWritten);
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, StandardCharsets.ISO_8859_1.newDecoder());
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, StandardCharsets.ISO_8859_1.newDecoder());
final ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
for (int i = 0; i < 10; i++) {
chbuffer.clear();
- final int len = inbuffer.readLine(chbuffer, inputStream);
+ final int len = inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals(len, SWISS_GERMAN_HELLO.length);
Assert.assertEquals(s1, chbuffer.toString());
}
chbuffer.clear();
- Assert.assertEquals(0, inbuffer.readLine(chbuffer, inputStream));
+ Assert.assertEquals(0, inBuffer.readLine(chbuffer, inputStream));
chbuffer.clear();
- Assert.assertEquals(-1, inbuffer.readLine(chbuffer, inputStream));
+ Assert.assertEquals(-1, inBuffer.readLine(chbuffer, inputStream));
chbuffer.clear();
- Assert.assertEquals(-1, inbuffer.readLine(chbuffer, inputStream));
- final long bytesRead = inbuffer.getMetrics().getBytesTransferred();
+ Assert.assertEquals(-1, inBuffer.readLine(chbuffer, inputStream));
+ final long bytesRead = inBuffer.getMetrics().getBytesTransferred();
Assert.assertEquals(expected, bytesRead);
}
@@ -650,10 +650,10 @@ public class TestSessionInOutBuffers {
final CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
decoder.onMalformedInput(CodingErrorAction.REPORT);
decoder.onUnmappableCharacter(CodingErrorAction.IGNORE);
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, decoder);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, decoder);
final ByteArrayInputStream inputStream = new ByteArrayInputStream(tmp);
final CharArrayBuffer chbuffer = new CharArrayBuffer(32);
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
}
@Test
@@ -662,10 +662,10 @@ public class TestSessionInOutBuffers {
final CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
decoder.onMalformedInput(CodingErrorAction.REPLACE);
decoder.onUnmappableCharacter(CodingErrorAction.IGNORE);
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, decoder);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, decoder);
final ByteArrayInputStream inputStream = new ByteArrayInputStream(tmp);
final CharArrayBuffer chbuffer = new CharArrayBuffer(32);
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals("Gr\ufffdezi_z\ufffdm\ufffd", chbuffer.toString());
}
@@ -675,10 +675,10 @@ public class TestSessionInOutBuffers {
final CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
decoder.onMalformedInput(CodingErrorAction.IGNORE);
decoder.onUnmappableCharacter(CodingErrorAction.IGNORE);
- final SessionInputBuffer inbuffer = new SessionInputBufferImpl(16, decoder);
+ final SessionInputBuffer inBuffer = new SessionInputBufferImpl(16, decoder);
final ByteArrayInputStream inputStream = new ByteArrayInputStream(tmp);
final CharArrayBuffer chbuffer = new CharArrayBuffer(32);
- inbuffer.readLine(chbuffer, inputStream);
+ inBuffer.readLine(chbuffer, inputStream);
Assert.assertEquals("Grezi_zm", chbuffer.toString());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java
index 614b02a..175bfda 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/nio/TestSessionInOutBuffers.java
@@ -52,8 +52,8 @@ import org.junit.Test;
*/
public class TestSessionInOutBuffers {
- private static WritableByteChannel newChannel(final ByteArrayOutputStream outstream) {
- return Channels.newChannel(outstream);
+ private static WritableByteChannel newChannel(final ByteArrayOutputStream outStream) {
+ return Channels.newChannel(outStream);
}
private static ReadableByteChannel newChannel(final byte[] bytes) {
@@ -194,11 +194,11 @@ public class TestSessionInOutBuffers {
line.clear();
Assert.assertFalse(inbuf.readLine(line, true));
- final ByteArrayOutputStream outstream = new ByteArrayOutputStream();
- final WritableByteChannel outChannel = newChannel(outstream);
+ final ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ final WritableByteChannel outChannel = newChannel(outStream);
outbuf.flush(outChannel);
- final String s = new String(outstream.toByteArray(), "US-ASCII");
+ final String s = new String(outStream.toByteArray(), "US-ASCII");
Assert.assertEquals("One\r\nTwo\r\nThree\r\nFour\r\n", s);
}
@@ -228,11 +228,11 @@ public class TestSessionInOutBuffers {
//this write operation should have no effect
outbuf.writeLine(null);
- final ByteArrayOutputStream outstream = new ByteArrayOutputStream();
- final WritableByteChannel outChannel = newChannel(outstream);
+ final ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ final WritableByteChannel outChannel = newChannel(outStream);
outbuf.flush(outChannel);
- final ReadableByteChannel channel = newChannel(outstream.toByteArray());
+ final ReadableByteChannel channel = newChannel(outStream.toByteArray());
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 16, 0);
inbuf.fill(channel);
@@ -282,11 +282,11 @@ public class TestSessionInOutBuffers {
outbuf.write(ByteBuffer.wrap(new byte[] {'a'}));
- final ByteArrayOutputStream outstream = new ByteArrayOutputStream();
- final WritableByteChannel outChannel = newChannel(outstream);
+ final ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ final WritableByteChannel outChannel = newChannel(outStream);
outbuf.flush(outChannel);
- final ReadableByteChannel channel = newChannel(outstream.toByteArray());
+ final ReadableByteChannel channel = newChannel(outStream.toByteArray());
final SessionInputBuffer inbuf = new SessionInputBufferImpl(1024, 16, 0);
inbuf.fill(channel);
@@ -390,11 +390,11 @@ public class TestSessionInOutBuffers {
while (inbuf.fill(channel) > 0) {
}
- final ByteArrayOutputStream outstream = new ByteArrayOutputStream();
- final WritableByteChannel dst = newChannel(outstream);
+ final ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ final WritableByteChannel dst = newChannel(outStream);
Assert.assertEquals(16, inbuf.read(dst));
- Assert.assertEquals(ByteBuffer.wrap(pattern), ByteBuffer.wrap(outstream.toByteArray()));
+ Assert.assertEquals(ByteBuffer.wrap(pattern), ByteBuffer.wrap(outStream.toByteArray()));
}
@Test
@@ -405,13 +405,13 @@ public class TestSessionInOutBuffers {
while (inbuf.fill(channel) > 0) {
}
- final ByteArrayOutputStream outstream = new ByteArrayOutputStream();
- final WritableByteChannel dst = newChannel(outstream);
+ final ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ final WritableByteChannel dst = newChannel(outStream);
Assert.assertEquals(10, inbuf.read(dst, 10));
Assert.assertEquals(3, inbuf.read(dst, 3));
Assert.assertEquals(3, inbuf.read(dst, 10));
- Assert.assertEquals(ByteBuffer.wrap(pattern), ByteBuffer.wrap(outstream.toByteArray()));
+ Assert.assertEquals(ByteBuffer.wrap(pattern), ByteBuffer.wrap(outStream.toByteArray()));
}
@Test
@@ -422,11 +422,11 @@ public class TestSessionInOutBuffers {
final ReadableByteChannel src = newChannel(pattern);
outbuf.write(src);
- final ByteArrayOutputStream outstream = new ByteArrayOutputStream();
- final WritableByteChannel channel = newChannel(outstream);
+ final ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ final WritableByteChannel channel = newChannel(outStream);
while (outbuf.flush(channel) > 0) {
}
- Assert.assertEquals(ByteBuffer.wrap(pattern), ByteBuffer.wrap(outstream.toByteArray()));
+ Assert.assertEquals(ByteBuffer.wrap(pattern), ByteBuffer.wrap(outStream.toByteArray()));
}
@Test
@@ -438,11 +438,11 @@ public class TestSessionInOutBuffers {
outbuf.write(ByteBuffer.wrap(pattern, 16, 10));
outbuf.write(ByteBuffer.wrap(pattern, 26, 6));
- final ByteArrayOutputStream outstream = new ByteArrayOutputStream();
- final WritableByteChannel channel = newChannel(outstream);
+ final ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ final WritableByteChannel channel = newChannel(outStream);
while (outbuf.flush(channel) > 0) {
}
- Assert.assertEquals(ByteBuffer.wrap(pattern), ByteBuffer.wrap(outstream.toByteArray()));
+ Assert.assertEquals(ByteBuffer.wrap(pattern), ByteBuffer.wrap(outStream.toByteArray()));
}
static final int SWISS_GERMAN_HELLO [] = {
@@ -486,11 +486,11 @@ public class TestSessionInOutBuffers {
outbuf.writeLine(chbuffer);
}
- final ByteArrayOutputStream outstream = new ByteArrayOutputStream();
- final WritableByteChannel outChannel = newChannel(outstream);
+ final ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+ final WritableByteChannel outChannel = newChannel(outStream);
outbuf.flush(outChannel);
- final byte[] tmp = outstream.toByteArray();
+ final byte[] tmp = outStream.toByteArray();
final ReadableByteChannel channel = newChannel(tmp);
final SessionInputBuffer inbuf = new SessionInputBufferImpl(16, 16, 0,
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/http/io/TestEofSensorInputStream.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/io/TestEofSensorInputStream.java b/httpcore5/src/test/java/org/apache/hc/core5/http/io/TestEofSensorInputStream.java
index cc5eff3..52d5733 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/io/TestEofSensorInputStream.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/io/TestEofSensorInputStream.java
@@ -37,15 +37,15 @@ import org.mockito.Mockito;
@SuppressWarnings({"boxing","static-access"}) // test code
public class TestEofSensorInputStream {
- private InputStream instream;
+ private InputStream inStream;
private EofSensorWatcher eofwatcher;
private EofSensorInputStream eofstream;
@Before
public void setup() throws Exception {
- instream = Mockito.mock(InputStream.class);
+ inStream = Mockito.mock(InputStream.class);
eofwatcher = Mockito.mock(EofSensorWatcher.class);
- eofstream = new EofSensorInputStream(instream, eofwatcher);
+ eofstream = new EofSensorInputStream(inStream, eofwatcher);
}
@Test
@@ -57,8 +57,8 @@ public class TestEofSensorInputStream {
Assert.assertTrue(eofstream.isSelfClosed());
Assert.assertNull(eofstream.getWrappedStream());
- Mockito.verify(instream, Mockito.times(1)).close();
- Mockito.verify(eofwatcher).streamClosed(instream);
+ Mockito.verify(inStream, Mockito.times(1)).close();
+ Mockito.verify(eofwatcher).streamClosed(inStream);
eofstream.close();
}
@@ -75,7 +75,7 @@ public class TestEofSensorInputStream {
Assert.assertTrue(eofstream.isSelfClosed());
Assert.assertNull(eofstream.getWrappedStream());
- Mockito.verify(eofwatcher).streamClosed(instream);
+ Mockito.verify(eofwatcher).streamClosed(inStream);
}
@Test
@@ -87,8 +87,8 @@ public class TestEofSensorInputStream {
Assert.assertTrue(eofstream.isSelfClosed());
Assert.assertNull(eofstream.getWrappedStream());
- Mockito.verify(instream, Mockito.times(1)).close();
- Mockito.verify(eofwatcher).streamClosed(instream);
+ Mockito.verify(inStream, Mockito.times(1)).close();
+ Mockito.verify(eofwatcher).streamClosed(inStream);
eofstream.close();
}
@@ -102,8 +102,8 @@ public class TestEofSensorInputStream {
Assert.assertTrue(eofstream.isSelfClosed());
Assert.assertNull(eofstream.getWrappedStream());
- Mockito.verify(instream, Mockito.times(1)).close();
- Mockito.verify(eofwatcher).streamAbort(instream);
+ Mockito.verify(inStream, Mockito.times(1)).close();
+ Mockito.verify(eofwatcher).streamAbort(inStream);
eofstream.abort();
}
@@ -120,28 +120,28 @@ public class TestEofSensorInputStream {
Assert.assertTrue(eofstream.isSelfClosed());
Assert.assertNull(eofstream.getWrappedStream());
- Mockito.verify(eofwatcher).streamAbort(instream);
+ Mockito.verify(eofwatcher).streamAbort(inStream);
}
@Test
public void testRead() throws Exception {
Mockito.when(eofwatcher.eofDetected(Mockito.<InputStream>any())).thenReturn(Boolean.TRUE);
- Mockito.when(instream.read()).thenReturn(0, -1);
+ Mockito.when(inStream.read()).thenReturn(0, -1);
Assert.assertEquals(0, eofstream.read());
Assert.assertFalse(eofstream.isSelfClosed());
Assert.assertNotNull(eofstream.getWrappedStream());
- Mockito.verify(eofwatcher, Mockito.never()).eofDetected(instream);
+ Mockito.verify(eofwatcher, Mockito.never()).eofDetected(inStream);
Assert.assertEquals(-1, eofstream.read());
Assert.assertFalse(eofstream.isSelfClosed());
Assert.assertNull(eofstream.getWrappedStream());
- Mockito.verify(instream, Mockito.times(1)).close();
- Mockito.verify(eofwatcher).eofDetected(instream);
+ Mockito.verify(inStream, Mockito.times(1)).close();
+ Mockito.verify(eofwatcher).eofDetected(inStream);
Assert.assertEquals(-1, eofstream.read());
}
@@ -149,7 +149,7 @@ public class TestEofSensorInputStream {
@Test
public void testReadIOError() throws Exception {
Mockito.when(eofwatcher.eofDetected(Mockito.<InputStream>any())).thenReturn(Boolean.TRUE);
- Mockito.when(instream.read()).thenThrow(new IOException());
+ Mockito.when(inStream.read()).thenThrow(new IOException());
try {
eofstream.read();
@@ -159,13 +159,13 @@ public class TestEofSensorInputStream {
Assert.assertFalse(eofstream.isSelfClosed());
Assert.assertNull(eofstream.getWrappedStream());
- Mockito.verify(eofwatcher).streamAbort(instream);
+ Mockito.verify(eofwatcher).streamAbort(inStream);
}
@Test
public void testReadByteArray() throws Exception {
Mockito.when(eofwatcher.eofDetected(Mockito.<InputStream>any())).thenReturn(Boolean.TRUE);
- Mockito.when(instream.read(Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt()))
+ Mockito.when(inStream.read(Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt()))
.thenReturn(1, -1);
final byte[] tmp = new byte[1];
@@ -175,15 +175,15 @@ public class TestEofSensorInputStream {
Assert.assertFalse(eofstream.isSelfClosed());
Assert.assertNotNull(eofstream.getWrappedStream());
- Mockito.verify(eofwatcher, Mockito.never()).eofDetected(instream);
+ Mockito.verify(eofwatcher, Mockito.never()).eofDetected(inStream);
Assert.assertEquals(-1, eofstream.read(tmp));
Assert.assertFalse(eofstream.isSelfClosed());
Assert.assertNull(eofstream.getWrappedStream());
- Mockito.verify(instream, Mockito.times(1)).close();
- Mockito.verify(eofwatcher).eofDetected(instream);
+ Mockito.verify(inStream, Mockito.times(1)).close();
+ Mockito.verify(eofwatcher).eofDetected(inStream);
Assert.assertEquals(-1, eofstream.read(tmp));
}
@@ -191,7 +191,7 @@ public class TestEofSensorInputStream {
@Test
public void testReadByteArrayIOError() throws Exception {
Mockito.when(eofwatcher.eofDetected(Mockito.<InputStream>any())).thenReturn(Boolean.TRUE);
- Mockito.when(instream.read(Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt()))
+ Mockito.when(inStream.read(Mockito.<byte []>any(), Mockito.anyInt(), Mockito.anyInt()))
.thenThrow(new IOException());
final byte[] tmp = new byte[1];
@@ -203,7 +203,7 @@ public class TestEofSensorInputStream {
Assert.assertFalse(eofstream.isSelfClosed());
Assert.assertNull(eofstream.getWrappedStream());
- Mockito.verify(eofwatcher).streamAbort(instream);
+ Mockito.verify(eofwatcher).streamAbort(inStream);
}
@Test
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/http/io/entity/TestFileEntity.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/io/entity/TestFileEntity.java b/httpcore5/src/test/java/org/apache/hc/core5/http/io/entity/TestFileEntity.java
index 6d9d7da..d28fb8c 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/io/entity/TestFileEntity.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/io/entity/TestFileEntity.java
@@ -74,12 +74,12 @@ public class TestFileEntity {
final File tmpfile = File.createTempFile("testfile", ".txt");
tmpfile.deleteOnExit();
- final FileOutputStream outstream = new FileOutputStream(tmpfile);
- outstream.write(0);
- outstream.write(1);
- outstream.write(2);
- outstream.write(3);
- outstream.close();
+ final FileOutputStream outStream = new FileOutputStream(tmpfile);
+ outStream.write(0);
+ outStream.write(1);
+ outStream.write(2);
+ outStream.write(3);
+ outStream.close();
final FileEntity httpentity = new FileEntity(tmpfile, ContentType.TEXT_PLAIN);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/http/io/entity/TestInputStreamEntity.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/io/entity/TestInputStreamEntity.java b/httpcore5/src/test/java/org/apache/hc/core5/http/io/entity/TestInputStreamEntity.java
index 82a0195..f78f870 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/io/entity/TestInputStreamEntity.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/io/entity/TestInputStreamEntity.java
@@ -44,11 +44,11 @@ public class TestInputStreamEntity {
@Test
public void testBasics() throws Exception {
final byte[] bytes = "Message content".getBytes(StandardCharsets.ISO_8859_1);
- final InputStream instream = new ByteArrayInputStream(bytes);
- final InputStreamEntity httpentity = new InputStreamEntity(instream, bytes.length);
+ final InputStream inStream = new ByteArrayInputStream(bytes);
+ final InputStreamEntity httpentity = new InputStreamEntity(inStream, bytes.length);
Assert.assertEquals(bytes.length, httpentity.getContentLength());
- Assert.assertEquals(instream, httpentity.getContent());
+ Assert.assertEquals(inStream, httpentity.getContent());
Assert.assertNotNull(httpentity.getContent());
Assert.assertFalse(httpentity.isRepeatable());
Assert.assertTrue(httpentity.isStreaming());
@@ -61,8 +61,8 @@ public class TestInputStreamEntity {
@Test
public void testUnknownLengthConstructor() throws Exception {
- final InputStream instream = new ByteArrayInputStream(new byte[0]);
- final InputStreamEntity httpentity = new InputStreamEntity(instream);
+ final InputStream inStream = new ByteArrayInputStream(new byte[0]);
+ final InputStreamEntity httpentity = new InputStreamEntity(inStream);
Assert.assertEquals(-1, httpentity.getContentLength());
}
@@ -70,8 +70,8 @@ public class TestInputStreamEntity {
public void testWriteTo() throws Exception {
final String message = "Message content";
final byte[] bytes = message.getBytes(StandardCharsets.ISO_8859_1);
- final InputStream instream = new ByteArrayInputStream(bytes);
- final InputStreamEntity httpentity = new InputStreamEntity(instream, bytes.length);
+ final InputStream inStream = new ByteArrayInputStream(bytes);
+ final InputStreamEntity httpentity = new InputStreamEntity(inStream, bytes.length);
final ByteArrayOutputStream out = new ByteArrayOutputStream();
httpentity.writeTo(out);
@@ -87,9 +87,9 @@ public class TestInputStreamEntity {
public void testWriteToPartialContent() throws Exception {
final String message = "Message content";
final byte[] bytes = message.getBytes(StandardCharsets.ISO_8859_1);
- final InputStream instream = new ByteArrayInputStream(bytes);
+ final InputStream inStream = new ByteArrayInputStream(bytes);
final int contentLength = 7;
- final InputStreamEntity httpentity = new InputStreamEntity(instream, contentLength);
+ final InputStreamEntity httpentity = new InputStreamEntity(inStream, contentLength);
final ByteArrayOutputStream out = new ByteArrayOutputStream();
httpentity.writeTo(out);
@@ -105,8 +105,8 @@ public class TestInputStreamEntity {
public void testWriteToUnknownLength() throws Exception {
final String message = "Message content";
final byte[] bytes = message.getBytes(StandardCharsets.ISO_8859_1);
- final InputStream instream = new ByteArrayInputStream(bytes);
- final InputStreamEntity httpentity = new InputStreamEntity(instream);
+ final InputStream inStream = new ByteArrayInputStream(bytes);
+ final InputStreamEntity httpentity = new InputStreamEntity(inStream);
final ByteArrayOutputStream out = new ByteArrayOutputStream();
httpentity.writeTo(out);
@@ -120,8 +120,8 @@ public class TestInputStreamEntity {
@Test(expected = IllegalArgumentException.class)
public void testWriteToNull() throws Exception {
- final InputStream instream = new ByteArrayInputStream(new byte[0]);
- final InputStreamEntity httpentity = new InputStreamEntity(instream, 0);
+ final InputStream inStream = new ByteArrayInputStream(new byte[0]);
+ final InputStreamEntity httpentity = new InputStreamEntity(inStream, 0);
httpentity.writeTo(null);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBufferedHeader.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBufferedHeader.java b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBufferedHeader.java
index 7bf10d3..ffb4bed 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBufferedHeader.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestBufferedHeader.java
@@ -60,13 +60,13 @@ public class TestBufferedHeader {
buf.append("name: value");
final BufferedHeader orig = new BufferedHeader(buf, false);
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final BufferedHeader clone = (BufferedHeader) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final BufferedHeader clone = (BufferedHeader) inStream.readObject();
Assert.assertEquals(orig.getName(), clone.getName());
Assert.assertEquals(orig.getValue(), clone.getValue());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeader.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeader.java b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeader.java
index cf46f55..fb1146a 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeader.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeader.java
@@ -77,13 +77,13 @@ public class TestHeader {
public void testSerialization() throws Exception {
final BasicHeader orig = new BasicHeader("name1", "value1");
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final BasicHeader clone = (BasicHeader) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final BasicHeader clone = (BasicHeader) inStream.readObject();
Assert.assertEquals(orig.getName(), clone.getName());
Assert.assertEquals(orig.getValue(), clone.getValue());
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
index ffa96b3..4d8ee21 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/message/TestHeaderGroup.java
@@ -199,13 +199,13 @@ public class TestHeaderGroup {
final Header header3 = new BasicHeader("name", "value3");
orig.setHeaders(new Header[] { header1, header2, header3 });
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final HeaderGroup clone = (HeaderGroup) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final HeaderGroup clone = (HeaderGroup) inStream.readObject();
final Header[] headers1 = orig.getAllHeaders();
final Header[] headers2 = clone.getAllHeaders();
Assert.assertNotNull(headers1);
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/net/TestHost.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/net/TestHost.java b/httpcore5/src/test/java/org/apache/hc/core5/net/TestHost.java
index 131e63c..4fdbe7a 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/net/TestHost.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/net/TestHost.java
@@ -98,13 +98,13 @@ public class TestHost {
public void testSerialization() throws Exception {
final Host orig = new Host("somehost", 8080);
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final Host clone = (Host) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final Host clone = (Host) inStream.readObject();
Assert.assertEquals(orig, clone);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIAuthority.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIAuthority.java b/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIAuthority.java
index 8bb1b94..570e1d6 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIAuthority.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/net/TestURIAuthority.java
@@ -107,13 +107,13 @@ public class TestURIAuthority {
public void testSerialization() throws Exception {
final URIAuthority orig = new URIAuthority("somehost", 8080);
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer);
- outstream.writeObject(orig);
- outstream.close();
+ final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer);
+ outStream.writeObject(orig);
+ outStream.close();
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final URIAuthority clone = (URIAuthority) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final URIAuthority clone = (URIAuthority) inStream.readObject();
Assert.assertEquals(orig, clone);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/util/TestByteArrayBuffer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/util/TestByteArrayBuffer.java b/httpcore5/src/test/java/org/apache/hc/core5/util/TestByteArrayBuffer.java
index 65a688a..d311638 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/util/TestByteArrayBuffer.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/util/TestByteArrayBuffer.java
@@ -295,13 +295,13 @@ public class TestByteArrayBuffer {
orig.append(2);
orig.append(3);
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- try (final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer)) {
- outstream.writeObject(orig);
+ try (final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer)) {
+ outStream.writeObject(orig);
}
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final ByteArrayBuffer clone = (ByteArrayBuffer) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final ByteArrayBuffer clone = (ByteArrayBuffer) inStream.readObject();
Assert.assertEquals(orig.capacity(), clone.capacity());
Assert.assertEquals(orig.length(), clone.length());
final byte[] data = clone.toByteArray();
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3267db4f/httpcore5/src/test/java/org/apache/hc/core5/util/TestCharArrayBuffer.java
----------------------------------------------------------------------
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/util/TestCharArrayBuffer.java b/httpcore5/src/test/java/org/apache/hc/core5/util/TestCharArrayBuffer.java
index d8aaedc..1fe85ee 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/util/TestCharArrayBuffer.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/util/TestCharArrayBuffer.java
@@ -382,13 +382,13 @@ public class TestCharArrayBuffer {
orig.append('b');
orig.append('c');
final ByteArrayOutputStream outbuffer = new ByteArrayOutputStream();
- try (final ObjectOutputStream outstream = new ObjectOutputStream(outbuffer)) {
- outstream.writeObject(orig);
+ try (final ObjectOutputStream outStream = new ObjectOutputStream(outbuffer)) {
+ outStream.writeObject(orig);
}
final byte[] raw = outbuffer.toByteArray();
- final ByteArrayInputStream inbuffer = new ByteArrayInputStream(raw);
- final ObjectInputStream instream = new ObjectInputStream(inbuffer);
- final CharArrayBuffer clone = (CharArrayBuffer) instream.readObject();
+ final ByteArrayInputStream inBuffer = new ByteArrayInputStream(raw);
+ final ObjectInputStream inStream = new ObjectInputStream(inBuffer);
+ final CharArrayBuffer clone = (CharArrayBuffer) inStream.readObject();
Assert.assertEquals(orig.capacity(), clone.capacity());
Assert.assertEquals(orig.length(), clone.length());
final char[] data = clone.toCharArray();