Update demos and diagrams for lifecycle callbacks

Issue: #1620
junit-team · Feb 5, 2019 · a1fb439 · a1fb439 · sormuras · Feb 5, 2019
1 parent 3804182
commit a1fb439
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 9 deletions.
diff --git a/documentation/src/docs/asciidoc/user-guide/extensions.adoc b/documentation/src/docs/asciidoc/user-guide/extensions.adoc
@@ -633,6 +633,11 @@ please consult the respective Javadoc for each annotation and extension.
 JUnit Jupiter guarantees wrapping behavior within class hierarchies for user-supplied
 lifecycle callbacks (e.g., `@BeforeEach` and `@AfterEach`):
 
+////
+PNG generated using ZenUML: https://app.zenuml.com
+
+See corresponding *.txt file in images folder for the source.
+////
 image::extensions_DatabaseTestsDemo.png[caption='',title='DatabaseTestsDemo.java']
 
 JUnit Jupiter does **not** guarantee the order in which multiple lifecycle methods are
@@ -647,6 +652,11 @@ test methods in the same order, thereby allowing for repeatable builds.
 In addition, and more importantly, JUnit Jupiter does **not** support wrapping behavior
 for multiple lifecycle methods declared within a single test class or test interface.
 
+////
+PNG generated using ZenUML: https://app.zenuml.com
+
+See corresponding *.txt file in images folder for the source.
+////
 image::extensions_BrokenLifecycleMethodConfigDemo.png[caption='',title='BrokenLifecycleMethodConfigDemo.java']
 
 Due to the aforementioned behavior, the JUnit Team recommends that developers declare at

diff --git a/.../docs/asciidoc/user-guide/images/extensions_BrokenLifecycleMethodConfigDemo.png b/.../docs/asciidoc/user-guide/images/extensions_BrokenLifecycleMethodConfigDemo.png
diff --git a/...tation/src/docs/asciidoc/user-guide/images/extensions_BrokenLifecycleMethodConfigDemo.txt b/...tation/src/docs/asciidoc/user-guide/images/extensions_BrokenLifecycleMethodConfigDemo.txt
@@ -1,5 +1,6 @@
 @Starter(Platform)
-Result = JupiterEngine.execute("BrokenLifecycleMethodConfigDemo.testDatabaseFunctionality") {
+Result = JupiterEngine.execute(BrokenLifecycleMethodConfigDemo) {
+
   Extension1.beforeEach()
   Extension2.beforeEach()
   // @BeforeEach
@@ -11,7 +12,8 @@ Result = JupiterEngine.execute("BrokenLifecycleMethodConfigDemo.testDatabaseFunc
   // @AfterEach
   BrokenLifecycleMethodConfigDemo.disconnectFromDatabase()
   // @AfterEach
-  BrokenLifecycleMethodConfigDemo.deleteTestDataInDatabase()
+  BrokenLifecycleMethodConfigDemo.deleteTestDataFromDatabase()
   Extension2.afterEach()
   Extension1.afterEach()
+
 }
diff --git a/documentation/src/docs/asciidoc/user-guide/images/extensions_DatabaseTestsDemo.png b/documentation/src/docs/asciidoc/user-guide/images/extensions_DatabaseTestsDemo.png
diff --git a/documentation/src/docs/asciidoc/user-guide/images/extensions_DatabaseTestsDemo.txt b/documentation/src/docs/asciidoc/user-guide/images/extensions_DatabaseTestsDemo.txt
@@ -1,5 +1,10 @@
 @Starter(Platform)
-Result = JupiterEngine.execute("DatabaseTestsDemo.testDatabaseFunctionality") {
+Result = JupiterEngine.execute(DatabaseTestsDemo) {
+
+  // @BeforeAll inherited from AbstractDatabaseTests
+  DatabaseTestsDemo.createDatabase()
+  // @BeforeAll
+  DatabaseTestsDemo.beforeAll()
   Extension1.beforeEach()
   Extension2.beforeEach()
   // @BeforeEach inherited from AbstractDatabaseTests
@@ -9,9 +14,14 @@ Result = JupiterEngine.execute("DatabaseTestsDemo.testDatabaseFunctionality") {
   // @Test
   DatabaseTestsDemo.testDatabaseFunctionality()
   // @AfterEach
-  DatabaseTestsDemo.deleteTestDataInDatabase()
+  DatabaseTestsDemo.deleteTestDataFromDatabase()
   // @AfterEach inherited from AbstractDatabaseTests
   DatabaseTestsDemo.disconnectFromDatabase()
   Extension2.afterEach()
   Extension1.afterEach()
+  // @BeforeAll
+  DatabaseTestsDemo.afterAll()
+  // @AfterAll inherited from AbstractDatabaseTests
+  DatabaseTestsDemo.destroyDatabase()
+
 }
diff --git a/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java b/documentation/src/test/java/example/callbacks/BrokenLifecycleMethodConfigDemo.java
@@ -45,8 +45,8 @@ void testDatabaseFunctionality() {
 	}
 
 	@AfterEach
-	void deleteTestDataInDatabase() {
-		afterEachMethod(getClass().getSimpleName() + ".deleteTestDataInDatabase()");
+	void deleteTestDataFromDatabase() {
+		afterEachMethod(getClass().getSimpleName() + ".deleteTestDataFromDatabase()");
 	}
 
 	@AfterEach

diff --git a/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java b/documentation/src/test/java/example/callbacks/DatabaseTestsDemo.java
@@ -46,13 +46,13 @@ void testDatabaseFunctionality() {
 	}
 
 	@AfterEach
-	void deleteTestDataInDatabase() {
-		afterEachMethod(getClass().getSimpleName() + ".deleteTestDataInDatabase()");
+	void deleteTestDataFromDatabase() {
+		afterEachMethod(getClass().getSimpleName() + ".deleteTestDataFromDatabase()");
 	}
 
 	@AfterAll
 	static void afterAll() {
-		beforeAllMethod(DatabaseTestsDemo.class.getSimpleName() + ".beforeAll()");
+		beforeAllMethod(DatabaseTestsDemo.class.getSimpleName() + ".afterAll()");
 	}
 
 }