solving issue #64 - https://github.com/vmware-tanzu-learning/core-spr…

…ing-course/issues/64

lab/01-rewards-db/src/main/java/config/AppConfig.java

@@ -1,19 +1,18 @@
 package config;
 
-import javax.sql.DataSource;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import accounts.AccountManager;
 import accounts.internal.JpaAccountManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import rewards.internal.account.AccountRepository;
 import rewards.internal.account.JpaAccountRepository;
 import rewards.internal.restaurant.JpaRestaurantRepository;
 import rewards.internal.restaurant.RestaurantRepository;
 import rewards.internal.reward.JdbcRewardRepository;
 import rewards.internal.reward.RewardRepository;
 
+import javax.sql.DataSource;
+
 /**
  * Rewards application configuration - services and repositories.
  * <p>

lab/40-boot-test-solution/src/main/java/accounts/BootTestSolutionApplication.java

@@ -1,18 +1,15 @@
 package accounts;
 
+import config.AppConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Import;
 
-import config.AppConfig;
-
 /**
  * Runs the Account Server.
  */
 @SpringBootApplication
 @Import(AppConfig.class)
-@EntityScan("rewards.internal")
 public class BootTestSolutionApplication {
 
 	public static void main(String[] args) {

lab/40-boot-test-solution/src/test/java/accounts/web/AccountControllerBootTests.java

@@ -5,18 +5,21 @@
 import common.money.Percentage;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.AutoConfigureDataJpa;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.mock.mockito.MockBeans;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import rewards.internal.account.Account;
 
+import javax.persistence.EntityManagerFactory;
+import javax.sql.DataSource;
 import java.util.Arrays;
 import java.util.List;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.BDDMockito.*;
+import static org.mockito.BDDMockito.anyLong;
+import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.verify;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
@@ -26,8 +29,8 @@
  * These tests run the AccountController using the MockMVC framework.
  * The server does not need to be running.
  */
-@WebMvcTest(AccountController.class)
-@AutoConfigureDataJpa
+@WebMvcTest(AccountController.class) // WebMvcTest = MockMvc, @MockBean // JPA: @MockBeans
+@MockBeans({@MockBean(EntityManagerFactory.class), @MockBean(DataSource.class)})
 public class AccountControllerBootTests {
 
     @Autowired

lab/40-boot-test/src/test/java/accounts/web/AccountControllerBootTests.java

@@ -15,7 +15,7 @@
 
 // TODO-07: Replace @ExtendWith(SpringExtension.class) with the following two annotations
 // - @WebMvcTest(AccountController.class) // includes @ExtendWith(SpringExtension.class)
-// - @AutoConfigureDataJpa
+// - @MockBeans({@MockBean(EntityManagerFactory.class), @MockBean(DataSource.class)})
 @ExtendWith(SpringExtension.class)
 public class AccountControllerBootTests {