Merge pull request Netflix#222 from benjchristensen/unit-test-fixes

Future.cancel - Unit Test Fixes

build.gradle

@@ -26,9 +26,9 @@ subprojects {
 
     sourceSets.test.java.srcDir 'src/main/java'
 
-    tasks.withType(Javadoc).each {
-        it.classpath = sourceSets.main.compileClasspath
-    }
+//    tasks.withType(Javadoc).each {
+//        it.classpath = sourceSets.main.compileClasspath
+//    }
 }
 
 // Prevent contrib project from being published

hystrix-core/src/test/java/com/netflix/hystrix/HystrixCollapserTest.java

@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -145,7 +146,12 @@ public void testUnsubscribeOnOneDoesntKillBatch() throws Exception {
         timer.incrementTime(10); // let time pass that equals the default delay/period
 
         // the first is cancelled so should return null
-        assertEquals(null, response1.get());
+        try {
+            response1.get();
+            fail("expect CancellationException after cancelling");
+        } catch (CancellationException e) {
+            // expected
+        }
         // we should still get a response on the second
         assertEquals("2", response2.get());
 

hystrix-core/src/test/java/com/netflix/hystrix/collapser/CollapsedRequestObservableFunctionTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.*;
 
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
@@ -110,7 +111,7 @@ public void testSetResponseDuplicate() throws InterruptedException, ExecutionExc
         assertEquals("theResponse", v.get());
     }
 
-    @Test
+    @Test(expected = CancellationException.class)
     public void testSetResponseAfterUnsubscribe() throws InterruptedException, ExecutionException {
         CollapsedRequestObservableFunction<String, String> cr = new CollapsedRequestObservableFunction<String, String>("hello");
         Observable<String> o = Observable.create(cr);
@@ -125,11 +126,11 @@ public void testSetResponseAfterUnsubscribe() throws InterruptedException, Execu
             fail("this should have done nothing as it was unsubscribed already");
         }
 
-        // if you fetch after canceling it should be null
-        assertEquals(null, f.get());
+        // expect CancellationException after cancelling
+        f.get();
     }
 
-    @Test
+    @Test(expected = CancellationException.class)
     public void testSetExceptionAfterUnsubscribe() throws InterruptedException, ExecutionException {
         CollapsedRequestObservableFunction<String, String> cr = new CollapsedRequestObservableFunction<String, String>("hello");
         Observable<String> o = Observable.create(cr);
@@ -144,8 +145,8 @@ public void testSetExceptionAfterUnsubscribe() throws InterruptedException, Exec
             fail("this should have done nothing as it was unsubscribed already");
         }
 
-        // if you fetch after canceling it should be null
-        assertEquals(null, f.get());
+        // expect CancellationException after cancelling
+        f.get();
     }
 
     @Test