Skip to content

Commit 32a080e

Browse files
twz123slandelle
authored andcommitted
Check for errors before checking for completion. (AsyncHttpClient#1310)
Fixes AsyncHttpClient#1292. All the failing tests make requests to actual websites. Most probably timeouts happened, but since the tests check for completion first, any exceptions produced by the tests didn't show up. By changing the assertion order to check for no errors first, and then for completion, any errors that are emitted by the tests will be propagated, and not suppressed.
1 parent 4928216 commit 32a080e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public void testToObservableNoError() {
3535
o1.subscribe(tester);
3636
tester.awaitTerminalEvent();
3737
tester.assertTerminalEvent();
38-
tester.assertCompleted();
3938
tester.assertNoErrors();
39+
tester.assertCompleted();
4040
List<Response> responses = tester.getOnNextEvents();
4141
assertNotNull(responses);
4242
assertEquals(responses.size(), 1);
@@ -55,8 +55,8 @@ public void testToObservableError() {
5555
o1.subscribe(tester);
5656
tester.awaitTerminalEvent();
5757
tester.assertTerminalEvent();
58-
tester.assertCompleted();
5958
tester.assertNoErrors();
59+
tester.assertCompleted();
6060
List<Response> responses = tester.getOnNextEvents();
6161
assertNotNull(responses);
6262
assertEquals(responses.size(), 1);
@@ -75,8 +75,8 @@ public void testObserveNoError() {
7575
o1.subscribe(tester);
7676
tester.awaitTerminalEvent();
7777
tester.assertTerminalEvent();
78-
tester.assertCompleted();
7978
tester.assertNoErrors();
79+
tester.assertCompleted();
8080
List<Response> responses = tester.getOnNextEvents();
8181
assertNotNull(responses);
8282
assertEquals(responses.size(), 1);
@@ -95,8 +95,8 @@ public void testObserveError() {
9595
o1.subscribe(tester);
9696
tester.awaitTerminalEvent();
9797
tester.assertTerminalEvent();
98-
tester.assertCompleted();
9998
tester.assertNoErrors();
99+
tester.assertCompleted();
100100
List<Response> responses = tester.getOnNextEvents();
101101
assertNotNull(responses);
102102
assertEquals(responses.size(), 1);
@@ -118,8 +118,8 @@ public void testObserveMultiple() {
118118
all.subscribe(tester);
119119
tester.awaitTerminalEvent();
120120
tester.assertTerminalEvent();
121-
tester.assertCompleted();
122121
tester.assertNoErrors();
122+
tester.assertCompleted();
123123
List<Response> responses = tester.getOnNextEvents();
124124
assertNotNull(responses);
125125
assertEquals(responses.size(), 3);

extras/rxjava/src/test/java/org/asynchttpclient/extras/rxjava/single/AsyncHttpSingleTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import java.util.Arrays;
4545
import java.util.List;
4646
import java.util.concurrent.Future;
47-
import java.util.concurrent.TimeUnit;
4847
import java.util.concurrent.atomic.AtomicReference;
4948

5049
import rx.Single;
@@ -99,8 +98,8 @@ public void testSuccessfulCompletion() throws Exception {
9998

10099
subscriber.awaitTerminalEvent();
101100
subscriber.assertTerminalEvent();
102-
subscriber.assertCompleted();
103101
subscriber.assertNoErrors();
102+
subscriber.assertCompleted();
104103
subscriber.assertValue(handler);
105104
}
106105

@@ -152,8 +151,8 @@ public void testSuccessfulCompletionWithProgress() throws Exception {
152151

153152
subscriber.awaitTerminalEvent();
154153
subscriber.assertTerminalEvent();
155-
subscriber.assertCompleted();
156154
subscriber.assertNoErrors();
155+
subscriber.assertCompleted();
157156
subscriber.assertValue(handler);
158157
}
159158

@@ -289,13 +288,14 @@ public State onStatusReceived(HttpResponseStatus status) {
289288
return State.ABORT;
290289
}
291290
});
291+
292292
underTest.subscribe(subscriber);
293-
subscriber.awaitTerminalEvent(30, TimeUnit.SECONDS);
293+
subscriber.awaitTerminalEvent();
294294
}
295295

296296
subscriber.assertTerminalEvent();
297-
subscriber.assertCompleted();
298297
subscriber.assertNoErrors();
298+
subscriber.assertCompleted();
299299
subscriber.assertValue(null);
300300
}
301301

0 commit comments

Comments
 (0)