Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revise SettableListenableFuture implementation

Browse Source 
This change modifies the SettableListenableFuture implementation to use
internally a ListenableFutureTask created with a "settable" Callable.

Issue: SPR-11614
This commit is contained in:
Rossen Stoyanchev
2014-05-28 16:03:10 -04:00
parent 38b525aa9e
commit 0640a32863
2 changed files with 89 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
View File

@@ -26,6 +26,8 @@ import java.util.concurrent.TimeoutException;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
/**
* @author Mattias Severson
@@ -290,36 +292,28 @@ public class SettableListenableFutureTests {
@Test
public void cancelDoesNotNotifyCallbacksOnSet() {
settableListenableFuture.addCallback(new ListenableFutureCallback<String>() {
@Override
public void onSuccess(String result) {
fail("onSuccess should not have been called");
}
@Override
public void onFailure(Throwable t) {
fail("onFailure should not have been called");
}
});
ListenableFutureCallback callback = mock(ListenableFutureCallback.class);
settableListenableFuture.addCallback(callback);
settableListenableFuture.cancel(true);
verify(callback).onFailure(any(CancellationException.class));
verifyNoMoreInteractions(callback);
settableListenableFuture.set("hello");
verifyNoMoreInteractions(callback);
}
@Test
public void cancelDoesNotNotifyCallbacksOnSetException() {
settableListenableFuture.addCallback(new ListenableFutureCallback<String>() {
@Override
public void onSuccess(String result) {
fail("onSuccess should not have been called");
}
@Override
public void onFailure(Throwable t) {
fail("onFailure should not have been called");
}
});
ListenableFutureCallback callback = mock(ListenableFutureCallback.class);
settableListenableFuture.addCallback(callback);
settableListenableFuture.cancel(true);
verify(callback).onFailure(any(CancellationException.class));
verifyNoMoreInteractions(callback);
settableListenableFuture.setException(new RuntimeException());
verifyNoMoreInteractions(callback);
}
private static class InterruptableSettableListenableFuture extends SettableListenableFuture<String> {