Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SizeEviction test needs to return false #2574

Merged
merged 1 commit into from
Jan 31, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/rx/subjects/ReplaySubject.java
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ public void evict(NodeList<Object> t1) {

@Override
public boolean test(Object value, long now) {
return true; // size gets never stale
return false; // size gets never stale
}

@Override
Expand Down
52 changes: 52 additions & 0 deletions src/test/java/rx/internal/operators/OperatorReplayTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,58 @@ public void testBufferedReplay() {
}
}

@Test
public void testBufferedWindowReplay() {
PublishSubject<Integer> source = PublishSubject.create();
TestScheduler scheduler = new TestScheduler();
ConnectableObservable<Integer> co = source.replay(3, 100, TimeUnit.MILLISECONDS, scheduler);
co.connect();

{
@SuppressWarnings("unchecked")
Observer<Object> observer1 = mock(Observer.class);
InOrder inOrder = inOrder(observer1);

co.subscribe(observer1);

source.onNext(1);
scheduler.advanceTimeBy(10, TimeUnit.MILLISECONDS);
source.onNext(2);
scheduler.advanceTimeBy(10, TimeUnit.MILLISECONDS);
source.onNext(3);
scheduler.advanceTimeBy(10, TimeUnit.MILLISECONDS);

inOrder.verify(observer1, times(1)).onNext(1);
inOrder.verify(observer1, times(1)).onNext(2);
inOrder.verify(observer1, times(1)).onNext(3);

source.onNext(4);
source.onNext(5);
scheduler.advanceTimeBy(90, TimeUnit.MILLISECONDS);

inOrder.verify(observer1, times(1)).onNext(4);

inOrder.verify(observer1, times(1)).onNext(5);

inOrder.verifyNoMoreInteractions();
verify(observer1, never()).onError(any(Throwable.class));

}

{
@SuppressWarnings("unchecked")
Observer<Object> observer1 = mock(Observer.class);
InOrder inOrder = inOrder(observer1);

co.subscribe(observer1);

inOrder.verify(observer1, times(1)).onNext(4);
inOrder.verify(observer1, times(1)).onNext(5);
inOrder.verifyNoMoreInteractions();
verify(observer1, never()).onError(any(Throwable.class));
}
}

@Test
public void testWindowedReplay() {
TestScheduler scheduler = new TestScheduler();
Expand Down