Skip to content

Commit 33b9f46

Browse files
slandelleslandelle
committed
minor test clean up
1 parent 93feccf commit 33b9f46

File tree

2 files changed

+9
-46
lines changed

2 files changed

+9
-46
lines changed

‎extras/jdeferred/src/test/java/org/asynchttpclient/extra/AsyncHttpTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void testPromiseAdapter() throws IOException {
4141
final AtomicInteger progressCount = new AtomicInteger();
4242

4343
try (AsyncHttpClient client = asyncHttpClient()) {
44-
Promise<Response, Throwable, HttpProgress> p1 = AsyncHttpDeferredObject.promise(client.prepareGet("http://www.ning.com"));
44+
Promise<Response, Throwable, HttpProgress> p1 = AsyncHttpDeferredObject.promise(client.prepareGet("http://gatling.io"));
4545
p1.done(new DoneCallback<Response>() {
4646
@Override
4747
public void onDone(Response response) {
@@ -72,7 +72,7 @@ public void testMultiplePromiseAdapter() throws IOException {
7272
final AtomicInteger successCount = new AtomicInteger();
7373

7474
try (AsyncHttpClient client = asyncHttpClient()) {
75-
Promise<Response, Throwable, HttpProgress> p1 = AsyncHttpDeferredObject.promise(client.prepareGet("http://www.ning.com"));
75+
Promise<Response, Throwable, HttpProgress> p1 = AsyncHttpDeferredObject.promise(client.prepareGet("http://gatling.io"));
7676
Promise<Response, Throwable, HttpProgress> p2 = AsyncHttpDeferredObject.promise(client.prepareGet("http://www.google.com"));
7777
AsyncHttpDeferredObject deferredRequest = new AsyncHttpDeferredObject(client.prepareGet("http://jdeferred.org"));
7878

‎extras/rxjava/src/test/java/org/asynchttpclient/extras/rxjava/AsyncHttpObservableTest.java

Lines changed: 7 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818
import java.util.List;
1919

2020
import org.asynchttpclient.AsyncHttpClient;
21-
import org.asynchttpclient.BoundRequestBuilder;
2221
import org.asynchttpclient.Response;
2322
import org.testng.annotations.Test;
2423

2524
import rx.Observable;
26-
import rx.functions.Func0;
2725
import rx.observers.TestSubscriber;
2826

2927
public class AsyncHttpObservableTest {
@@ -33,12 +31,7 @@ public void testToObservableNoError() {
3331
final TestSubscriber<Response> tester = new TestSubscriber<>();
3432

3533
try (AsyncHttpClient client = asyncHttpClient()) {
36-
Observable<Response> o1 = AsyncHttpObservable.toObservable(new Func0<BoundRequestBuilder>() {
37-
@Override
38-
public BoundRequestBuilder call() {
39-
return client.prepareGet("http://www.ning.com");
40-
}
41-
});
34+
Observable<Response> o1 = AsyncHttpObservable.toObservable(() -> client.prepareGet("http://gatling.io"));
4235
o1.subscribe(tester);
4336
tester.awaitTerminalEvent();
4437
tester.assertTerminalEvent();
@@ -58,12 +51,7 @@ public void testToObservableError() {
5851
final TestSubscriber<Response> tester = new TestSubscriber<>();
5952

6053
try (AsyncHttpClient client = asyncHttpClient()) {
61-
Observable<Response> o1 = AsyncHttpObservable.toObservable(new Func0<BoundRequestBuilder>() {
62-
@Override
63-
public BoundRequestBuilder call() {
64-
return client.prepareGet("http://www.ning.com/ttfn");
65-
}
66-
});
54+
Observable<Response> o1 = AsyncHttpObservable.toObservable(() -> client.prepareGet("http://gatling.io/ttfn"));
6755
o1.subscribe(tester);
6856
tester.awaitTerminalEvent();
6957
tester.assertTerminalEvent();
@@ -83,12 +71,7 @@ public void testObserveNoError() {
8371
final TestSubscriber<Response> tester = new TestSubscriber<>();
8472

8573
try (AsyncHttpClient client = asyncHttpClient()) {
86-
Observable<Response> o1 = AsyncHttpObservable.observe(new Func0<BoundRequestBuilder>() {
87-
@Override
88-
public BoundRequestBuilder call() {
89-
return client.prepareGet("http://www.ning.com");
90-
}
91-
});
74+
Observable<Response> o1 = AsyncHttpObservable.observe(() -> client.prepareGet("http://gatling.io"));
9275
o1.subscribe(tester);
9376
tester.awaitTerminalEvent();
9477
tester.assertTerminalEvent();
@@ -108,12 +91,7 @@ public void testObserveError() {
10891
final TestSubscriber<Response> tester = new TestSubscriber<>();
10992

11093
try (AsyncHttpClient client = asyncHttpClient()) {
111-
Observable<Response> o1 = AsyncHttpObservable.observe(new Func0<BoundRequestBuilder>() {
112-
@Override
113-
public BoundRequestBuilder call() {
114-
return client.prepareGet("http://www.ning.com/ttfn");
115-
}
116-
});
94+
Observable<Response> o1 = AsyncHttpObservable.observe(() -> client.prepareGet("http://gatling.io/ttfn"));
11795
o1.subscribe(tester);
11896
tester.awaitTerminalEvent();
11997
tester.assertTerminalEvent();
@@ -133,24 +111,9 @@ public void testObserveMultiple() {
133111
final TestSubscriber<Response> tester = new TestSubscriber<>();
134112

135113
try (AsyncHttpClient client = asyncHttpClient()) {
136-
Observable<Response> o1 = AsyncHttpObservable.observe(new Func0<BoundRequestBuilder>() {
137-
@Override
138-
public BoundRequestBuilder call() {
139-
return client.prepareGet("http://www.ning.com");
140-
}
141-
});
142-
Observable<Response> o2 = AsyncHttpObservable.observe(new Func0<BoundRequestBuilder>() {
143-
@Override
144-
public BoundRequestBuilder call() {
145-
return client.prepareGet("http://www.wisc.edu").setFollowRedirect(true);
146-
}
147-
});
148-
Observable<Response> o3 = AsyncHttpObservable.observe(new Func0<BoundRequestBuilder>() {
149-
@Override
150-
public BoundRequestBuilder call() {
151-
return client.prepareGet("http://www.umn.edu").setFollowRedirect(true);
152-
}
153-
});
114+
Observable<Response> o1 = AsyncHttpObservable.observe(() -> client.prepareGet("http://gatling.io"));
115+
Observable<Response> o2 = AsyncHttpObservable.observe(() -> client.prepareGet("http://www.wisc.edu").setFollowRedirect(true));
116+
Observable<Response> o3 = AsyncHttpObservable.observe(() -> client.prepareGet("http://www.umn.edu").setFollowRedirect(true));
154117
Observable<Response> all = Observable.merge(o1, o2, o3);
155118
all.subscribe(tester);
156119
tester.awaitTerminalEvent();

0 commit comments

Comments
 (0)