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

TSK-1024: removed lenient() and replaced MockitoSettings annotation

This commit is contained in:
Mustapha Zorgati 2020-01-29 20:29:24 +01:00 committed by Benjamin Eckstein
parent 08571e7216
commit 34d6bfdae6
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rest/taskana-rest-spring/src/main/java/pro/taskana/ldap/LdapClient.java
View File

@ -400,7 +400,19 @@ public class LdapClient {
} }
/** Context Mapper for user entries. */ /** Context Mapper for user entries. */
class UserContextMapper extends AbstractContextMapper<AccessIdResource> { class GroupContextMapper extends AbstractContextMapper<AccessIdResource> {
@Override
public AccessIdResource doMapFromContext(final DirContextOperations context) {
final AccessIdResource accessId = new AccessIdResource();
accessId.setAccessId(context.getNameInNamespace()); // fully qualified dn
accessId.setName(context.getStringAttribute(getGroupNameAttribute()));
return accessId;
}
}
/** Context Mapper for user entries. */
private class UserContextMapper extends AbstractContextMapper<AccessIdResource> {
@Override @Override
public AccessIdResource doMapFromContext(final DirContextOperations context) { public AccessIdResource doMapFromContext(final DirContextOperations context) {
@ -412,16 +424,4 @@ public class LdapClient {
return accessId; return accessId;
} }
} }
/** Context Mapper for user entries. */
class GroupContextMapper extends AbstractContextMapper<AccessIdResource> {
@Override
public AccessIdResource doMapFromContext(final DirContextOperations context) {
final AccessIdResource accessId = new AccessIdResource();
accessId.setAccessId(context.getNameInNamespace()); // fully qualified dn
accessId.setName(context.getStringAttribute(getGroupNameAttribute()));
return accessId;
}
}
} }

19
rest/taskana-rest-spring/src/test/java/pro/taskana/ldap/LdapClientTest.java
View File

@ -2,18 +2,19 @@ package pro.taskana.ldap;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks; import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.core.LdapTemplate;
@MockitoSettings @ExtendWith(MockitoExtension.class)
class LdapClientTest { class LdapClientTest {
@Mock Environment environment; @Mock Environment environment;
@ -36,8 +37,11 @@ class LdapClientTest {
} }
private void setUpEnvMock() { private void setUpEnvMock() {
Stream.of( Stream.of(
new String[][] { new String[][] {
{"taskana.ldap.minSearchForLength", "3"},
{"taskana.ldap.maxNumberOfReturnedAccessIds", "50"},
{"taskana.ldap.useLdap", "true"}, {"taskana.ldap.useLdap", "true"},
{"taskana.ldap.baseDn", "o=TaskanaTest"}, {"taskana.ldap.baseDn", "o=TaskanaTest"},
{"taskana.ldap.userSearchBase", "ou=people"}, {"taskana.ldap.userSearchBase", "ou=people"},
@ -51,13 +55,8 @@ class LdapClientTest {
{"taskana.ldap.userLastnameAttribute", "sn"}, {"taskana.ldap.userLastnameAttribute", "sn"},
{"taskana.ldap.userFirstnameAttribute", "givenName"}, {"taskana.ldap.userFirstnameAttribute", "givenName"},
{"taskana.ldap.userFirstnameAttribute", "givenName"}, {"taskana.ldap.userFirstnameAttribute", "givenName"},
{"taskana.ldap.userSearchFilterValue", "person"}, {"taskana.ldap.userSearchFilterValue", "person"}
{"taskana.ldap.bindDn", "uid=admin,ou=system"},
{"taskana.ldap.bindPassword", "secret"},
{"taskana.ldap.serverUrl", "ldap://localhost:10389"},
}) })
.forEach( .forEach(strings -> when(this.environment.getProperty(strings[0])).thenReturn(strings[1]));
strings ->
lenient().when(this.environment.getProperty(strings[0])).thenReturn(strings[1]));
} }
} }