Merge test for exception type and message

IMO this is conceptually one assert because the message and the
exception type are strongly coupled.

Author: stefanbirkner

src/test/java/org/junit/internal/runners/statements/FailOnTimeoutTest.java

@@ -55,16 +55,9 @@ public void noExceptionIsThrownWhenWrappedStatementFinishesBeforeTimeoutWithoutT
     }
 
     @Test
-    public void throwsTestTimedOutException() {
-        assertThrows(
-                TestTimedOutException.class,
-                run(failAfter50Ms(new RunForASecond())));
-    }
-
-    @Test
-    public void throwExceptionWithNiceMessageOnTimeout() {
+    public void throwsTestTimedOutExceptionWithMeaningfulMessage() {
         Exception e = assertThrows(
-                Exception.class,
+                TestTimedOutException.class,
                 run(failAfter50Ms(new RunForASecond())));
         assertEquals("test timed out after 50 milliseconds", e.getMessage());
     }