root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch '2.1.x' into 2.2.x 

Closes gh-19358
This commit is contained in:
Stephane Nicoll 2019-12-12 16:50:27 +01:00
parent 9136f54a5c bf397412e6
commit 01753ab5a0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/src/test/java/smoketest/test/SampleTestApplicationWebIntegrationTests.java
View File

@ -28,13 +28,16 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.http.HttpStatus;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
/** /**
* {@code @SpringBootTest} with a random port for {@link SampleTestApplication}. * {@code @SpringBootTest} with a random port for {@link SampleTestApplication}.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Jorge Cordoba
*/ */
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@AutoConfigureTestDatabase @AutoConfigureTestDatabase
@ -55,7 +58,8 @@ class SampleTestApplicationWebIntegrationTests {
@Test @Test
void test() { void test() {
this.restTemplate.getForEntity("/{username}/vehicle", String.class, "sframework"); assertThat(this.restTemplate.getForEntity("/{username}/vehicle", String.class, "sframework").getStatusCode())
.isEqualTo(HttpStatus.OK);
} }
} }