Polish ch 4 tests

Author: gregturn

4/part1/src/main/java/com/greglturnquist/learningspringboot/InitDatabase.java

@@ -16,36 +16,32 @@
 package com.greglturnquist.learningspringboot;
 
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Bean;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.stereotype.Component;
 
 /**
  * @author Greg Turnquist
  */
 @Component
-public class InitDatabase implements CommandLineRunner {
+public class InitDatabase {
+	@Bean
+	CommandLineRunner init(MongoOperations operations) {
+		return args -> {
+			// tag::log[]
+			operations.dropCollection(Image.class);
 
-	private final MongoOperations operations;
+			operations.insert(new Image("1",
+				"learning-spring-boot-cover.jpg"));
+			operations.insert(new Image("2",
+				"learning-spring-boot-2nd-edition-cover.jpg"));
+			operations.insert(new Image("3",
+				"bazinga.png"));
 
-	public InitDatabase(MongoOperations operations) {
-		this.operations = operations;
+			operations.findAll(Image.class).forEach(image -> {
+				System.out.println(image.toString());
+			});
+			// end::log[]
+		};
 	}
-
-	@Override
-	public void run(String... args) throws Exception {
-		// tag::log[]
-		operations.dropCollection(Image.class);
-
-		operations.insert(new Image("1",
-			"learning-spring-boot-cover.jpg"));
-		operations.insert(new Image("2",
-			"learning-spring-boot-2nd-edition-cover.jpg"));
-		operations.insert(new Image("3",
-			"bazinga.png"));
-
-		operations.findAll(Image.class).forEach(image -> {
-			System.out.println(image.toString());
-		});
-		// end::log[]
-	}
-}
+}

4/part1/src/test/java/com/greglturnquist/learningspringboot/EmbeddedImageRepositoryTests.java

@@ -48,11 +48,11 @@ public class EmbeddedImageRepositoryTests {
 
 	// tag::2[]
 	/**
-	 * To avoid {@code block()} calls, use blocking {@link MongoOperations} during setup.
+	 * To avoid {@code block()} calls, use blocking
+	 * {@link MongoOperations} during setup.
 	 */
 	@Before
 	public void setUp() {
-
 		operations.dropCollection(Image.class);
 
 		operations.insert(new Image("1",
@@ -103,12 +103,4 @@ public void findByNameShouldWork() {
 			});
 	}
 	// end::4[]
-
-	// tag::5[]
-	@Test
-	public void findAllShouldWork2() {
-		// TODO: Remove
-	}
-	// end::5[]
-
 }

4/part1/src/test/java/com/greglturnquist/learningspringboot/EndToEndTests.java

@@ -20,7 +20,9 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -57,11 +59,15 @@ public class EndToEndTests {
 
 	// tag::3[]
 	@BeforeClass
-	public static void setUp() throws MalformedURLException {
+	public static void setUp() throws IOException {
 		System.setProperty("webdriver.chrome.driver",
 			"ext/chromedriver");
 		service = createDefaultService();
 		driver = new ChromeDriver(service);
+		Path testResults = Paths.get("build", "test-results");
+		if (!Files.exists(testResults)) {
+			Files.createDirectory(testResults);
+		}
 	}
 
 	@AfterClass

4/part1/src/test/java/com/greglturnquist/learningspringboot/HomeControllerTests.java

@@ -20,7 +20,6 @@
 
 import java.io.IOException;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Flux;
@@ -122,7 +121,6 @@ public void fetchingNullImageShouldFail() throws IOException {
 
 	// tag::5[]
 	@Test
-	@Ignore // TODO: Reenable test case
 	public void deleteImageShouldWork() {
 		Image alphaImage = new Image("1", "alpha.png");
 		given(imageService.deleteImage(any())).willReturn(Mono.empty());

4/part1/src/test/java/com/greglturnquist/learningspringboot/ImageServiceTests.java

@@ -59,6 +59,9 @@ public class ImageServiceTests {
 	@MockBean
 	InitDatabase initDatabase;
 
+	@MockBean(name = "setUp")
+	Object ignoreImageServiceCommandLineRunner;
+
 	@Before
 	public void setUp() throws IOException {
 		FileSystemUtils.deleteRecursively(new File(ImageService.UPLOAD_ROOT));

4/part1/src/test/java/com/greglturnquist/learningspringboot/LiveImageRepositoryTests.java

@@ -49,7 +49,8 @@ public class LiveImageRepositoryTests {
 	// end::1[]
 
 	/**
-	 * To avoid {@code block()} calls, use blocking {@link MongoOperations} during setup.
+	 * To avoid {@code block()} calls, use blocking
+	 * {@link MongoOperations} during setup.
 	 */
 	@Before
 	public void setUp() {

4/part2/src/main/java/com/greglturnquist/learningspringboot/InitDatabase.java

@@ -16,36 +16,32 @@
 package com.greglturnquist.learningspringboot;
 
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Bean;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.stereotype.Component;
 
 /**
  * @author Greg Turnquist
  */
 @Component
-public class InitDatabase implements CommandLineRunner {
+public class InitDatabase {
+	@Bean
+	CommandLineRunner init(MongoOperations operations) {
+		return args -> {
+			// tag::log[]
+			operations.dropCollection(Image.class);
 
-	private final MongoOperations operations;
+			operations.insert(new Image("1",
+				"learning-spring-boot-cover.jpg"));
+			operations.insert(new Image("2",
+				"learning-spring-boot-2nd-edition-cover.jpg"));
+			operations.insert(new Image("3",
+				"bazinga.png"));
 
-	public InitDatabase(MongoOperations operations) {
-		this.operations = operations;
+			operations.findAll(Image.class).forEach(image -> {
+				System.out.println(image.toString());
+			});
+			// end::log[]
+		};
 	}
-
-	@Override
-	public void run(String... args) throws Exception {
-		// tag::log[]
-		operations.dropCollection(Image.class);
-
-		operations.insert(new Image("1",
-			"learning-spring-boot-cover.jpg"));
-		operations.insert(new Image("2",
-			"learning-spring-boot-2nd-edition-cover.jpg"));
-		operations.insert(new Image("3",
-			"bazinga.png"));
-
-		operations.findAll(Image.class).forEach(image -> {
-			System.out.println(image.toString());
-		});
-		// end::log[]
-	}
-}
+}

4/part2/src/test/java/com/greglturnquist/learningspringboot/HomeControllerTests.java

@@ -20,7 +20,6 @@
 
 import java.io.IOException;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Flux;
@@ -122,7 +121,6 @@ public void fetchingNullImageShouldFail() throws IOException {
 
 	// tag::5[]
 	@Test
-	@Ignore // TODO: Reenable test case
 	public void deleteImageShouldWork() {
 		given(imageService.deleteImage(any())).willReturn(Mono.empty());
 

4/part2/src/test/java/com/greglturnquist/learningspringboot/ImageServiceTests.java

@@ -57,6 +57,9 @@ public class ImageServiceTests {
 	@MockBean
 	InitDatabase initDatabase;
 
+	@MockBean(name = "setUp")
+	Object ignoreImageServiceCommandLineRunner;
+
 	@Before
 	public void setUp() throws IOException {
 		FileSystemUtils.deleteRecursively(new File(ImageService.UPLOAD_ROOT));