Move project up one level

This commit is contained in:
Alex Theedom 2016-08-08 20:57:23 +01:00
parent 8251c25b6a
commit d273566d4a
14 changed files with 11 additions and 23 deletions

View File

@ -1,30 +1,17 @@
package org.baeldung.web.service; package org.baeldung.web.service;
import static io.restassured.RestAssured.given;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsCollectionContaining.hasItems;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.springframework.http.MediaType.APPLICATION_JSON;
import static org.springframework.util.Assert.isTrue;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.baeldung.web.main.Application; import org.baeldung.web.main.Application;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.boot.test.TestRestTemplate;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.context.web.WebAppConfiguration;
import io.restassured.RestAssured; import static io.restassured.RestAssured.given;
import io.restassured.response.Response; import static org.hamcrest.core.IsCollectionContaining.hasItems;
import org.springframework.web.client.RestTemplate; import static org.hamcrest.core.IsEqual.equalTo;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@SpringApplicationConfiguration(classes = Application.class) @SpringApplicationConfiguration(classes = Application.class)
@ -32,7 +19,7 @@ import org.springframework.web.client.RestTemplate;
@IntegrationTest("server.port:8888") @IntegrationTest("server.port:8888")
public class StudentServiceTest { public class StudentServiceTest {
private static final String ENDPOINT = "http://localhost:8080/StudentDirectory/student/get"; private static final String ENDPOINT = "http://localhost:8888/StudentDirectory/student/get";
@Test @Test
public void givenRequestForStudents_whenPageIsOne_expectContainsNames() { public void givenRequestForStudents_whenPageIsOne_expectContainsNames() {
@ -76,6 +63,13 @@ public class StudentServiceTest {
.statusCode(500); .statusCode(500);
} }
@Test
public void givenRequestForStudents_whenPageIsFive_expectFiveItems() {
given().params("page", "1", "size", "5").get(ENDPOINT)
.then()
.body("content.studentId.max()", equalTo("5"));
}
@Test @Test
public void givenResourcesExist_whenFirstPageIsRetrieved_thenPageContainsResources() { public void givenResourcesExist_whenFirstPageIsRetrieved_thenPageContainsResources() {
given().params("page", "1", "size", "2").get(ENDPOINT) given().params("page", "1", "size", "2").get(ENDPOINT)
@ -83,10 +77,4 @@ public class StudentServiceTest {
.assertThat().body("first", equalTo(true)); .assertThat().body("first", equalTo(true));
} }
@Test
public void givenRequestForStudents_whenPageIsFive_expectFiveItems() {
given().params("page", "1", "size", "5").get(ENDPOINT)
.then()
.body("content.studentId.max()", equalTo("5"));
}
} }