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

Fixed issue #454 #459

Merged
merged 1 commit into from
Oct 31, 2013
Merged

Fixed issue #454 #459

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
22 changes: 20 additions & 2 deletions rxjava-core/src/main/java/rx/subscriptions/Subscriptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,16 @@
*/
package rx.subscriptions;

import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

import java.util.concurrent.Future;

import org.junit.Test;

import rx.Subscription;
import rx.operators.SafeObservableSubscription;
import rx.util.functions.Action0;

/**
Expand All @@ -41,14 +48,14 @@ public static Subscription empty() {
* @return {@link Subscription}
*/
public static Subscription create(final Action0 unsubscribe) {
return new Subscription() {
return new SafeObservableSubscription(new Subscription() {

@Override
public void unsubscribe() {
unsubscribe.call();
}

};
});
}

/**
Expand Down Expand Up @@ -122,4 +129,15 @@ public static CompositeSubscription create(Subscription... subscriptions) {
public void unsubscribe() {
}
};

public static class UnitTest {
@Test
public void testUnsubscribeOnlyOnce() {
Action0 unsubscribe = mock(Action0.class);
Subscription subscription = create(unsubscribe);
subscription.unsubscribe();
subscription.unsubscribe();
verify(unsubscribe, times(1)).call();
}
}
}