moved test/client.impl to impl.client
git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@503522 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Roland Weber
parent
fd0adccffe
commit
ddc1b61f80
|
|
@ -0,0 +1,53 @@
|
||||||
|
/*
|
||||||
|
* $HeadURL$
|
||||||
|
* $Revision$
|
||||||
|
* $Date$
|
||||||
|
* ====================================================================
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
* or more contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. The ASF licenses this file
|
||||||
|
* to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
* ====================================================================
|
||||||
|
*
|
||||||
|
* This software consists of voluntary contributions made by many
|
||||||
|
* individuals on behalf of the Apache Software Foundation. For more
|
||||||
|
* information on the Apache Software Foundation, please see
|
||||||
|
* <http://www.apache.org/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.apache.http.impl.client;
|
||||||
|
|
||||||
|
import junit.framework.*;
|
||||||
|
|
||||||
|
public class TestAllHttpClientImpl extends TestCase {
|
||||||
|
|
||||||
|
public TestAllHttpClientImpl(String testName) {
|
||||||
|
super(testName);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Test suite() {
|
||||||
|
TestSuite suite = new TestSuite();
|
||||||
|
suite.addTest(TestAutoCloseInputStream.suite());
|
||||||
|
suite.addTest(TestDefaultResponseConsumedWatcher.suite());
|
||||||
|
return suite;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void main(String args[]) {
|
||||||
|
String[] testCaseName = { TestAllHttpClientImpl.class.getName() };
|
||||||
|
junit.textui.TestRunner.main(testCaseName);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,115 @@
|
||||||
|
/*
|
||||||
|
* $HeadURL$
|
||||||
|
* $Revision$
|
||||||
|
* $Date$
|
||||||
|
* ====================================================================
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
* or more contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. The ASF licenses this file
|
||||||
|
* to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
* ====================================================================
|
||||||
|
*
|
||||||
|
* This software consists of voluntary contributions made by many
|
||||||
|
* individuals on behalf of the Apache Software Foundation. For more
|
||||||
|
* information on the Apache Software Foundation, please see
|
||||||
|
* <http://www.apache.org/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.apache.http.impl.client;
|
||||||
|
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
|
||||||
|
import junit.framework.Test;
|
||||||
|
import junit.framework.TestCase;
|
||||||
|
import junit.framework.TestSuite;
|
||||||
|
|
||||||
|
public class TestAutoCloseInputStream extends TestCase {
|
||||||
|
|
||||||
|
public TestAutoCloseInputStream(String testName) {
|
||||||
|
super(testName);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------- TestCase Methods
|
||||||
|
|
||||||
|
public static Test suite() {
|
||||||
|
return new TestSuite(TestAutoCloseInputStream.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------- Main
|
||||||
|
public static void main(String args[]) {
|
||||||
|
String[] testCaseName = { TestAutoCloseInputStream.class.getName() };
|
||||||
|
junit.textui.TestRunner.main(testCaseName);
|
||||||
|
}
|
||||||
|
|
||||||
|
class TestResponseConsumedWatcher implements ResponseConsumedWatcher {
|
||||||
|
|
||||||
|
private int count;
|
||||||
|
|
||||||
|
public TestResponseConsumedWatcher() {
|
||||||
|
super();
|
||||||
|
count = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void responseConsumed() {
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getCount() {
|
||||||
|
return this.count;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
public void testConstructors() throws Exception {
|
||||||
|
InputStream instream = new ByteArrayInputStream(new byte[] {});
|
||||||
|
ResponseConsumedWatcher watcher = new TestResponseConsumedWatcher();
|
||||||
|
new AutoCloseInputStream(instream, watcher);
|
||||||
|
new AutoCloseInputStream(instream, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testBasics() throws IOException {
|
||||||
|
byte[] input = "0123456789ABCDEF".getBytes("US-ASCII");
|
||||||
|
InputStream instream = new ByteArrayInputStream(input);
|
||||||
|
TestResponseConsumedWatcher watcher = new TestResponseConsumedWatcher();
|
||||||
|
instream = new AutoCloseInputStream(instream, watcher);
|
||||||
|
byte[] tmp = new byte[input.length];
|
||||||
|
int ch = instream.read();
|
||||||
|
assertTrue(ch != -1);
|
||||||
|
tmp[0] = (byte)ch;
|
||||||
|
assertTrue(instream.read(tmp, 1, tmp.length - 1) != -1);
|
||||||
|
assertTrue(instream.read(tmp) == -1);
|
||||||
|
for (int i = 0; i < input.length; i++) {
|
||||||
|
assertEquals(input[i], tmp[i]);
|
||||||
|
}
|
||||||
|
assertTrue(instream.read() == -1);
|
||||||
|
instream.close();
|
||||||
|
instream.close();
|
||||||
|
// Has been triggered once only
|
||||||
|
assertEquals(1, watcher.getCount());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testNullWatcher() throws IOException {
|
||||||
|
byte[] input = "0".getBytes("US-ASCII");
|
||||||
|
InputStream instream = new ByteArrayInputStream(input);
|
||||||
|
instream = new AutoCloseInputStream(instream, null);
|
||||||
|
assertTrue(instream.read() != -1);
|
||||||
|
assertTrue(instream.read() == -1);
|
||||||
|
assertTrue(instream.read() == -1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -0,0 +1,131 @@
|
||||||
|
/*
|
||||||
|
* $HeadURL$
|
||||||
|
* $Revision$
|
||||||
|
* $Date$
|
||||||
|
* ====================================================================
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
* or more contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. The ASF licenses this file
|
||||||
|
* to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
* ====================================================================
|
||||||
|
*
|
||||||
|
* This software consists of voluntary contributions made by many
|
||||||
|
* individuals on behalf of the Apache Software Foundation. For more
|
||||||
|
* information on the Apache Software Foundation, please see
|
||||||
|
* <http://www.apache.org/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.apache.http.impl.client;
|
||||||
|
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.io.InputStream;
|
||||||
|
|
||||||
|
import org.apache.http.HttpConnection;
|
||||||
|
import org.apache.http.HttpResponse;
|
||||||
|
import org.apache.http.HttpVersion;
|
||||||
|
import org.apache.http.entity.BasicHttpEntity;
|
||||||
|
import org.apache.http.impl.params.DefaultHttpParams;
|
||||||
|
import org.apache.http.message.BasicHttpResponse;
|
||||||
|
import org.apache.http.mockup.HttpConnectionMockup;
|
||||||
|
import org.apache.http.protocol.HttpContext;
|
||||||
|
import org.apache.http.protocol.HttpExecutionContext;
|
||||||
|
|
||||||
|
import junit.framework.Test;
|
||||||
|
import junit.framework.TestCase;
|
||||||
|
import junit.framework.TestSuite;
|
||||||
|
|
||||||
|
public class TestDefaultResponseConsumedWatcher extends TestCase {
|
||||||
|
|
||||||
|
public TestDefaultResponseConsumedWatcher(String testName) {
|
||||||
|
super(testName);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------- TestCase Methods
|
||||||
|
|
||||||
|
public static Test suite() {
|
||||||
|
return new TestSuite(TestDefaultResponseConsumedWatcher.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------- Main
|
||||||
|
public static void main(String args[]) {
|
||||||
|
String[] testCaseName = { TestDefaultResponseConsumedWatcher.class.getName() };
|
||||||
|
junit.textui.TestRunner.main(testCaseName);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testIllegalResponseArg() throws Exception {
|
||||||
|
try {
|
||||||
|
new DefaultResponseConsumedWatcher(null, null, null);
|
||||||
|
fail("IllegalArgumentException should have been thrown");
|
||||||
|
} catch (IllegalArgumentException ex) {
|
||||||
|
// expected
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
new DefaultResponseConsumedWatcher(
|
||||||
|
new HttpConnectionMockup(), null, null);
|
||||||
|
fail("IllegalArgumentException should have been thrown");
|
||||||
|
} catch (IllegalArgumentException ex) {
|
||||||
|
// expected
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testConnectionAutoClose() throws Exception {
|
||||||
|
HttpContext context = new HttpExecutionContext(null);
|
||||||
|
byte[] data = new byte[] {'1', '2', '3'};
|
||||||
|
HttpConnection conn = new HttpConnectionMockup();
|
||||||
|
BasicHttpEntity entity = new BasicHttpEntity();
|
||||||
|
entity.setChunked(false);
|
||||||
|
entity.setContentLength(data.length);
|
||||||
|
entity.setContent(new ByteArrayInputStream(data));
|
||||||
|
|
||||||
|
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_0, 200);
|
||||||
|
response.addHeader("Connection", "Close");
|
||||||
|
response.setParams(new DefaultHttpParams(null));
|
||||||
|
response.setEntity(entity);
|
||||||
|
|
||||||
|
// Wrap the entity input stream
|
||||||
|
ResponseConsumedWatcher watcher = new DefaultResponseConsumedWatcher(
|
||||||
|
conn, response, context);
|
||||||
|
InputStream content = new AutoCloseInputStream(entity.getContent(), watcher);
|
||||||
|
assertTrue(conn.isOpen());
|
||||||
|
while (content.read() != -1) {}
|
||||||
|
assertFalse(conn.isOpen());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testConnectionKeepAlive() throws Exception {
|
||||||
|
HttpContext context = new HttpExecutionContext(null);
|
||||||
|
byte[] data = new byte[] {'1', '2', '3'};
|
||||||
|
HttpConnection conn = new HttpConnectionMockup();
|
||||||
|
BasicHttpEntity entity = new BasicHttpEntity();
|
||||||
|
entity.setChunked(false);
|
||||||
|
entity.setContentLength(data.length);
|
||||||
|
entity.setContent(new ByteArrayInputStream(data));
|
||||||
|
|
||||||
|
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200);
|
||||||
|
response.addHeader("Connection", "Keep-alive");
|
||||||
|
response.setParams(new DefaultHttpParams(null));
|
||||||
|
response.setEntity(entity);
|
||||||
|
|
||||||
|
// Wrap the entity input stream
|
||||||
|
ResponseConsumedWatcher watcher = new DefaultResponseConsumedWatcher(
|
||||||
|
conn, response, context);
|
||||||
|
InputStream content = new AutoCloseInputStream(entity.getContent(), watcher);
|
||||||
|
|
||||||
|
assertTrue(conn.isOpen());
|
||||||
|
while (content.read() != -1) {}
|
||||||
|
assertTrue(conn.isOpen());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Loading…
Reference in New Issue