libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

KEYCLOAK-18812 fixing Account REST API tests under User Profile enabled

Browse source
This commit is contained in:
Vlastimil Elias 2021-07-22 14:55:15 +02:00 committed by Pedro Igor
parent f307c56fe1
commit fff27f8bd6
2 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java
View file

@ -285,7 +285,12 @@ public class AccountRestServiceTest extends AbstractRestServiceTest {
user = updateAndGet(user); user = updateAndGet(user);
assertEquals(1, user.getAttributes().size()); if (isDeclarativeUserProfile()) {
assertEquals(2, user.getAttributes().size());
assertTrue(user.getAttributes().get("attr1").isEmpty());
} else {
assertEquals(1, user.getAttributes().size());
}
assertEquals(2, user.getAttributes().get("attr2").size()); assertEquals(2, user.getAttributes().get("attr2").size());
assertThat(user.getAttributes().get("attr2"), containsInAnyOrder("val2", "val3")); assertThat(user.getAttributes().get("attr2"), containsInAnyOrder("val2", "val3"));
@ -1368,4 +1373,8 @@ public class AccountRestServiceTest extends AbstractRestServiceTest {
// custom-audience client is used only in this test so no need to revert the changes // custom-audience client is used only in this test so no need to revert the changes
} }
protected boolean isDeclarativeUserProfile() {
return false;
}
} }

30
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java
View file

@ -17,7 +17,6 @@
package org.keycloak.testsuite.account; package org.keycloak.testsuite.account;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
@ -49,7 +48,12 @@ public class AccountRestServiceWithUserProfileTest extends AccountRestServiceTes
enableDynamicUserProfile(); enableDynamicUserProfile();
setUserProfileConfiguration(null); setUserProfileConfiguration(null);
} }
@Override
protected boolean isDeclarativeUserProfile() {
return true;
}
private static String UP_CONFIG_FOR_METADATA = "{\"attributes\": [" private static String UP_CONFIG_FOR_METADATA = "{\"attributes\": ["
+ "{\"name\": \"firstName\"," + PERMISSIONS_ALL + ", \"required\": {\"scopes\":[\"profile\"]}, \"displayName\": \"${profile.firstName}\", \"validations\": {\"length\": { \"max\": 255 }}}," + "{\"name\": \"firstName\"," + PERMISSIONS_ALL + ", \"required\": {\"scopes\":[\"profile\"]}, \"displayName\": \"${profile.firstName}\", \"validations\": {\"length\": { \"max\": 255 }}},"
+ "{\"name\": \"lastName\"," + PERMISSIONS_ALL + ", \"required\": {}, \"displayName\": \"Last name\", \"annotations\": {\"formHintKey\" : \"userEmailFormFieldHint\", \"anotherKey\" : 10, \"yetAnotherKey\" : \"some value\"}}," + "{\"name\": \"lastName\"," + PERMISSIONS_ALL + ", \"required\": {}, \"displayName\": \"Last name\", \"annotations\": {\"formHintKey\" : \"userEmailFormFieldHint\", \"anotherKey\" : 10, \"yetAnotherKey\" : \"some value\"}},"
@ -158,21 +162,23 @@ public class AccountRestServiceWithUserProfileTest extends AccountRestServiceTes
@Test @Test
@Override @Override
public void testUpdateProfile() throws IOException { public void testUpdateProfile() throws IOException {
// TODO uncomment next lines once KEYCLOAK-18839 is patched setUserProfileConfiguration("{\"attributes\": ["
// setUserProfileConfiguration("{\"attributes\": [" + "{\"name\": \"firstName\"," + PERMISSIONS_ALL + ", \"required\": {}},"
// + "{\"name\": \"firstName\"," + PERMISSIONS_ALL + ", \"required\": {}}," + "{\"name\": \"lastName\"," + PERMISSIONS_ALL + ", \"required\": {}},"
// + "{\"name\": \"lastName\"," + PERMISSIONS_ALL + ", \"required\": {}}," + "{\"name\": \"attr1\"," + PERMISSIONS_ALL + "},"
// + "{\"name\": \"attr1\"," + PERMISSIONS_ALL + "}," + "{\"name\": \"attr2\"," + PERMISSIONS_ALL + "}"
// + "{\"name\": \"attr2\"," + PERMISSIONS_ALL + "}" + "]}");
// + "]}"); super.testUpdateProfile();
// super.testUpdateProfile();
} }
@Test @Test
@Override @Override
public void testUpdateSingleField() throws IOException { public void testUpdateSingleField() throws IOException {
// TODO uncomment next lines once KEYCLOAK-18839 is patched setUserProfileConfiguration("{\"attributes\": ["
// super.testUpdateSingleField(); + "{\"name\": \"firstName\"," + PERMISSIONS_ALL + "},"
+ "{\"name\": \"lastName\"," + PERMISSIONS_ALL + ", \"required\": {}}"
+ "]}");
super.testUpdateSingleField();
} }
protected void setUserProfileConfiguration(String configuration) { protected void setUserProfileConfiguration(String configuration) {