nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1308: fixed compile issues introduced in rebase

This commit is contained in:
Mustapha Zorgati 2020-07-01 11:35:47 +02:00 committed by holgerhagen
parent 382b8366bf
commit 63b6248cf7
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerIntTest.java
View File

@ -94,13 +94,12 @@ class AccessIdControllerIntTest {
@Test @Test
void testBadRequestWhenSearchForIsTooShort() { void testBadRequestWhenSearchForIsTooShort() {
ThrowingCallable httpCall = ThrowingCallable httpCall =
() -> { () ->
TEMPLATE.exchange( TEMPLATE.exchange(
restHelper.toUrl(Mapping.URL_ACCESSID) + "?search-for=al", restHelper.toUrl(Mapping.URL_ACCESSID) + "?search-for=al",
HttpMethod.GET, HttpMethod.GET,
restHelper.defaultRequest(), restHelper.defaultRequest(),
ParameterizedTypeReference.forType(List.class)); ParameterizedTypeReference.forType(List.class));
};
assertThatThrownBy(httpCall) assertThatThrownBy(httpCall)
.isInstanceOf(HttpClientErrorException.class) .isInstanceOf(HttpClientErrorException.class)
.hasMessageContaining("Minimum searchFor length =") .hasMessageContaining("Minimum searchFor length =")
@ -111,7 +110,7 @@ class AccessIdControllerIntTest {
@Test @Test
void should_returnAccessIdsOfGroupsTheAccessIdIsMemberOf_ifAccessIdOfUserIsGiven() { void should_returnAccessIdsOfGroupsTheAccessIdIsMemberOf_ifAccessIdOfUserIsGiven() {
ResponseEntity<List<AccessIdRepresentationModel>> response = ResponseEntity<List<AccessIdRepresentationModel>> response =
template.exchange( TEMPLATE.exchange(
restHelper.toUrl(Mapping.URL_ACCESSID_GROUPS) + "?access-id=teamlead-2", restHelper.toUrl(Mapping.URL_ACCESSID_GROUPS) + "?access-id=teamlead-2",
HttpMethod.GET, HttpMethod.GET,
restHelper.defaultRequest(), restHelper.defaultRequest(),
@ -132,7 +131,7 @@ class AccessIdControllerIntTest {
@Test @Test
void should_returnAccessIdsOfGroupsTheAccessIdIsMemberOf_ifAccessIdOfGroupIsGiven() { void should_returnAccessIdsOfGroupsTheAccessIdIsMemberOf_ifAccessIdOfGroupIsGiven() {
ResponseEntity<List<AccessIdRepresentationModel>> response = ResponseEntity<List<AccessIdRepresentationModel>> response =
template.exchange( TEMPLATE.exchange(
restHelper.toUrl(Mapping.URL_ACCESSID_GROUPS) restHelper.toUrl(Mapping.URL_ACCESSID_GROUPS)
+ "?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",
@ -151,7 +150,7 @@ class AccessIdControllerIntTest {
void should_throwNotAuthorizedException_ifCallerOfGroupRetrievalIsNotAdminOrBusinessAdmin() { void should_throwNotAuthorizedException_ifCallerOfGroupRetrievalIsNotAdminOrBusinessAdmin() {
ThrowingCallable call = ThrowingCallable call =
() -> () ->
template.exchange( TEMPLATE.exchange(
restHelper.toUrl(Mapping.URL_ACCESSID_GROUPS) + "?access-id=teamlead-2", restHelper.toUrl(Mapping.URL_ACCESSID_GROUPS) + "?access-id=teamlead-2",
HttpMethod.GET, HttpMethod.GET,
new HttpEntity<>(restHelper.getHeadersUser_1_1()), new HttpEntity<>(restHelper.getHeadersUser_1_1()),
@ -167,7 +166,7 @@ class AccessIdControllerIntTest {
void should_throwNotAuthorizedException_ifCallerOfValidationIsNotAdminOrBusinessAdmin() { void should_throwNotAuthorizedException_ifCallerOfValidationIsNotAdminOrBusinessAdmin() {
ThrowingCallable call = ThrowingCallable call =
() -> () ->
template.exchange( TEMPLATE.exchange(
restHelper.toUrl(Mapping.URL_ACCESSID) + "?search-for=al", restHelper.toUrl(Mapping.URL_ACCESSID) + "?search-for=al",
HttpMethod.GET, HttpMethod.GET,
new HttpEntity<>(restHelper.getHeadersUser_1_1()), new HttpEntity<>(restHelper.getHeadersUser_1_1()),