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.

Sign up for GitHub

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

Jump to bottom

Fix clearReplays to clear cachedSuccessPipeline. It was missed #33

Merged
merged 1 commit into from
Mar 14, 2016
Merged

Fix clearReplays to clear cachedSuccessPipeline. It was missed #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions janet/src/main/java/io/techery/janet/ActionPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public Observable<A> observeSuccessWithReplay() {
*/
public void clearReplays() {
createCachedPipeline();
createCachedSuccessPipeline();
}

/**
Expand Down
28 changes: 23 additions & 5 deletions janet/src/test/java/io/techery/janet/JanetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.only;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

public class JanetTest {
Expand Down Expand Up @@ -56,8 +60,7 @@ public void sendWithObserve() {
@Test
public void sendWithObserveWithReplay() {
TestSubscriber<ActionState<TestAction>> subscriber = new TestSubscriber<ActionState<TestAction>>();
actionPipe.observeWithReplay()
.subscribe(subscriber);
actionPipe.observeWithReplay().subscribe(subscriber);
actionPipe.send(new TestAction());
subscriber.unsubscribe();
assertSubscriberWithStates(subscriber);
Expand Down Expand Up @@ -120,6 +123,7 @@ public void cancelAfterSend() {
actionPipe.createObservable(action).subscribe(subscriber);
subscriber.unsubscribe();
assertSubscriberWithSingleValue(subscriber);
verify(service, times(1)).cancel(any(ActionHolder.class));
}

@Test
Expand All @@ -129,9 +133,17 @@ public void clearReplays() {
TestSubscriber<ActionState<TestAction>> subscriber = new TestSubscriber<ActionState<TestAction>>();
actionPipe.observeWithReplay().subscribe(subscriber);
subscriber.unsubscribe();
subscriber.assertNoErrors();
subscriber.assertNoValues();
subscriber.assertUnsubscribed();
assertSubscriberWithoutValues(subscriber);
}

@Test
public void clearReplaysSuccess() {
actionPipe.send(new TestAction());
actionPipe.clearReplays();
TestSubscriber<TestAction> subscriber = new TestSubscriber<TestAction>();
actionPipe.observeSuccessWithReplay().subscribe(subscriber);
subscriber.unsubscribe();
assertSubscriberWithoutValues(subscriber);
}

@Test
Expand Down Expand Up @@ -161,6 +173,12 @@ private static void assertSubscriberWithSingleValue(TestSubscriber<?> subscriber
subscriber.assertUnsubscribed();
}

private static void assertSubscriberWithoutValues(TestSubscriber<?> subscriber) {
subscriber.assertNoErrors();
subscriber.assertNoValues();
subscriber.assertUnsubscribed();
}

private static void assertStatusCount(List<ActionState<TestAction>> values, ActionState.Status status, int count) {
int i = 0;
for (ActionState state : values) {
Expand Down