TSK-1594: inlined RestHelper#defaultRequest
This commit is contained in:
parent
a8d8c15e59
commit
47821aae2e
|
@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.core.env.Environment;
|
import org.springframework.core.env.Environment;
|
||||||
import org.springframework.hateoas.MediaTypes;
|
import org.springframework.hateoas.MediaTypes;
|
||||||
import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
|
import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
|
||||||
import org.springframework.http.HttpEntity;
|
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
|
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
@ -55,10 +54,6 @@ public class RestHelper {
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public HttpEntity<String> defaultRequest() {
|
|
||||||
return new HttpEntity<>(getHeadersTeamlead_1());
|
|
||||||
}
|
|
||||||
|
|
||||||
public HttpHeaders getHeadersTeamlead_1() {
|
public HttpHeaders getHeadersTeamlead_1() {
|
||||||
HttpHeaders headers = new HttpHeaders();
|
HttpHeaders headers = new HttpHeaders();
|
||||||
headers.add("Authorization", AUTHORIZATION_TEAMLEAD_1);
|
headers.add("Authorization", AUTHORIZATION_TEAMLEAD_1);
|
||||||
|
|
|
@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.core.ParameterizedTypeReference;
|
import org.springframework.core.ParameterizedTypeReference;
|
||||||
import org.springframework.hateoas.IanaLinkRelations;
|
import org.springframework.hateoas.IanaLinkRelations;
|
||||||
import org.springframework.hateoas.Link;
|
import org.springframework.hateoas.Link;
|
||||||
|
import org.springframework.http.HttpEntity;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
@ -54,7 +55,7 @@ class TaskHistoryEventControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS),
|
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getContent()).hasSize(45);
|
assertThat(response.getBody().getContent()).hasSize(45);
|
||||||
|
@ -66,7 +67,7 @@ class TaskHistoryEventControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS),
|
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF))
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF))
|
||||||
|
@ -84,7 +85,7 @@ class TaskHistoryEventControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
|
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF))
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF))
|
||||||
|
@ -102,7 +103,7 @@ class TaskHistoryEventControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
|
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getContent())
|
assertThat(response.getBody().getContent())
|
||||||
|
@ -117,7 +118,7 @@ class TaskHistoryEventControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
|
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getContent())
|
assertThat(response.getBody().getContent())
|
||||||
|
@ -135,7 +136,7 @@ class TaskHistoryEventControllerIntTest {
|
||||||
restHelper.toUrl(
|
restHelper.toUrl(
|
||||||
HistoryRestEndpoints.URL_HISTORY_EVENTS + "?created=" + currentTime),
|
HistoryRestEndpoints.URL_HISTORY_EVENTS + "?created=" + currentTime),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
.isInstanceOf(HttpClientErrorException.class)
|
.isInstanceOf(HttpClientErrorException.class)
|
||||||
|
@ -152,7 +153,7 @@ class TaskHistoryEventControllerIntTest {
|
||||||
restHelper.toUrl(
|
restHelper.toUrl(
|
||||||
HistoryRestEndpoints.URL_HISTORY_EVENTS + "?created=" + now + "&created="),
|
HistoryRestEndpoints.URL_HISTORY_EVENTS + "?created=" + now + "&created="),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -172,7 +173,7 @@ class TaskHistoryEventControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
|
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
|
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
|
@ -227,7 +228,7 @@ class TaskHistoryEventControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS_ID, id),
|
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS_ID, id),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF))
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF))
|
||||||
|
@ -246,7 +247,7 @@ class TaskHistoryEventControllerIntTest {
|
||||||
HistoryRestEndpoints.URL_HISTORY_EVENTS_ID,
|
HistoryRestEndpoints.URL_HISTORY_EVENTS_ID,
|
||||||
"THI:000000000000000000000000000000000000"),
|
"THI:000000000000000000000000000000000000"),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_HISTORY_EVENT_REPRESENTATION_MODEL_TYPE);
|
TASK_HISTORY_EVENT_REPRESENTATION_MODEL_TYPE);
|
||||||
|
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
|
@ -265,7 +266,7 @@ class TaskHistoryEventControllerIntTest {
|
||||||
+ "&anotherIllegalParam=stillIllegal"
|
+ "&anotherIllegalParam=stillIllegal"
|
||||||
+ "&sort-by=TASK_ID&order=DESCENDING&page-size=5&page=2",
|
+ "&sort-by=TASK_ID&order=DESCENDING&page-size=5&page=2",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
|
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class AbstractAccTest {
|
||||||
return RestHelper.TEMPLATE.exchange(
|
return RestHelper.TEMPLATE.exchange(
|
||||||
restHelper.toUrl("/taskana" + HistoryRestEndpoints.URL_HISTORY_EVENTS),
|
restHelper.toUrl("/taskana" + HistoryRestEndpoints.URL_HISTORY_EVENTS),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(TaskHistoryEventPagedRepresentationModel.class));
|
ParameterizedTypeReference.forType(TaskHistoryEventPagedRepresentationModel.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@ import org.junit.runner.RunWith;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.core.ParameterizedTypeReference;
|
import org.springframework.core.ParameterizedTypeReference;
|
||||||
|
import org.springframework.http.HttpEntity;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
@ -72,7 +73,7 @@ public class TaskanaWildflyTest extends AbstractAccTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl("/taskana" + RestEndpoints.URL_CURRENT_USER),
|
restHelper.toUrl("/taskana" + RestEndpoints.URL_CURRENT_USER),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(TaskanaUserInfoRepresentationModel.class));
|
ParameterizedTypeReference.forType(TaskanaUserInfoRepresentationModel.class));
|
||||||
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
|
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
|
||||||
TaskanaUserInfoRepresentationModel currentUser = response.getBody();
|
TaskanaUserInfoRepresentationModel currentUser = response.getBody();
|
||||||
|
@ -89,7 +90,7 @@ public class TaskanaWildflyTest extends AbstractAccTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl("/taskana" + RestEndpoints.URL_ACCESS_ID + "?search-for=rig"),
|
restHelper.toUrl("/taskana" + RestEndpoints.URL_ACCESS_ID + "?search-for=rig"),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
|
||||||
new ParameterizedTypeReference<List<AccessIdRepresentationModel>>() {});
|
new ParameterizedTypeReference<List<AccessIdRepresentationModel>>() {});
|
||||||
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
|
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
|
||||||
assertThat(response.getBody()).hasSize(2);
|
assertThat(response.getBody()).hasSize(2);
|
||||||
|
@ -104,7 +105,7 @@ public class TaskanaWildflyTest extends AbstractAccTest {
|
||||||
"/taskana" + RestEndpoints.URL_TASKS_ID,
|
"/taskana" + RestEndpoints.URL_TASKS_ID,
|
||||||
"TKI:000000000000000000000000000000000001"),
|
"TKI:000000000000000000000000000000000001"),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(TaskRepresentationModel.class));
|
ParameterizedTypeReference.forType(TaskRepresentationModel.class));
|
||||||
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
|
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
|
|
|
@ -51,7 +51,7 @@ class ClassificationControllerIntTest {
|
||||||
restHelper.toUrl(
|
restHelper.toUrl(
|
||||||
RestEndpoints.URL_CLASSIFICATIONS_ID, "CLI:100000000000000000000000000000000002"),
|
RestEndpoints.URL_CLASSIFICATIONS_ID, "CLI:100000000000000000000000000000000002"),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
CLASSIFICATION_REPRESENTATION_MODEL_TYPE);
|
CLASSIFICATION_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -64,7 +64,7 @@ class ClassificationControllerIntTest {
|
||||||
template.exchange(
|
template.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS),
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -77,7 +77,7 @@ class ClassificationControllerIntTest {
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS)
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS)
|
||||||
+ "?domain=DOMAIN_A&custom-1-like=RVNR",
|
+ "?domain=DOMAIN_A&custom-1-like=RVNR",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
|
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
|
@ -92,7 +92,7 @@ class ClassificationControllerIntTest {
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS)
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS)
|
||||||
+ "?domain=DOMAIN_A&sort-by=KEY&order=ASCENDING",
|
+ "?domain=DOMAIN_A&sort-by=KEY&order=ASCENDING",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -109,7 +109,7 @@ class ClassificationControllerIntTest {
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS)
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS)
|
||||||
+ "?domain=DOMAIN_A&sort-by=KEY&order=ASCENDING&page-size=5&page=2",
|
+ "?domain=DOMAIN_A&sort-by=KEY&order=ASCENDING&page-size=5&page=2",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getContent()).hasSize(5);
|
assertThat(response.getBody().getContent()).hasSize(5);
|
||||||
|
@ -242,7 +242,7 @@ class ClassificationControllerIntTest {
|
||||||
template.exchange(
|
template.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS),
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
|
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
|
@ -357,7 +357,7 @@ class ClassificationControllerIntTest {
|
||||||
+ "&anotherIllegalParam=stillIllegal"
|
+ "&anotherIllegalParam=stillIllegal"
|
||||||
+ "&sort-by=NAME&order=DESCENDING&page-size=5&page=2",
|
+ "&sort-by=NAME&order=DESCENDING&page-size=5&page=2",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
|
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
|
|
|
@ -76,7 +76,7 @@ class ClassificationDefinitionControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_DEFINITIONS) + "?domain=DOMAIN_B",
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_DEFINITIONS) + "?domain=DOMAIN_B",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(
|
ParameterizedTypeReference.forType(
|
||||||
ClassificationDefinitionCollectionRepresentationModel.class));
|
ClassificationDefinitionCollectionRepresentationModel.class));
|
||||||
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
|
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
|
||||||
|
@ -98,7 +98,7 @@ class ClassificationDefinitionControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_DEFINITIONS) + "?domain=DOMAIN_B",
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_DEFINITIONS) + "?domain=DOMAIN_B",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(
|
ParameterizedTypeReference.forType(
|
||||||
ClassificationDefinitionCollectionRepresentationModel.class));
|
ClassificationDefinitionCollectionRepresentationModel.class));
|
||||||
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
|
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
|
||||||
|
@ -117,7 +117,7 @@ class ClassificationDefinitionControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_DEFINITIONS) + "?domain=ADdfe",
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_DEFINITIONS) + "?domain=ADdfe",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(
|
ParameterizedTypeReference.forType(
|
||||||
ClassificationDefinitionCollectionRepresentationModel.class));
|
ClassificationDefinitionCollectionRepresentationModel.class));
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
|
|
|
@ -39,7 +39,7 @@ class AccessIdControllerIntTest {
|
||||||
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID)
|
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID)
|
||||||
+ "?search-for=cn=ksc-users,cn=groups,OU=Test,O=TASKANA",
|
+ "?search-for=cn=ksc-users,cn=groups,OU=Test,O=TASKANA",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ACCESS_ID_LIST_TYPE);
|
ACCESS_ID_LIST_TYPE);
|
||||||
assertThat(response.getBody())
|
assertThat(response.getBody())
|
||||||
.isNotNull()
|
.isNotNull()
|
||||||
|
@ -55,7 +55,7 @@ class AccessIdControllerIntTest {
|
||||||
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID)
|
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID)
|
||||||
+ "?search-for=uid=teamlead-1,cn=users,OU=Test,O=TASKANA",
|
+ "?search-for=uid=teamlead-1,cn=users,OU=Test,O=TASKANA",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ACCESS_ID_LIST_TYPE);
|
ACCESS_ID_LIST_TYPE);
|
||||||
assertThat(response.getBody())
|
assertThat(response.getBody())
|
||||||
.isNotNull()
|
.isNotNull()
|
||||||
|
@ -70,7 +70,7 @@ class AccessIdControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=ksc-use",
|
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=ksc-use",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ACCESS_ID_LIST_TYPE);
|
ACCESS_ID_LIST_TYPE);
|
||||||
assertThat(response.getBody())
|
assertThat(response.getBody())
|
||||||
.isNotNull()
|
.isNotNull()
|
||||||
|
@ -85,7 +85,7 @@ class AccessIdControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=ksc-teamleads,cn=groups",
|
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=ksc-teamleads,cn=groups",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ACCESS_ID_LIST_TYPE);
|
ACCESS_ID_LIST_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull().isEmpty();
|
assertThat(response.getBody()).isNotNull().isEmpty();
|
||||||
}
|
}
|
||||||
|
@ -96,7 +96,7 @@ class AccessIdControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=rig",
|
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=rig",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ACCESS_ID_LIST_TYPE);
|
ACCESS_ID_LIST_TYPE);
|
||||||
|
|
||||||
assertThat(response.getBody())
|
assertThat(response.getBody())
|
||||||
|
@ -111,7 +111,7 @@ class AccessIdControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=läf",
|
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=läf",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ACCESS_ID_LIST_TYPE);
|
ACCESS_ID_LIST_TYPE);
|
||||||
|
|
||||||
assertThat(response.getBody())
|
assertThat(response.getBody())
|
||||||
|
@ -127,7 +127,7 @@ class AccessIdControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=al",
|
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=al",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(List.class));
|
ParameterizedTypeReference.forType(List.class));
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
.isInstanceOf(HttpClientErrorException.class)
|
.isInstanceOf(HttpClientErrorException.class)
|
||||||
|
@ -142,7 +142,7 @@ class AccessIdControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID_GROUPS) + "?access-id=teamlead-2",
|
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID_GROUPS) + "?access-id=teamlead-2",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ACCESS_ID_LIST_TYPE);
|
ACCESS_ID_LIST_TYPE);
|
||||||
|
|
||||||
assertThat(response.getBody())
|
assertThat(response.getBody())
|
||||||
|
@ -163,7 +163,7 @@ class AccessIdControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID_GROUPS) + "?access-id=user-2-1",
|
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID_GROUPS) + "?access-id=user-2-1",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ACCESS_ID_LIST_TYPE);
|
ACCESS_ID_LIST_TYPE);
|
||||||
|
|
||||||
assertThat(response.getBody())
|
assertThat(response.getBody())
|
||||||
|
@ -184,7 +184,7 @@ class AccessIdControllerIntTest {
|
||||||
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID_GROUPS)
|
restHelper.toUrl(RestEndpoints.URL_ACCESS_ID_GROUPS)
|
||||||
+ "?access-id=teamlead-2,cn=users",
|
+ "?access-id=teamlead-2,cn=users",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ACCESS_ID_LIST_TYPE);
|
ACCESS_ID_LIST_TYPE);
|
||||||
|
|
||||||
assertThatThrownBy(call)
|
assertThatThrownBy(call)
|
||||||
|
@ -202,7 +202,7 @@ class AccessIdControllerIntTest {
|
||||||
+ "?access-id=cn=Organisationseinheit KSC 1,"
|
+ "?access-id=cn=Organisationseinheit KSC 1,"
|
||||||
+ "cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA",
|
+ "cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ACCESS_ID_LIST_TYPE);
|
ACCESS_ID_LIST_TYPE);
|
||||||
|
|
||||||
assertThat(response.getBody())
|
assertThat(response.getBody())
|
||||||
|
|
|
@ -7,6 +7,7 @@ import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.core.ParameterizedTypeReference;
|
import org.springframework.core.ParameterizedTypeReference;
|
||||||
|
import org.springframework.http.HttpEntity;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
import org.springframework.web.client.HttpClientErrorException;
|
import org.springframework.web.client.HttpClientErrorException;
|
||||||
|
|
||||||
|
@ -32,7 +33,7 @@ class GeneralExceptionHandlingTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS_ID, "non-existing-id"),
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS_ID, "non-existing-id"),
|
||||||
HttpMethod.DELETE,
|
HttpMethod.DELETE,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(
|
ParameterizedTypeReference.forType(
|
||||||
ClassificationSummaryPagedRepresentationModel.class));
|
ClassificationSummaryPagedRepresentationModel.class));
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
|
|
|
@ -6,6 +6,7 @@ import java.util.List;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.core.ParameterizedTypeReference;
|
import org.springframework.core.ParameterizedTypeReference;
|
||||||
|
import org.springframework.http.HttpEntity;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.client.RestTemplate;
|
import org.springframework.web.client.RestTemplate;
|
||||||
|
@ -34,7 +35,7 @@ class TaskanaEngineControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_DOMAIN),
|
restHelper.toUrl(RestEndpoints.URL_DOMAIN),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(List.class));
|
ParameterizedTypeReference.forType(List.class));
|
||||||
assertThat(response.getBody()).contains("DOMAIN_A");
|
assertThat(response.getBody()).contains("DOMAIN_A");
|
||||||
}
|
}
|
||||||
|
@ -45,7 +46,7 @@ class TaskanaEngineControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_TYPES),
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_TYPES),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(List.class));
|
ParameterizedTypeReference.forType(List.class));
|
||||||
assertThat(response.getBody()).containsExactlyInAnyOrder("TASK", "DOCUMENT");
|
assertThat(response.getBody()).containsExactlyInAnyOrder("TASK", "DOCUMENT");
|
||||||
}
|
}
|
||||||
|
@ -56,7 +57,7 @@ class TaskanaEngineControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_CATEGORIES),
|
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_CATEGORIES),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(List.class));
|
ParameterizedTypeReference.forType(List.class));
|
||||||
assertThat(response.getBody())
|
assertThat(response.getBody())
|
||||||
.containsExactlyInAnyOrder("MANUAL", "EXTERNAL", "AUTOMATIC", "PROCESS", "EXTERNAL");
|
.containsExactlyInAnyOrder("MANUAL", "EXTERNAL", "AUTOMATIC", "PROCESS", "EXTERNAL");
|
||||||
|
@ -68,7 +69,7 @@ class TaskanaEngineControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_CURRENT_USER),
|
restHelper.toUrl(RestEndpoints.URL_CURRENT_USER),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(TaskanaUserInfoRepresentationModel.class));
|
ParameterizedTypeReference.forType(TaskanaUserInfoRepresentationModel.class));
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getUserId()).isEqualTo("teamlead-1");
|
assertThat(response.getBody().getUserId()).isEqualTo("teamlead-1");
|
||||||
|
|
|
@ -95,7 +95,7 @@ class TaskControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_TASKS),
|
restHelper.toUrl(RestEndpoints.URL_TASKS),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -109,7 +109,7 @@ class TaskControllerIntTest {
|
||||||
restHelper.toUrl(RestEndpoints.URL_TASKS)
|
restHelper.toUrl(RestEndpoints.URL_TASKS)
|
||||||
+ "?workbasket-id=WBI:100000000000000000000000000000000001",
|
+ "?workbasket-id=WBI:100000000000000000000000000000000001",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -137,7 +137,7 @@ class TaskControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_TASKS) + parameters,
|
restHelper.toUrl(RestEndpoints.URL_TASKS) + parameters,
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -160,7 +160,7 @@ class TaskControllerIntTest {
|
||||||
+ plannedToInstant
|
+ plannedToInstant
|
||||||
+ "&sort-by=PLANNED",
|
+ "&sort-by=PLANNED",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -180,7 +180,7 @@ class TaskControllerIntTest {
|
||||||
+ plannedFromInstant
|
+ plannedFromInstant
|
||||||
+ "&sort-by=PLANNED",
|
+ "&sort-by=PLANNED",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -200,7 +200,7 @@ class TaskControllerIntTest {
|
||||||
+ "&planned-from=2020-01-19T07:44:47.453Z"
|
+ "&planned-from=2020-01-19T07:44:47.453Z"
|
||||||
+ "&sort-by=planned",
|
+ "&sort-by=planned",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
.isInstanceOf(HttpClientErrorException.class)
|
.isInstanceOf(HttpClientErrorException.class)
|
||||||
|
@ -229,7 +229,7 @@ class TaskControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_TASKS) + parameters,
|
restHelper.toUrl(RestEndpoints.URL_TASKS) + parameters,
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -340,7 +340,7 @@ class TaskControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_TASKS) + "?wildcard-search-value=%rt%",
|
restHelper.toUrl(RestEndpoints.URL_TASKS) + "?wildcard-search-value=%rt%",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
.isInstanceOf(HttpClientErrorException.class)
|
.isInstanceOf(HttpClientErrorException.class)
|
||||||
|
@ -354,7 +354,7 @@ class TaskControllerIntTest {
|
||||||
restHelper.toUrl(RestEndpoints.URL_TASKS)
|
restHelper.toUrl(RestEndpoints.URL_TASKS)
|
||||||
+ "?wildcard-search-fields=NAME,CUSTOM_3,CUSTOM_4",
|
+ "?wildcard-search-fields=NAME,CUSTOM_3,CUSTOM_4",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThatThrownBy(httpCall2)
|
assertThatThrownBy(httpCall2)
|
||||||
.isInstanceOf(HttpClientErrorException.class)
|
.isInstanceOf(HttpClientErrorException.class)
|
||||||
|
@ -379,7 +379,7 @@ class TaskControllerIntTest {
|
||||||
+ dueToInstant
|
+ dueToInstant
|
||||||
+ "&sort-by=DUE",
|
+ "&sort-by=DUE",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -399,7 +399,7 @@ class TaskControllerIntTest {
|
||||||
+ dueToInstant
|
+ dueToInstant
|
||||||
+ "&sort-by=DUE",
|
+ "&sort-by=DUE",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -419,7 +419,7 @@ class TaskControllerIntTest {
|
||||||
+ "&due-from=2020-01-19T07:44:47.453Z"
|
+ "&due-from=2020-01-19T07:44:47.453Z"
|
||||||
+ "&sort-by=planned",
|
+ "&sort-by=planned",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
.isInstanceOf(HttpClientErrorException.class)
|
.isInstanceOf(HttpClientErrorException.class)
|
||||||
|
@ -448,7 +448,7 @@ class TaskControllerIntTest {
|
||||||
+ "?external-id=ETI:000000000000000000000000000000000003"
|
+ "?external-id=ETI:000000000000000000000000000000000003"
|
||||||
+ "&external-id=ETI:000000000000000000000000000000000004",
|
+ "&external-id=ETI:000000000000000000000000000000000004",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -491,7 +491,7 @@ class TaskControllerIntTest {
|
||||||
restHelper.toUrl(RestEndpoints.URL_TASKS)
|
restHelper.toUrl(RestEndpoints.URL_TASKS)
|
||||||
+ "?por.type=VNR&por.value=22334455&sort-by=POR_VALUE&order=DESCENDING",
|
+ "?por.type=VNR&por.value=22334455&sort-by=POR_VALUE&order=DESCENDING",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -940,7 +940,7 @@ class TaskControllerIntTest {
|
||||||
+ "&anotherIllegalParam=stillIllegal"
|
+ "&anotherIllegalParam=stillIllegal"
|
||||||
+ "&sort-by=NAME&order=DESCENDING&page-size=5&page=2",
|
+ "&sort-by=NAME&order=DESCENDING&page-size=5&page=2",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
|
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
|
|
|
@ -16,6 +16,7 @@ import org.junit.jupiter.api.function.ThrowingConsumer;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.core.ParameterizedTypeReference;
|
import org.springframework.core.ParameterizedTypeReference;
|
||||||
import org.springframework.hateoas.IanaLinkRelations;
|
import org.springframework.hateoas.IanaLinkRelations;
|
||||||
|
import org.springframework.http.HttpEntity;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
@ -48,7 +49,7 @@ class WorkbasketAccessItemControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS),
|
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
|
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -62,7 +63,7 @@ class WorkbasketAccessItemControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
|
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
|
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -83,7 +84,7 @@ class WorkbasketAccessItemControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
|
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
|
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getContent()).hasSize(1);
|
assertThat(response.getBody().getContent()).hasSize(1);
|
||||||
|
@ -113,7 +114,7 @@ class WorkbasketAccessItemControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
|
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
|
||||||
HttpMethod.DELETE,
|
HttpMethod.DELETE,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(Void.class));
|
ParameterizedTypeReference.forType(Void.class));
|
||||||
assertThat(response.getBody()).isNull();
|
assertThat(response.getBody()).isNull();
|
||||||
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
|
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
|
||||||
|
@ -131,7 +132,7 @@ class WorkbasketAccessItemControllerIntTest {
|
||||||
+ "&anotherIllegalParam=stillIllegal"
|
+ "&anotherIllegalParam=stillIllegal"
|
||||||
+ "&sort-by=WORKBASKET_KEY&order=DESCENDING&page-size=5&page=2",
|
+ "&sort-by=WORKBASKET_KEY&order=DESCENDING&page-size=5&page=2",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
|
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
|
||||||
|
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
|
@ -158,7 +159,7 @@ class WorkbasketAccessItemControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
|
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
|
||||||
HttpMethod.DELETE,
|
HttpMethod.DELETE,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(Void.class));
|
ParameterizedTypeReference.forType(Void.class));
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
.isInstanceOf(HttpClientErrorException.class)
|
.isInstanceOf(HttpClientErrorException.class)
|
||||||
|
|
|
@ -63,7 +63,10 @@ class WorkbasketControllerIntTest {
|
||||||
RestEndpoints.URL_WORKBASKET_ID, "WBI:100000000000000000000000000000000006");
|
RestEndpoints.URL_WORKBASKET_ID, "WBI:100000000000000000000000000000000006");
|
||||||
ResponseEntity<WorkbasketRepresentationModel> response =
|
ResponseEntity<WorkbasketRepresentationModel> response =
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
url, HttpMethod.GET, restHelper.defaultRequest(), WORKBASKET_REPRESENTATION_MODEL_TYPE);
|
url,
|
||||||
|
HttpMethod.GET,
|
||||||
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
|
WORKBASKET_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF))
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF))
|
||||||
|
@ -77,7 +80,7 @@ class WorkbasketControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_WORKBASKET),
|
restHelper.toUrl(RestEndpoints.URL_WORKBASKET),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
|
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -89,7 +92,7 @@ class WorkbasketControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + "?required-permission=OPEN",
|
restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + "?required-permission=OPEN",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
|
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getRequiredLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getRequiredLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -103,7 +106,7 @@ class WorkbasketControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + parameters,
|
restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + parameters,
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
|
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -177,7 +180,7 @@ class WorkbasketControllerIntTest {
|
||||||
TEMPLATE.exchange(
|
TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + parameters,
|
restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + parameters,
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
|
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getContent()).hasSize(5);
|
assertThat(response.getBody().getContent()).hasSize(5);
|
||||||
|
@ -235,7 +238,7 @@ class WorkbasketControllerIntTest {
|
||||||
RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION,
|
RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION,
|
||||||
"WBI:100000000000000000000000000000000007"),
|
"WBI:100000000000000000000000000000000007"),
|
||||||
HttpMethod.DELETE,
|
HttpMethod.DELETE,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
Void.class);
|
Void.class);
|
||||||
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
|
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
|
||||||
|
|
||||||
|
@ -245,7 +248,7 @@ class WorkbasketControllerIntTest {
|
||||||
RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION,
|
RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION,
|
||||||
"WBI:100000000000000000000000000000000002"),
|
"WBI:100000000000000000000000000000000002"),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
DISTRIBUTION_TARGETS_COLLECTION_REPRESENTATION_MODEL_TYPE);
|
DISTRIBUTION_TARGETS_COLLECTION_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response2.getStatusCode()).isEqualTo(HttpStatus.OK);
|
assertThat(response2.getStatusCode()).isEqualTo(HttpStatus.OK);
|
||||||
assertThat(response2.getBody()).isNotNull();
|
assertThat(response2.getBody()).isNotNull();
|
||||||
|
@ -262,7 +265,7 @@ class WorkbasketControllerIntTest {
|
||||||
RestEndpoints.URL_WORKBASKET_ID_ACCESS_ITEMS,
|
RestEndpoints.URL_WORKBASKET_ID_ACCESS_ITEMS,
|
||||||
"WBI:100000000000000000000000000000000005"),
|
"WBI:100000000000000000000000000000000005"),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
WORKBASKET_ACCESS_ITEM_COLLECTION_REPRESENTATION_TYPE);
|
WORKBASKET_ACCESS_ITEM_COLLECTION_REPRESENTATION_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -278,7 +281,7 @@ class WorkbasketControllerIntTest {
|
||||||
RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION,
|
RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION,
|
||||||
"WBI:100000000000000000000000000000000001"),
|
"WBI:100000000000000000000000000000000001"),
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
DISTRIBUTION_TARGETS_COLLECTION_REPRESENTATION_MODEL_TYPE);
|
DISTRIBUTION_TARGETS_COLLECTION_REPRESENTATION_MODEL_TYPE);
|
||||||
assertThat(response.getBody()).isNotNull();
|
assertThat(response.getBody()).isNotNull();
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
@ -298,7 +301,7 @@ class WorkbasketControllerIntTest {
|
||||||
+ "&anotherIllegalParam=stillIllegal"
|
+ "&anotherIllegalParam=stillIllegal"
|
||||||
+ "&sort-by=KEY&order=DESCENDING&page-size=5&page=2",
|
+ "&sort-by=KEY&order=DESCENDING&page-size=5&page=2",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
|
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
|
|
||||||
assertThatThrownBy(httpCall)
|
assertThatThrownBy(httpCall)
|
||||||
|
|
|
@ -274,7 +274,7 @@ class WorkbasketDefinitionControllerIntTest {
|
||||||
return TEMPLATE.exchange(
|
return TEMPLATE.exchange(
|
||||||
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_DEFINITIONS) + "?domain=" + domain,
|
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_DEFINITIONS) + "?domain=" + domain,
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
restHelper.defaultRequest(),
|
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
|
||||||
ParameterizedTypeReference.forType(
|
ParameterizedTypeReference.forType(
|
||||||
WorkbasketDefinitionCollectionRepresentationModel.class));
|
WorkbasketDefinitionCollectionRepresentationModel.class));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue