Throw normal IOException when canceled to match OkHttp.

renjx · Dec 21, 2015 · 73b88a4 · 73b88a4
1 parent c342d65
commit 73b88a4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/retrofit-mock/src/main/java/retrofit2/mock/BehaviorCall.java b/retrofit-mock/src/main/java/retrofit2/mock/BehaviorCall.java
@@ -16,7 +16,6 @@
 package retrofit2.mock;
 
 import java.io.IOException;
-import java.io.InterruptedIOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -59,7 +58,7 @@ private boolean delaySleep() {
           try {
             Thread.sleep(sleepMs);
           } catch (InterruptedException e) {
-            callback.onFailure(new InterruptedIOException("canceled"));
+            callback.onFailure(new IOException("canceled"));
             return false;
           }
         }
@@ -68,7 +67,7 @@ private boolean delaySleep() {
 
       @Override public void run() {
         if (canceled) {
-          callback.onFailure(new InterruptedIOException("canceled"));
+          callback.onFailure(new IOException("canceled"));
         } else if (behavior.calculateIsFailure()) {
           if (delaySleep()) {
             callback.onFailure(behavior.failureException());
@@ -114,7 +113,7 @@ private boolean delaySleep() {
     try {
       latch.await();
     } catch (InterruptedException e) {
-      throw new InterruptedIOException("canceled");
+      throw new IOException("canceled");
     }
     Response<T> response = responseRef.get();
     if (response != null) return response;

diff --git a/retrofit-mock/src/test/java/retrofit2/mock/MockRetrofitTest.java b/retrofit-mock/src/test/java/retrofit2/mock/MockRetrofitTest.java
@@ -17,7 +17,6 @@
 package retrofit2.mock;
 
 import java.io.IOException;
-import java.io.InterruptedIOException;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -222,8 +221,8 @@ interface DoWorkService {
     try {
       call.execute();
       fail();
-    } catch (InterruptedIOException e) {
-      assertThat(e).hasMessage("canceled");
+    } catch (IOException e) {
+      assertThat(e).isExactlyInstanceOf(IOException.class).hasMessage("canceled");
     }
   }
 
@@ -252,7 +251,7 @@ interface DoWorkService {
     call.cancel();
 
     assertTrue(latch.await(1, SECONDS));
-    assertThat(failureRef.get()).isInstanceOf(InterruptedIOException.class).hasMessage("canceled");
+    assertThat(failureRef.get()).isExactlyInstanceOf(IOException.class).hasMessage("canceled");
   }
 
   @Test public void syncCanceledBeforeStart() throws IOException {
@@ -266,8 +265,8 @@ interface DoWorkService {
     try {
       call.execute();
       fail();
-    } catch (InterruptedIOException e) {
-      assertThat(e).hasMessage("canceled");
+    } catch (IOException e) {
+      assertThat(e).isExactlyInstanceOf(IOException.class).hasMessage("canceled");
     }
   }
 
@@ -293,6 +292,6 @@ interface DoWorkService {
     });
 
     assertTrue(latch.await(1, SECONDS));
-    assertThat(failureRef.get()).isInstanceOf(InterruptedIOException.class).hasMessage("canceled");
+    assertThat(failureRef.get()).isExactlyInstanceOf(IOException.class).hasMessage("canceled");
   }
 }