Commits

Michael Heemskerk committed b5748aa Merge

NONE: Merge

  • Participants
  • Parent commits d99db71, f7a4fe8

Comments (0)

Files changed (2)

File src/test/java/com/atlassian/utils/process/ExternalProcessImplTest.java

 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 import static com.atlassian.utils.process.ExternalProcessTestUtils.*;
 
         process.execute();
 
         ProcessException exception = process.getHandler().getException();
-        assertTrue(exception instanceof ProcessTimeoutException);
+        assertThat(exception, is(instanceOf(ProcessTimeoutException.class)));
     }
 
     @Test(timeout = 10 * 1000) //Test timeout in case execution doesn't stop timeout like it should
         process.execute();
 
         ProcessException exception = process.getHandler().getException();
-        assertTrue(exception instanceof ProcessTimeoutException);
+        assertThat(exception, is(instanceOf(ProcessTimeoutException.class)));
     }
 
     private ExternalProcess buildProcessWithBlockingInputHandler() {

File src/test/java/com/atlassian/utils/process/ExternalProcessMonitorTest.java

 import java.util.concurrent.TimeUnit;
 
 import static com.atlassian.utils.process.ExternalProcessTestUtils.*;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.same;
 import static org.mockito.Mockito.never;
 
         process.execute();
 
-        assertTrue(process.getHandler().getException() instanceof ProcessTimeoutException);
+        assertThat(process.getHandler().getException(), is(instanceOf(ProcessTimeoutException.class)));
         verify(monitor).onBeforeStart(same(process));
         verify(monitor).onAfterFinished(same(process));
     }
 
         process.execute();
 
-        assertTrue(process.getHandler().getException() instanceof ProcessTimeoutException);
+        assertThat(process.getHandler().getException(), is(instanceOf(ProcessTimeoutException.class)));
         verify(monitor).onBeforeStart(same(process));
         verify(monitor).onAfterFinished(same(process));
     }