Add further requested improvements.

#835

junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java

@@ -29,14 +29,14 @@
  *
  * <h3>Method Signatures</h3>
  *
- * <p>{@code @AfterAll} methods must not be {@code private} and must be
- * {@code static} by default. Consequently, {@code @AfterAll} methods are not
+ * {@code @AfterAll} methods must have a {@code void} return type,
+ * must not be {@code private}, and must be {@code static} by default.
+ * Consequently, {@code @AfterAll} methods are not
  * supported in {@link Nested @Nested} test classes or as <em>interface default
  * methods</em> unless the test class is annotated with
  * {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}. {@code @AfterAll}
  * methods may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
- * {@code @AfterAll} methods must not return a value.
  *
  * <h3>Inheritance</h3>
  *

junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterEach.java

@@ -27,10 +27,10 @@
  *
  * <h3>Method Signatures</h3>
  *
- * <p>{@code @AfterEach} methods must not be {@code private}, must not be
- * {@code static}, and may optionally declare parameters to be resolved by
+ * {@code @AfterEach} methods must have a {@code void} return type,
+ * must not be {@code private}, and must not be {@code static}.
+ * They may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
- * {@code @AfterEach} methods must not return a value.
  *
  * <h3>Inheritance</h3>
  *

junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java

@@ -29,14 +29,14 @@
  *
  * <h3>Method Signatures</h3>
  *
- * <p>{@code @BeforeAll} methods must not be {@code private} and must be
- * {@code static} by default. Consequently, {@code @BeforeAll} methods are not
+ * {@code @BeforeAll} methods must have a {@code void} return type,
+ * must not be {@code private}, and must be {@code static} by default.
+ * Consequently, {@code @BeforeAll} methods are not
  * supported in {@link Nested @Nested} test classes or as <em>interface default
  * methods</em> unless the test class is annotated with
  * {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}. {@code @BeforeAll}
  * methods may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
- * {@code @BeforeAll} methods must not return a value.
  *
  * <h3>Inheritance</h3>
  *

junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeEach.java

@@ -27,10 +27,10 @@
  *
  * <h3>Method Signatures</h3>
  *
- * <p>{@code @BeforeEach} methods must not be {@code private}, must not be
- * {@code static}, and may optionally declare parameters to be resolved by
+ * {@code @BeforeEach} methods must have a {@code void} return type,
+ * must not be {@code private}, and must not be {@code static}.
+ * They may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
- * {@code @BeforeEach} methods must not return a value.
  *
  * <h3>Inheritance</h3>
  *

junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/NonVoidTestableMethodIntegrationTests.java

@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.engine;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
@@ -21,24 +21,21 @@ class NonVoidTestableMethodIntegrationTests {
 	void valid() {
 	}
 
-	//this method must never be called
 	@Test
 	int invalidMethodReturningPrimitive() {
-		assertTrue(false);
+		fail("This method should never have been called.");
 		return 1;
 	}
 
-	//this method must never be called
 	@Test
 	String invalidMethodReturningObject() {
-		assertTrue(false);
+		fail("This method should never have been called.");
 		return "";
 	}
 
-	//this method must never be called
 	@RepeatedTest(3)
 	int invalidMethodVerifyingTestTemplateMethod() {
-		assertTrue(false);
+		fail("This method should never have been called.");
 		return 1;
 	}