Skip to content

Commit d6a907b

Browse files
author
Stephane Landelle
committed
Properly set up providerClass on SimpleAsyncHttpClient based tests
1 parent 499b9f5 commit d6a907b

File tree

6 files changed

+36
-22
lines changed

6 files changed

+36
-22
lines changed

‎src/test/java/com/ning/http/client/async/BasicAuthTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.ning.http.client.SimpleAsyncHttpClient;
2727
import com.ning.http.client.consumers.AppendableBodyConsumer;
2828
import com.ning.http.client.generators.InputStreamBodyGenerator;
29+
2930
import org.apache.log4j.ConsoleAppender;
3031
import org.apache.log4j.Level;
3132
import org.apache.log4j.Logger;
@@ -48,6 +49,7 @@
4849
import javax.servlet.ServletException;
4950
import javax.servlet.http.HttpServletRequest;
5051
import javax.servlet.http.HttpServletResponse;
52+
5153
import java.io.ByteArrayInputStream;
5254
import java.io.File;
5355
import java.io.FileInputStream;
@@ -72,6 +74,8 @@ public abstract class BasicAuthTest extends AbstractBasicTest {
7274
protected final static String admin = "admin";
7375

7476
private Server server2;
77+
78+
public abstract String getProviderClass();
7579

7680
@BeforeClass(alwaysRun = true)
7781
@Override
@@ -475,7 +479,7 @@ public AbstractHandler configureHandler() throws Exception {
475479

476480
@Test(groups = { "standalone", "default_provider" })
477481
public void stringBuilderBodyConsumerTest() throws Throwable {
478-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setRealmPrincipal(user).setRealmPassword(admin).setUrl(getTargetUrl()).setHeader("Content-Type", "text/html").build();
482+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setRealmPrincipal(user).setRealmPassword(admin).setUrl(getTargetUrl()).setHeader("Content-Type", "text/html").build();
479483
try {
480484
StringBuilder s = new StringBuilder();
481485
Future<Response> future = client.post(new InputStreamBodyGenerator(new ByteArrayInputStream(MY_MESSAGE.getBytes())), new AppendableBodyConsumer(s));

‎src/test/java/com/ning/http/client/async/SimpleAsyncHttpClientTest.java

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.ning.http.client.generators.InputStreamBodyGenerator;
2222
import com.ning.http.client.simple.HeaderMap;
2323
import com.ning.http.client.simple.SimpleAHCTransferListener;
24+
2425
import org.testng.annotations.Test;
2526

2627
import java.io.ByteArrayInputStream;
@@ -38,11 +39,13 @@
3839
public abstract class SimpleAsyncHttpClientTest extends AbstractBasicTest {
3940

4041
private final static String MY_MESSAGE = "my message";
42+
43+
public abstract String getProviderClass();
4144

4245
@Test(groups = { "standalone", "default_provider" })
4346
public void inputStreamBodyConsumerTest() throws Throwable {
4447

45-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setIdleConnectionInPoolTimeoutInMs(100).setMaximumConnectionsTotal(50).setRequestTimeoutInMs(5 * 60 * 1000).setUrl(getTargetUrl()).setHeader("Content-Type", "text/html").build();
48+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setIdleConnectionInPoolTimeoutInMs(100).setMaximumConnectionsTotal(50).setRequestTimeoutInMs(5 * 60 * 1000).setUrl(getTargetUrl()).setHeader("Content-Type", "text/html").build();
4649
try {
4750
Future<Response> future = client.post(new InputStreamBodyGenerator(new ByteArrayInputStream(MY_MESSAGE.getBytes())));
4851

@@ -58,7 +61,7 @@ public void inputStreamBodyConsumerTest() throws Throwable {
5861
@Test(groups = { "standalone", "default_provider" })
5962
public void stringBuilderBodyConsumerTest() throws Throwable {
6063

61-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setIdleConnectionInPoolTimeoutInMs(100).setMaximumConnectionsTotal(50).setRequestTimeoutInMs(5 * 60 * 1000).setUrl(getTargetUrl()).setHeader("Content-Type", "text/html").build();
64+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setIdleConnectionInPoolTimeoutInMs(100).setMaximumConnectionsTotal(50).setRequestTimeoutInMs(5 * 60 * 1000).setUrl(getTargetUrl()).setHeader("Content-Type", "text/html").build();
6265
try {
6366
StringBuilder s = new StringBuilder();
6467
Future<Response> future = client.post(new InputStreamBodyGenerator(new ByteArrayInputStream(MY_MESSAGE.getBytes())), new AppendableBodyConsumer(s));
@@ -75,7 +78,7 @@ public void stringBuilderBodyConsumerTest() throws Throwable {
7578
@Test(groups = { "standalone", "default_provider" })
7679
public void byteArrayOutputStreamBodyConsumerTest() throws Throwable {
7780

78-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setIdleConnectionInPoolTimeoutInMs(100).setMaximumConnectionsTotal(50).setRequestTimeoutInMs(5 * 60 * 1000).setUrl(getTargetUrl()).setHeader("Content-Type", "text/html").build();
81+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setIdleConnectionInPoolTimeoutInMs(100).setMaximumConnectionsTotal(50).setRequestTimeoutInMs(5 * 60 * 1000).setUrl(getTargetUrl()).setHeader("Content-Type", "text/html").build();
7982
try {
8083
ByteArrayOutputStream o = new ByteArrayOutputStream(10);
8184
Future<Response> future = client.post(new InputStreamBodyGenerator(new ByteArrayInputStream(MY_MESSAGE.getBytes())), new OutputStreamBodyConsumer(o));
@@ -92,7 +95,7 @@ public void byteArrayOutputStreamBodyConsumerTest() throws Throwable {
9295
@Test(groups = { "standalone", "default_provider" })
9396
public void requestByteArrayOutputStreamBodyConsumerTest() throws Throwable {
9497

95-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setUrl(getTargetUrl()).build();
98+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setUrl(getTargetUrl()).build();
9699
try {
97100
ByteArrayOutputStream o = new ByteArrayOutputStream(10);
98101
Future<Response> future = client.post(new InputStreamBodyGenerator(new ByteArrayInputStream(MY_MESSAGE.getBytes())), new OutputStreamBodyConsumer(o));
@@ -111,7 +114,7 @@ public void requestByteArrayOutputStreamBodyConsumerTest() throws Throwable {
111114
*/
112115
@Test(groups = { "standalone", "default_provider" }, enabled = true)
113116
public void testPutZeroBytesFileTest() throws Throwable {
114-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setIdleConnectionInPoolTimeoutInMs(100).setMaximumConnectionsTotal(50).setRequestTimeoutInMs(5 * 1000).setUrl(getTargetUrl() + "/testPutZeroBytesFileTest.txt").setHeader("Content-Type", "text/plain")
117+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setIdleConnectionInPoolTimeoutInMs(100).setMaximumConnectionsTotal(50).setRequestTimeoutInMs(5 * 1000).setUrl(getTargetUrl() + "/testPutZeroBytesFileTest.txt").setHeader("Content-Type", "text/plain")
115118
.build();
116119
try {
117120
File tmpfile = File.createTempFile("testPutZeroBytesFile", ".tmp");
@@ -131,7 +134,7 @@ public void testPutZeroBytesFileTest() throws Throwable {
131134

132135
@Test(groups = { "standalone", "default_provider" })
133136
public void testDerive() throws Exception {
134-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().build();
137+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).build();
135138
SimpleAsyncHttpClient derived = client.derive().build();
136139
try {
137140
assertNotSame(derived, client);
@@ -143,7 +146,7 @@ public void testDerive() throws Exception {
143146

144147
@Test(groups = { "standalone", "default_provider" })
145148
public void testDeriveOverrideURL() throws Exception {
146-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setUrl("http://invalid.url/").build();
149+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setUrl("http://invalid.url/").build();
147150
SimpleAsyncHttpClient derived = client.derive().setUrl(getTargetUrl()).build();
148151
try {
149152
ByteArrayOutputStream o = new ByteArrayOutputStream(10);
@@ -214,7 +217,7 @@ public void onBytesReceived(String url, long amount, long current, long total) {
214217

215218
@Test(groups = { "standalone", "default_provider" })
216219
public void testNullUrl() throws Exception {
217-
SimpleAsyncHttpClient c = new SimpleAsyncHttpClient.Builder().build().derive().build();
220+
SimpleAsyncHttpClient c = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).build().derive().build();
218221
try {
219222
assertTrue(true);
220223
} finally {
@@ -224,7 +227,7 @@ public void testNullUrl() throws Exception {
224227

225228
@Test(groups = { "standalone", "default_provider" })
226229
public void testCloseDerivedValidMaster() throws Exception {
227-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setUrl(getTargetUrl()).build();
230+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setUrl(getTargetUrl()).build();
228231
try {
229232
SimpleAsyncHttpClient derived = client.derive().build();
230233
derived.get().get();
@@ -241,7 +244,7 @@ public void testCloseDerivedValidMaster() throws Exception {
241244

242245
@Test(groups = { "standalone", "default_provider" })
243246
public void testCloseMasterInvalidDerived() throws Exception {
244-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setUrl(getTargetUrl()).build();
247+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setUrl(getTargetUrl()).build();
245248
SimpleAsyncHttpClient derived = client.derive().build();
246249

247250
client.close();
@@ -256,7 +259,7 @@ public void testCloseMasterInvalidDerived() throws Exception {
256259

257260
@Test(groups = { "standalone", "default_provider" })
258261
public void testMultiPartPut() throws Exception {
259-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setUrl(getTargetUrl() + "/multipart").build();
262+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setUrl(getTargetUrl() + "/multipart").build();
260263
try {
261264
Response response = client.put(new ByteArrayPart("baPart", "fileName", "testMultiPart".getBytes("utf-8"), "application/test", "utf-8")).get();
262265

@@ -280,7 +283,7 @@ public void testMultiPartPut() throws Exception {
280283

281284
@Test(groups = { "standalone", "default_provider" })
282285
public void testMultiPartPost() throws Exception {
283-
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setUrl(getTargetUrl() + "/multipart").build();
286+
SimpleAsyncHttpClient client = new SimpleAsyncHttpClient.Builder().setProviderClass(getProviderClass()).setUrl(getTargetUrl() + "/multipart").build();
284287
try {
285288
Response response = client.post(new ByteArrayPart("baPart", "fileName", "testMultiPart".getBytes("utf-8"), "application/test", "utf-8")).get();
286289

‎src/test/java/com/ning/http/client/async/grizzly/GrizzlyBasicAuthTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.ning.http.client.AsyncHttpClientConfig;
1818
import com.ning.http.client.async.BasicAuthTest;
1919
import com.ning.http.client.async.ProviderUtil;
20+
import com.ning.http.client.providers.grizzly.GrizzlyAsyncHttpProvider;
2021

2122
public class GrizzlyBasicAuthTest extends BasicAuthTest {
2223

@@ -25,4 +26,7 @@ public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
2526
return ProviderUtil.grizzlyProvider(config);
2627
}
2728

29+
public String getProviderClass() {
30+
return GrizzlyAsyncHttpProvider.class.getName();
31+
}
2832
}

‎src/test/java/com/ning/http/client/async/grizzly/GrizzlySimpleAsyncHttpClientTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.ning.http.client.AsyncHttpClientConfig;
1818
import com.ning.http.client.async.ProviderUtil;
1919
import com.ning.http.client.async.SimpleAsyncHttpClientTest;
20+
import com.ning.http.client.providers.grizzly.GrizzlyAsyncHttpProvider;
2021

2122
public class GrizzlySimpleAsyncHttpClientTest extends SimpleAsyncHttpClientTest {
2223

@@ -25,4 +26,7 @@ public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
2526
return ProviderUtil.grizzlyProvider(config);
2627
}
2728

29+
public String getProviderClass() {
30+
return GrizzlyAsyncHttpProvider.class.getName();
31+
}
2832
}

‎src/test/java/com/ning/http/client/async/netty/NettyBasicAuthTest.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,16 @@
1616
import com.ning.http.client.AsyncHttpClientConfig;
1717
import com.ning.http.client.async.BasicAuthTest;
1818
import com.ning.http.client.async.ProviderUtil;
19-
import org.testng.annotations.Test;
20-
21-
import java.util.concurrent.ExecutionException;
22-
import java.util.concurrent.TimeoutException;
19+
import com.ning.http.client.providers.netty.NettyAsyncHttpProvider;
2320

2421
public class NettyBasicAuthTest extends BasicAuthTest {
2522

2623
@Override
2724
public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
2825
return ProviderUtil.nettyProvider(config);
2926
}
30-
31-
@Override
32-
@Test
33-
public void redirectAndBasicAuthTest() throws Exception, ExecutionException, TimeoutException, InterruptedException {
34-
super.redirectAndBasicAuthTest(); //To change body of overridden methods use File | Settings | File Templates.
27+
28+
public String getProviderClass() {
29+
return NettyAsyncHttpProvider.class.getName();
3530
}
3631
}

‎src/test/java/com/ning/http/client/async/netty/NettySimpleAsyncHttpClientTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.ning.http.client.AsyncHttpClient;
1616
import com.ning.http.client.AsyncHttpClientConfig;
1717
import com.ning.http.client.async.SimpleAsyncHttpClientTest;
18+
import com.ning.http.client.providers.netty.NettyAsyncHttpProvider;
1819

1920
public class NettySimpleAsyncHttpClientTest extends SimpleAsyncHttpClientTest {
2021

@@ -28,4 +29,7 @@ public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
2829
return null;
2930
}
3031

32+
public String getProviderClass() {
33+
return NettyAsyncHttpProvider.class.getName();
34+
}
3135
}

0 commit comments

Comments
 (0)