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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2017-02-02 20:11:06 +01:00
parent 02195f5abf
commit acf511ac0e
10 changed files with 63 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-core/src/main/java/org/springframework/util/concurrent/ListenableFuture.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import java.util.concurrent.Future;
* Extend {@link Future} with the capability to accept completion callbacks.
* If the future has completed when the callback is added, the callback is
* triggered immediately.
*
* <p>Inspired by {@code com.google.common.util.concurrent.ListenableFuture}.
*
* @author Arjen Poutsma

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

@@ -32,7 +32,6 @@ import static org.mockito.Mockito.*;
* @author Mattias Severson
* @author Juergen Hoeller
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
public class SettableListenableFutureTests {
private final SettableListenableFuture<String> settableListenableFuture = new SettableListenableFuture<>();
@@ -266,20 +265,20 @@ public class SettableListenableFutureTests {
@Test
public void cancelWithMayInterruptIfRunningTrueCallsOverriddenMethod() {
InterruptableSettableListenableFuture tested = new InterruptableSettableListenableFuture();
assertTrue(tested.cancel(true));
assertTrue(tested.calledInterruptTask());
assertTrue(tested.isCancelled());
assertTrue(tested.isDone());
InterruptibleSettableListenableFuture interruptibleFuture = new InterruptibleSettableListenableFuture();
assertTrue(interruptibleFuture.cancel(true));
assertTrue(interruptibleFuture.calledInterruptTask());
assertTrue(interruptibleFuture.isCancelled());
assertTrue(interruptibleFuture.isDone());
}
@Test
public void cancelWithMayInterruptIfRunningFalseDoesNotCallOverriddenMethod() {
InterruptableSettableListenableFuture tested = new InterruptableSettableListenableFuture();
assertTrue(tested.cancel(false));
assertFalse(tested.calledInterruptTask());
assertTrue(tested.isCancelled());
assertTrue(tested.isDone());
InterruptibleSettableListenableFuture interruptibleFuture = new InterruptibleSettableListenableFuture();
assertTrue(interruptibleFuture.cancel(false));
assertFalse(interruptibleFuture.calledInterruptTask());
assertTrue(interruptibleFuture.isCancelled());
assertTrue(interruptibleFuture.isDone());
}
@Test
@@ -350,6 +349,7 @@ public class SettableListenableFutureTests {
}
@Test
@SuppressWarnings({"rawtypes", "unchecked"})
public void cancelDoesNotNotifyCallbacksOnSet() {
ListenableFutureCallback callback = mock(ListenableFutureCallback.class);
settableListenableFuture.addCallback(callback);
@@ -366,6 +366,7 @@ public class SettableListenableFutureTests {
}
@Test
@SuppressWarnings({"rawtypes", "unchecked"})
public void cancelDoesNotNotifyCallbacksOnSetException() {
ListenableFutureCallback callback = mock(ListenableFutureCallback.class);
settableListenableFuture.addCallback(callback);
@@ -382,7 +383,7 @@ public class SettableListenableFutureTests {
}
private static class InterruptableSettableListenableFuture extends SettableListenableFuture<String> {
private static class InterruptibleSettableListenableFuture extends SettableListenableFuture<String> {
private boolean interrupted = false;