[ch07] Separated configuration class into 'operation' and 'test'.

src/test/java/test/TestApplicationContext.java → src/main/java/com/AppContext.java

@@ -1,4 +1,4 @@
-package test;
+package com;
 
 import javax.sql.DataSource;
 
@@ -17,11 +17,7 @@
 
 import com.mysql.jdbc.Driver;
 
-import ch01.springbook.user.UserService;
-import ch01.springbook.user.UserServiceTest;
 import ch01.springbook.user.dao.UserDao;
-import ch06.springbook.factorybean.Message;
-import ch06.springbook.factorybean.MessageFactoryBean;
 import ch07.springbook.sql.OxmSqlService;
 import ch07.springbook.sql.SqlService;
 import ch07.springbook.sql.registry.EmbeddedDbSqlRegistry;
@@ -30,7 +26,7 @@
 @Configuration
 @EnableTransactionManagement
 @ComponentScan(basePackages = "ch01")
-public class TestApplicationContext {
+public class AppContext {
 
 	@Autowired
 	private UserDao userDao;
@@ -53,13 +49,6 @@ public PlatformTransactionManager transactionManager() {
 		return transactionManager;
 	}
 
-	@Bean
-	public UserService testUserService() {
-		UserServiceTest.TestUserService testUserService = new UserServiceTest.TestUserService();
-		testUserService.setUserDao(userDao);
-		return testUserService;
-	}
-
 	@Bean
 	public SqlService sqlService() {
 		OxmSqlService oxmSqlService = new OxmSqlService();
@@ -88,12 +77,4 @@ public DataSource embeddedDatabase() {
 											.addScript("classpath:sql/embedded/schema.sql")
 											.build();
 	}
-
-	@Bean
-	public Message message() throws Exception {
-		MessageFactoryBean messageFactoryBean = new MessageFactoryBean();
-		messageFactoryBean.setText("Factory Bean");
-
-		return messageFactoryBean.getObject();
-	}
 }

src/test/java/ch01/springbook/user/UserDaoTest.java

@@ -17,13 +17,15 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import com.AppContext;
+
 import ch01.springbook.user.dao.UserDao;
 import ch01.springbook.user.domain.Level;
 import ch01.springbook.user.domain.User;
-import test.TestApplicationContext;
+import test.TestAppContext;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = TestApplicationContext.class)
+@ContextConfiguration(classes = {AppContext.class, TestAppContext.class})
 public class UserDaoTest {
 
 	@Autowired

src/test/java/ch01/springbook/user/UserServiceTest.java

@@ -11,6 +11,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.AppContext;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,10 +26,10 @@
 import ch01.springbook.user.dao.UserDao;
 import ch01.springbook.user.domain.Level;
 import ch01.springbook.user.domain.User;
-import test.TestApplicationContext;
+import test.TestAppContext;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = TestApplicationContext.class)
+@ContextConfiguration(classes = {AppContext.class, TestAppContext.class})
 public class UserServiceTest {
 
 	static class TestUserServiceException extends RuntimeException {

src/test/java/ch06/springbook/factorybean/FactoryBeanTest.java

@@ -3,19 +3,19 @@
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 
-import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import test.TestApplicationContext;
+import com.AppContext;
+
+import test.TestAppContext;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = TestApplicationContext.class)
+@ContextConfiguration(classes = {AppContext.class, TestAppContext.class})
 public class FactoryBeanTest {
 
 	@Autowired

src/test/java/test/TestAppContext.java

@@ -0,0 +1,30 @@
+package test;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import ch01.springbook.user.UserService;
+import ch01.springbook.user.UserServiceTest;
+import ch06.springbook.factorybean.Message;
+import ch06.springbook.factorybean.MessageFactoryBean;
+
+@Configuration
+@EnableTransactionManagement
+@ComponentScan(basePackages = "ch01")
+public class TestAppContext {
+
+	@Bean
+	public UserService testUserService() {
+		return new UserServiceTest.TestUserService();
+	}
+
+	@Bean
+	public Message message() throws Exception {
+		MessageFactoryBean messageFactoryBean = new MessageFactoryBean();
+		messageFactoryBean.setText("Factory Bean");
+
+		return messageFactoryBean.getObject();
+	}
+}