Fix type and ordering of examples.

Author: michael-simons

examples/testing-with-neo4j-harness/README.adoc

@@ -77,15 +77,15 @@ To use Neo4j 4.0 as in the following examples, please add this to your build fil
 Be aware that the type of the 4.0 test harness is `org.neo4j.harness.Neo4j`.
 The following examples use 4.0 (`org.neo4j.harness.Neo4j`) but are applicable to `ServerControlls`, too.
 
-=== Starting up the Neo4j harness and making Spring aware
+=== Starting up the Neo4j harness and making Spring aware of it
 
 There many different options.
 The main question is always: *How to make Spring Boot aware that it should use different configuration properties?*
 
 [[option1]]
 ==== Option 1: Add the embedded server as a Spring bean (recommended approach)
 
-This is shown have this as `MoviesServiceAlt2Test`.
+The recommended approach is shown in `MoviesServiceAlt1Test`:
 
 [source,java]
 [[simple-example]]

examples/testing-with-neo4j-harness/src/test/java/org/neo4j/doc/driver/springframework/boot/simple/MoviesServiceAlt2Test.java

@@ -20,64 +20,32 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.neo4j.driver.springframework.boot.test.autoconfigure.Neo4jTestHarnessAutoConfiguration;
 import org.neo4j.harness.Neo4j;
-import org.neo4j.harness.Neo4jBuilders;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
 
 /**
- * This variant uses a custom {@link ApplicationContextInitializer} that modifies Springs configuration properties
- * with the help of {@link TestPropertyValues}. Thus, the autoconfiguration of the driver is kept and all other things
- * are as you'd expect in production.
- * <p>If you don't like that setup, look at {@link MoviesServiceAlt1Test}. Here, we expose the embedded server as a Spring Bean
- * and don't do the manual connection setting.
+ * Example on how one could use the automatically provided test harness instance.
+ *
+ * @author Michael J. Simons
  */
 @SpringBootTest
-@EnableAutoConfiguration(exclude = { Neo4jTestHarnessAutoConfiguration.class })
-@ContextConfiguration(initializers = { MoviesServiceAlt2Test.Initializer.class })
-class MoviesServiceAlt2Test {
-
-	private static Neo4j embeddedDatabaseServer;
-
-	@BeforeAll
-	static void initializeNeo4j() {
-
-		embeddedDatabaseServer = Neo4jBuilders.newInProcessBuilder()
-			.withDisabledServer() // No need for http
-			.withFixture(""
-				+ "CREATE (TheMatrix:Movie {title:'The Matrix', released:1999, tagline:'Welcome to the Real World'})\n"
-				+ "CREATE (TheMatrixReloaded:Movie {title:'The Matrix Reloaded', released:2003, tagline:'Free your mind'})\n"
-				+ "CREATE (TheMatrixRevolutions:Movie {title:'The Matrix Revolutions', released:2003, tagline:'Everything that has a beginning has an end'})\n"
-			)
-			.build();
-	}
-
-	@AfterAll
-	static void closeNeo4j() {
-		embeddedDatabaseServer.close();
-	}
-
-	static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-		public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
-			TestPropertyValues.of(
-				"org.neo4j.driver.uri=" + embeddedDatabaseServer.boltURI().toString(),
-				"org.neo4j.driver.authentication.password="
-			).applyTo(configurableApplicationContext.getEnvironment());
-		}
-	}
+public class MoviesServiceAlt2Test {
 
 	@Autowired
 	private MoviesService moviesService;
 
+	@BeforeEach
+	void prepareDatabase(@Autowired Neo4j neo4j) {
+		neo4j.defaultDatabaseService().executeTransactionally(""
+			+ "CREATE (TheMatrix:Movie {title:'The Matrix', released:1999, tagline:'Welcome to the Real World'})\n"
+			+ "CREATE (TheMatrixReloaded:Movie {title:'The Matrix Reloaded', released:2003, tagline:'Free your mind'})\n"
+			+ "CREATE (TheMatrixRevolutions:Movie {title:'The Matrix Revolutions', released:2003, tagline:'Everything that has a beginning has an end'})\n"
+		);
+	}
+
 	@Test
 	void shouldRetrieveMovieTitles() {
 

examples/testing-with-neo4j-harness/src/test/java/org/neo4j/doc/driver/springframework/boot/simple/MoviesServiceAlt3Test.java

@@ -20,32 +20,64 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.neo4j.driver.springframework.boot.test.autoconfigure.Neo4jTestHarnessAutoConfiguration;
 import org.neo4j.harness.Neo4j;
+import org.neo4j.harness.Neo4jBuilders;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
 
 /**
- * Example on how one could use the automatically provided test harness instance.
- *
- * @author Michael J. Simons
+ * This variant uses a custom {@link ApplicationContextInitializer} that modifies Springs configuration properties
+ * with the help of {@link TestPropertyValues}. Thus, the autoconfiguration of the driver is kept and all other things
+ * are as you'd expect in production.
+ * <p>If you don't like that setup, look at {@link MoviesServiceAlt1Test}. Here, we expose the embedded server as a Spring Bean
+ * and don't do the manual connection setting.
  */
 @SpringBootTest
-public class MoviesServiceAlt3Test {
+@EnableAutoConfiguration(exclude = { Neo4jTestHarnessAutoConfiguration.class })
+@ContextConfiguration(initializers = { MoviesServiceAlt3Test.Initializer.class })
+class MoviesServiceAlt3Test {
 
-	@Autowired
-	private MoviesService moviesService;
+	private static Neo4j embeddedDatabaseServer;
+
+	@BeforeAll
+	static void initializeNeo4j() {
+
+		embeddedDatabaseServer = Neo4jBuilders.newInProcessBuilder()
+			.withDisabledServer() // No need for http
+			.withFixture(""
+				+ "CREATE (TheMatrix:Movie {title:'The Matrix', released:1999, tagline:'Welcome to the Real World'})\n"
+				+ "CREATE (TheMatrixReloaded:Movie {title:'The Matrix Reloaded', released:2003, tagline:'Free your mind'})\n"
+				+ "CREATE (TheMatrixRevolutions:Movie {title:'The Matrix Revolutions', released:2003, tagline:'Everything that has a beginning has an end'})\n"
+			)
+			.build();
+	}
 
-	@BeforeEach
-	void prepareDatabase(@Autowired Neo4j neo4j) {
-		neo4j.defaultDatabaseService().executeTransactionally(""
-			+ "CREATE (TheMatrix:Movie {title:'The Matrix', released:1999, tagline:'Welcome to the Real World'})\n"
-			+ "CREATE (TheMatrixReloaded:Movie {title:'The Matrix Reloaded', released:2003, tagline:'Free your mind'})\n"
-			+ "CREATE (TheMatrixRevolutions:Movie {title:'The Matrix Revolutions', released:2003, tagline:'Everything that has a beginning has an end'})\n"
-		);
+	@AfterAll
+	static void closeNeo4j() {
+		embeddedDatabaseServer.close();
 	}
 
+	static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+		public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
+			TestPropertyValues.of(
+				"org.neo4j.driver.uri=" + embeddedDatabaseServer.boltURI().toString(),
+				"org.neo4j.driver.authentication.password="
+			).applyTo(configurableApplicationContext.getEnvironment());
+		}
+	}
+
+	@Autowired
+	private MoviesService moviesService;
+
 	@Test
 	void shouldRetrieveMovieTitles() {