Skip to content

Commit 197d104

Browse files
committed
Merge pull request #3515 from akarnokd/BlockingUtilsInterruptedFix
1.x: BlockingUtils test: clear interrupted flag before/after
2 parents c5a4c37 + f2a9694 commit 197d104

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/test/java/rx/internal/util/BlockingUtilsTest.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,29 @@
1616

1717
package rx.internal.util;
1818

19-
import static org.mockito.Mockito.*;
2019
import static org.junit.Assert.*;
20+
import static org.mockito.Mockito.*;
2121

2222
import java.util.concurrent.CountDownLatch;
2323
import java.util.concurrent.atomic.AtomicReference;
2424

25-
import org.junit.Test;
25+
import org.junit.*;
2626

27-
import rx.Observable;
28-
import rx.Subscriber;
29-
import rx.Subscription;
27+
import rx.*;
3028
import rx.schedulers.Schedulers;
3129

3230
/**
3331
* Test suite for {@link BlockingUtils}.
3432
*/
3533
public class BlockingUtilsTest {
34+
35+
@Before
36+
@After
37+
public void before() {
38+
// make sure the interrupted flag is cleared
39+
Thread.interrupted();
40+
}
41+
3642
@Test
3743
public void awaitCompleteShouldReturnIfCountIsZero() {
3844
Subscription subscription = mock(Subscription.class);

0 commit comments

Comments
 (0)