Update README to include new demos

Author: Nicolai Parlog

README.md

@@ -4,26 +4,25 @@ Demo project accompanying [a series of posts exploring JUnit 5](https://blog.cod
 
 ## First Steps
 
-* [Setup](http://blog.codefx.org/libraries/junit-5-setup/):
-have a look at [`pom.xml`](pom.xml) or [`build.gradle`](build.gradle)
-* [Basics](http://blog.codefx.org/libraries/junit-5-basics/):
-[`LifecycleTest`](src/test/java/org/codefx/demo/junit5/basics/LifecycleTest.java) is a good introduction, for more details see the other classes in
-[`test/.../basics`](src/test/java/org/codefx/demo/junit5/basics)
+* [Setup](http://blog.codefx.org/libraries/junit-5-setup/): have a look at [`pom.xml`](pom.xml) or [`build.gradle`](build.gradle)
+* [Basics](http://blog.codefx.org/libraries/junit-5-basics/): [`LifecycleTest`](src/test/java/org/codefx/demo/junit5/basics/LifecycleTest.java) is a good introduction, for more details see the other classes in [`test/.../basics`](src/test/java/org/codefx/demo/junit5/basics)
+* Tests in interfaces in [`test/.../interfaces`](src/test/java/org/codefx/demo/junit5/interfaces)
 
 ## Next Steps
 
+* Parameter injection: demonstrated in [`test/.../injection`](src/test/java/org/codefx/demo/junit5/injection)
+* Nested tests: demonstrated in [`test/.../nested`](src/test/java/org/codefx/demo/junit5/nested)
+* [Parameterized tests](http://blog.codefx.org/libraries/junit-5-parameterized-tests/): demonstrated in [`test/.../parameterized`](src/test/java/org/codefx/demo/junit5/parameterized), starting with [`HelloParams`](src/test/java/org/codefx/demo/junit5/parameterized/HelloParams.java)
+* [Dynamic tests](http://blog.codefx.org/libraries/junit-5-dynamic-tests/): demonstrated in [`test/.../dynamic`](src/test/java/org/codefx/demo/junit5/dynamic)
+
+## JUnit 4 and 5
+
 * [Architecture](http://blog.codefx.org/design/architecture/junit-5-architecture/) (has no code samples)
-* Side by side with JUnit 4:
-configured in [`pom.xml`](pom.xml) and [`build.gradle`](build.gradle) (search for _4.12_) and demonstrated in [`test/.../junit4`](src/test/java/org/codefx/demo/junit4)
-* [Dynamic tests](http://blog.codefx.org/libraries/junit-5-dynamic-tests/):
- demonstrated in [`test/.../dynamic`](src/test/java/org/codefx/demo/junit5/dynamic)
-* [Parameterized tests](http://blog.codefx.org/libraries/junit-5-parameterized-tests/):
-demonstrated in [`test/.../parameterized`](src/test/java/org/codefx/demo/junit5/parameterized), starting with [`HelloParams`](src/test/java/org/codefx/demo/junit5/parameterized/HelloParams.java)
+* Side by side with JUnit 4: configured in [`pom.xml`](pom.xml) and [`build.gradle`](build.gradle) (search for _4.12_) and demonstrated in [`LegacyTest`](src/test/java/org/codefx/demo/junit4/LegacyTest.java)
+* JUnit 4 rules in JUnit Jupiter: demonstrated in [JUnit4RuleInJupiter](src/test/java/org/codefx/demo/junit4/JUnit4RuleInJupiter.java)
 
 ## Extensions
 
-* [Extension model](http://blog.codefx.org/design/architecture/junit-5-extension-model/):
-implemented in [`main`](src/main/java/org/codefx/demo/junit5) and used in [`test/.../extensions`](src/test/java/org/codefx/demo/junit5/extensions)
-* [Conditions](http://blog.codefx.org/libraries/junit-5-conditions/):
-implemented in [`main`](src/main/java/org/codefx/demo/junit5) and used in [`test/.../extensions`](src/test/java/org/codefx/demo/junit5/extensions)
-* Parameter injection
+* [Extension model](http://blog.codefx.org/design/architecture/junit-5-extension-model/): implemented in [`main`](src/main/java/org/codefx/demo/junit5) and used in [`test/.../extensions`](src/test/java/org/codefx/demo/junit5/extensions)
+* [Conditions](http://blog.codefx.org/libraries/junit-5-conditions/): implemented in [`main`](src/main/java/org/codefx/demo/junit5) and used in [`test/.../extensions`](src/test/java/org/codefx/demo/junit5/extensions)
+* Example integrations, e.g. with Mockito, in [`test/.../integrations`](src/test/java/org/codefx/demo/junit5/integrations)

src/test/java/org/codefx/demo/junit5/dynamic/LambdaTestTest.java

@@ -6,6 +6,11 @@
 
 class LambdaTestTest extends LambdaTest {{
 
+	/*
+	 * NOTE: Using the lambda parameter's name as a test name no longer works on Java 9+
+	 *       (see https://bugs.openjdk.java.net/browse/JDK-8138729).
+	 */
+
 	λ(my_first_lambda_test -> {
 		System.out.println("Hi, this is Lambda Test #1");
 		assertTrue(true);

src/test/java/org/codefx/demo/junit5/dynamic/PointTest.java

@@ -13,6 +13,11 @@
 
 class PointTest {
 
+	/*
+	 * NOTE: In essence, these are parameterized tests and outside of a demo
+	 *       that feature should be used instead for such tests.
+	 */
+
 	void testDistanceComputation(Point p1, Point p2, double distance) {
 		assertEquals(distance, p1.distanceTo(p2));
 	}

src/test/java/org/codefx/demo/junit5/extensions/DisabledOnOsTest.java

@@ -9,6 +9,11 @@
 
 class DisabledOnOsTest {
 
+	/*
+	 * NOTE: In the meantime, Jupiter created an official version of this condition
+	 *       and outside of a demo it should be used instead of this implementation.
+	 */
+
 	@Test
 	void runsOnAllOS() {
 		assertTrue(true);

src/test/java/org/codefx/demo/junit5/extensions/Integration.java

@@ -5,7 +5,7 @@
 class Integration {
 
 	@IntegrationTest
-	void sleep() throws InterruptedException {
+	void sleep() {
 		System.out.println("You should see a report entry informing you of the test's run time.");
 	}
 

src/test/java/org/codefx/demo/junit5/injection/InVariousTests.java renamed to src/test/java/org/codefx/demo/junit5/injection/CustomInjectionInVariousTests.java

@@ -14,7 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
-public class InVariousTests {
+public class CustomInjectionInVariousTests {
 
 	@Test
 	@ExtendWith(RandomIntegerResolver.class)