Fix test interference (#37)

future/src/test/java/com/spotify/hamcrest/future/ExceptionallyCompletedBlockingCompletionStageTest.java

@@ -81,8 +81,8 @@ public void testInterruptedMismatchFormatting() throws Exception {
 
       assertThat(description.toString(), is("a stage that was interrupted"));
     } finally {
-      // This will cause the future's thread to throw InterruptedException and make it return
-      future.cancel(true);
+      // Clear the interrupted flag to avoid interference between tests
+      Thread.interrupted();
     }
   }
 }

future/src/test/java/com/spotify/hamcrest/future/ExceptionallyCompletedBlockingFutureTest.java

@@ -82,25 +82,20 @@ public void testInterruptedMismatchFormatting() throws Exception {
 
       assertThat(description.toString(), is("a future that was interrupted"));
     } finally {
-      // This will cause the future's thread to throw InterruptedException and make it return
-      future.cancel(true);
+      // Clear the interrupted flag to avoid interference between tests
+      Thread.interrupted();
     }
   }
 
   @Test
   public void testCancelledMismatchFormatting() throws Exception {
     final SettableFuture<Void> future = SettableFuture.create();
 
-    try {
-      // Cancel the future
-      future.cancel(true);
-      final StringDescription description = new StringDescription();
-      SUT.describeMismatch(future, description);
+    // Cancel the future
+    future.cancel(true);
+    final StringDescription description = new StringDescription();
+    SUT.describeMismatch(future, description);
 
-      assertThat(description.toString(), is("a future that was cancelled"));
-    } finally {
-      // This will cause the future's thread to throw InterruptedException and make it return
-      future.cancel(true);
-    }
+    assertThat(description.toString(), is("a future that was cancelled"));
   }
 }

future/src/test/java/com/spotify/hamcrest/future/ExceptionallyCompletedCompletionStageTest.java

@@ -83,8 +83,8 @@ public void testInterruptedMismatchFormatting() throws Exception {
 
       assertThat(description.toString(), is("a stage that was not completed"));
     } finally {
-      // This will cause the future's thread to throw InterruptedException and make it return
-      future.cancel(true);
+      // Clear the interrupted flag to avoid interference between tests
+      Thread.interrupted();
     }
   }
 }

future/src/test/java/com/spotify/hamcrest/future/ExceptionallyCompletedFutureTest.java

@@ -81,8 +81,8 @@ public void testInterruptedMismatchFormatting() throws Exception {
 
       assertThat(description.toString(), is("a future that was not done"));
     } finally {
-      // This will cause the future's thread to throw InterruptedException and make it return
-      future.cancel(true);
+      // Clear the interrupted flag to avoid interference between tests
+      Thread.interrupted();
     }
   }
 

future/src/test/java/com/spotify/hamcrest/future/SuccessfullyCompletedBlockingCompletionStageTest.java

@@ -70,8 +70,8 @@ public void testInterruptedMismatchFormatting() throws Exception {
 
       assertThat(description.toString(), is("a stage that was interrupted"));
     } finally {
-      // This will cause the future's thread to throw InterruptedException and make it return
-      future.cancel(true);
+      // Clear the interrupted flag to avoid interference between tests
+      Thread.interrupted();
     }
   }
 

future/src/test/java/com/spotify/hamcrest/future/SuccessfullyCompletedBlockingFutureTest.java

@@ -68,8 +68,8 @@ public void testInterruptedMismatchFormatting() throws Exception {
 
       assertThat(description.toString(), is("a future that was interrupted"));
     } finally {
-      // This will cause the future's thread to throw InterruptedException and make it return
-      future.cancel(true);
+      // Clear the interrupted flag to avoid interference between tests
+      Thread.interrupted();
     }
   }
 

future/src/test/java/com/spotify/hamcrest/future/SuccessfullyCompletedCompletionStageTest.java

@@ -69,8 +69,8 @@ public void testInterruptedMismatchFormatting() throws Exception {
 
       assertThat(description.toString(), is("a stage that was not done"));
     } finally {
-      // This will cause the future's thread to throw InterruptedException and make it return
-      future.cancel(true);
+      // Clear the interrupted flag to avoid interference between tests
+      Thread.interrupted();
     }
   }
 

future/src/test/java/com/spotify/hamcrest/future/SuccessfullyCompletedFutureTest.java

@@ -31,7 +31,6 @@
 import com.google.common.util.concurrent.SettableFuture;
 import java.io.IOException;
 import java.util.concurrent.Future;
-import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matcher;
 import org.hamcrest.StringDescription;
 import org.junit.Test;
@@ -71,8 +70,8 @@ public void testInterruptedMismatchFormatting() throws Exception {
 
       assertThat(description.toString(), is("a future that was not completed"));
     } finally {
-      // This will cause the future's thread to throw InterruptedException and make it return
-      future.cancel(true);
+      // Clear the interrupted flag to avoid interference between tests
+      Thread.interrupted();
     }
   }
 
@@ -88,8 +87,8 @@ public void testCancelledMismatchFormatting() throws Exception {
 
       assertThat(description.toString(), is("a future that was cancelled"));
     } finally {
-      // This will cause the future's thread to throw InterruptedException and make it return
-      future.cancel(true);
+      // Clear the interrupted flag to avoid interference between tests
+      Thread.interrupted();
     }
   }