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

Make Subscription cancellation fail-fast #115

Merged
merged 1 commit into from
Jul 9, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ public Subscription subscribe(final T subscriber) {
@Override
public void cancel() {

subscribers.remove(this);
if (subscribers.remove(this) == null) {
throw new IllegalStateException("Subscription has already been cancelled");
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public interface Subscription {
* Cancels this {@code Subscription}.
*
* @since 0.1
* @throws IllegalStateException if this {@code Subscription} has already been cancelled.
*/
void cancel();

Expand Down
24 changes: 24 additions & 0 deletions vision-api/src/test/java/me/sparky983/vision/ButtonTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,18 @@ void testSubscriberThrowsException() {
verifyNoMoreInteractions(subscriber); // exception should not be called again
}

@Test
void testCancelSubscriptionWhenSubscriptionIsAlreadyCancelled() {

final Button button = Button.button().type(ItemType.STONE);

final Subscription subscription = button.subscribe(mock());

subscription.cancel();

assertThrows(IllegalStateException.class, subscription::cancel);
}

@Test
void testCancelSubscription() {

Expand Down Expand Up @@ -818,6 +830,18 @@ void testSubscriberThrowsException() {
verifyNoMoreInteractions(subscriber); // exception should not be called again
}

@Test
void testCancelSubscriptionWhenSubscriptionIsAlreadyCancelled() {

final Button button = Button.of(ItemType.STONE);

final Subscription subscription = button.subscribe(mock());

subscription.cancel();

assertThrows(IllegalStateException.class, subscription::cancel);
}

@Test
void testCancelSubscription() {

Expand Down
12 changes: 12 additions & 0 deletions vision-api/src/test/java/me/sparky983/vision/ChestTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,18 @@ void testSubscriberThrowsException() {
verifyNoMoreInteractions(subscriber);
}

@Test
void testCancelSubscriptionWhenSubscriptionIsAlreadyCancelled() {

final Gui gui = Gui.chest().build();

final Subscription subscription = gui.subscribe(mock());

subscription.cancel();

assertThrows(IllegalStateException.class, subscription::cancel);
}

@Test
void testCancelSubscription() {

Expand Down
12 changes: 12 additions & 0 deletions vision-api/src/test/java/me/sparky983/vision/DropperTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,18 @@ void testSubscriberThrowsException() {
verifyNoMoreInteractions(subscriber);
}

@Test
void testCancelSubscriptionWhenSubscriptionIsAlreadyCancelled() {

final Gui gui = Gui.dropper().build();

final Subscription subscription = gui.subscribe(mock());

subscription.cancel();

assertThrows(IllegalStateException.class, subscription::cancel);
}

@Test
void testCancelSubscription() {

Expand Down
12 changes: 12 additions & 0 deletions vision-api/src/test/java/me/sparky983/vision/HopperTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,18 @@ void testSubscriberThrowsException() {
verifyNoMoreInteractions(subscriber);
}

@Test
void testCancelSubscriptionWhenSubscriptionIsAlreadyCancelled() {

final Gui gui = Gui.hopper().build();

final Subscription subscription = gui.subscribe(mock());

subscription.cancel();

assertThrows(IllegalStateException.class, subscription::cancel);
}

@Test
void testCancelSubscription() {

Expand Down