Skip to content

Commit 3dc9b12

Browse files
committed
Merge branch '1.4.x' into 1.5.x
2 parents 293ba6d + 703a6dc commit 3dc9b12

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -29,13 +29,10 @@
2929

3030
import org.junit.After;
3131
import org.junit.Test;
32-
import org.junit.runner.RunWith;
3332

3433
import org.springframework.boot.SpringApplication;
3534
import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
3635
import org.springframework.boot.autoconfigure.web.BasicErrorControllerMockMvcTests.MinimalWebConfiguration;
37-
import org.springframework.boot.test.context.SpringBootTest;
38-
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3936
import org.springframework.boot.test.web.client.TestRestTemplate;
4037
import org.springframework.context.ConfigurableApplicationContext;
4138
import org.springframework.context.annotation.Bean;
@@ -45,8 +42,6 @@
4542
import org.springframework.http.MediaType;
4643
import org.springframework.http.RequestEntity;
4744
import org.springframework.http.ResponseEntity;
48-
import org.springframework.test.annotation.DirtiesContext;
49-
import org.springframework.test.context.junit4.SpringRunner;
5045
import org.springframework.validation.BindException;
5146
import org.springframework.web.bind.MethodArgumentNotValidException;
5247
import org.springframework.web.bind.annotation.PostMapping;
@@ -66,9 +61,6 @@
6661
* @author Dave Syer
6762
* @author Stephane Nicoll
6863
*/
69-
@RunWith(SpringRunner.class)
70-
@DirtiesContext
71-
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
7264
public class BasicErrorControllerIntegrationTests {
7365

7466
private ConfigurableApplicationContext context;

0 commit comments

Comments
 (0)