Skip to content

Commit 2120103

Browse files
Give unit test some room for scheduler variability
- I specifically want to be testing with real threads here and not virtual time or a synchronous sequence so am giving it a range of counts that are acceptable
1 parent eb932d8 commit 2120103

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

rxjava-core/src/main/java/rx/operators/OperationGroupBy.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ public void testUnsubscribe() throws InterruptedException {
464464
@Override
465465
public Subscription call(final Observer<Event> observer) {
466466
final BooleanSubscription s = new BooleanSubscription();
467-
System.out.println("*** Subscribing to EventStream ***");
467+
System.out.println("testUnsubscribe => *** Subscribing to EventStream ***");
468468
subscribeCounter.incrementAndGet();
469469
new Thread(new Runnable() {
470470

@@ -501,7 +501,7 @@ public Integer call(Event e) {
501501

502502
@Override
503503
public Observable<String> call(GroupedObservable<Integer, Event> eventGroupedObservable) {
504-
System.out.println("GroupedObservable Key: " + eventGroupedObservable.getKey());
504+
System.out.println("testUnsubscribe => GroupedObservable Key: " + eventGroupedObservable.getKey());
505505
groupCounter.incrementAndGet();
506506

507507
return eventGroupedObservable
@@ -510,7 +510,7 @@ public Observable<String> call(GroupedObservable<Integer, Event> eventGroupedObs
510510

511511
@Override
512512
public String call(Event event) {
513-
return "Source: " + event.source + " Message: " + event.message;
513+
return "testUnsubscribe => Source: " + event.source + " Message: " + event.message;
514514
}
515515
});
516516

@@ -540,10 +540,10 @@ public void onNext(String outputMessage) {
540540
assertEquals(1, groupCounter.get());
541541
assertEquals(20, eventCounter.get());
542542
// sentEvents will go until 'eventCounter' hits 20 and then unsubscribes
543-
// which means it will also send (but ignore) the 19 events for the other group
543+
// which means it will also send (but ignore) the 19/20 events for the other group
544544
// It will not however send all 100 events.
545-
assertEquals(39, sentEventCounter.get());
546-
545+
assertEquals(39, sentEventCounter.get(), 2);
546+
// gave it a delta of 2 so the threading/unsubscription race has wiggle
547547
}
548548

549549
private static class Event {

0 commit comments

Comments
 (0)