Skip to content

Commit

Permalink
fix: assertion regression
Browse files Browse the repository at this point in the history
  • Loading branch information
fdaugan committed May 11, 2024
1 parent 2bddba3 commit 6d2e1cf
Showing 1 changed file with 13 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
*/
package org.ligoj.app.plugin.id.resource;

import java.util.ArrayList;
import java.util.List;

import jakarta.transaction.Transactional;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.filter.AndFilter;
import org.springframework.ldap.filter.EqualsFilter;
import org.springframework.test.annotation.Rollback;

import java.util.ArrayList;
import java.util.Arrays;

/**
* Test of {@link UserOrgResource} : only deletion<br>
*/
Expand All @@ -23,7 +22,7 @@
class UserLdapResourceZZDeleteTest extends AbstractUserLdapResourceTest {

@Test
void zzdeleteUser() {
void zzDeleteUser() {
initSpringSecurityContext("assist");
Assertions.assertEquals(1, resource.findAll("ing", null, "jdoe5", newUriInfo()).getData().size());
Assertions.assertNotNull(getUser().findByIdNoCache("jdoE5"));
Expand All @@ -33,27 +32,25 @@ void zzdeleteUser() {
Assertions.assertNull(getUser().findByIdNoCache("jdoe5"));
Assertions.assertFalse(getGroup().findAll().get("dig rha").getMembers().contains("jdoe5"));

final AndFilter filter = new AndFilter();
filter.and(new EqualsFilter("objectclass", "groupOfUniqueNames"));
filter.and(new EqualsFilter("cn", "dig rha"));
final List<DirContextAdapter> groups = getTemplate().search("ou=groups,dc=sample,dc=com", filter.encode(),
final var filter = new AndFilter()
.and(new EqualsFilter("objectClass", "groupOfUniqueNames"))
.and(new EqualsFilter("cn", "dig rha"));
final var groups = getTemplate().search("ou=groups,dc=sample,dc=com", filter.encode(),
(Object ctx) -> (DirContextAdapter) ctx);
Assertions.assertEquals(1, groups.size());
final DirContextAdapter group = groups.getFirst();
final var group = groups.getFirst();
final String[] stringAttributes = group.getStringAttributes("uniqueMember");
Assertions.assertEquals(0, stringAttributes.length);
for (final String memberDN : stringAttributes) {
Assertions.assertFalse(memberDN.startsWith("uid=jdoe5"));
}
Assertions.assertNotEquals(0, stringAttributes.length);
Arrays.stream(stringAttributes).forEach(memberDN -> Assertions.assertFalse(memberDN.startsWith("uid=jdoe5")));

// Restore the state, create back the user
initSpringSecurityContext(DEFAULT_USER);
final UserOrgEditionVo user = new UserOrgEditionVo();
final var user = new UserOrgEditionVo();
user.setId("jdoe5");
user.setFirstName("First5");
user.setLastName("Last5");
user.setCompany("ing-internal");
final List<String> groups2 = new ArrayList<>();
final var groups2 = new ArrayList<String>();
groups2.add("DIG RHA");
user.setGroups(groups2);
resource.create(user);
Expand Down

0 comments on commit 6d2e1cf

Please sign in to comment.