Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate away from @SpringApplicationConfiguration

Browse Source 
Refactor internal tests to no longer use @SpringApplicationConfiguration

See gh-5562
This commit is contained in:
Phillip Webb
2016-04-04 19:58:07 -07:00
parent adb42ed966
commit 4d404b214c
70 changed files with 181 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java
View File

@@ -25,11 +25,10 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringApplicationTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
@@ -46,8 +45,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
* @author Dave Syer
*/
@RunWith(SpringRunner.class)
@SpringApplicationConfiguration(SampleDataJpaApplication.class)
@WebAppConfiguration
@SpringApplicationTest
// Enable JMX so we can test the MBeans (you can't do this in a properties file)
@TestPropertySource(properties = { "spring.jmx.enabled:true",
"spring.datasource.jmx-enabled:true" })

5
spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java
View File

@@ -17,11 +17,10 @@ package sample.data.jpa.service;
import org.junit.Test;
import org.junit.runner.RunWith;
import sample.data.jpa.SampleDataJpaApplication;
import sample.data.jpa.domain.City;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringApplicationTest;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.test.context.junit4.SpringRunner;
@@ -34,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Oliver Gierke
*/
@RunWith(SpringRunner.class)
@SpringApplicationConfiguration(SampleDataJpaApplication.class)
@SpringApplicationTest
public class CityRepositoryIntegrationTests {
@Autowired

5
spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java
View File

@@ -19,7 +19,6 @@ import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
import sample.data.jpa.SampleDataJpaApplication;
import sample.data.jpa.domain.City;
import sample.data.jpa.domain.Hotel;
import sample.data.jpa.domain.HotelSummary;
@@ -27,7 +26,7 @@ import sample.data.jpa.domain.Rating;
import sample.data.jpa.domain.RatingCount;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringApplicationConfiguration;
import org.springframework.boot.test.context.SpringApplicationTest;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort.Direction;
@@ -41,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Oliver Gierke
*/
@RunWith(SpringRunner.class)
@SpringApplicationConfiguration(SampleDataJpaApplication.class)
@SpringApplicationTest
public class HotelRepositoryIntegrationTests {
@Autowired