keycloak-uncached

Merge pull request #3614 from vramik/KEYCLOAK-4031 KEYCLOAK-4031

12/9/2016 12:10:03 PM

Details

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUserAttributeMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUserAttributeMapperTest.java
index f5e9d2e..b2af5ff 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUserAttributeMapperTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUserAttributeMapperTest.java
@@ -6,16 +6,7 @@ import org.keycloak.admin.client.resource.UsersResource;
 import org.keycloak.representations.idm.ClientRepresentation;
 import org.keycloak.representations.idm.IdentityProviderMapperRepresentation;
 import org.keycloak.representations.idm.IdentityProviderRepresentation;
-import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
-import org.keycloak.testsuite.AbstractKeycloakTest;
-import org.keycloak.testsuite.Assert;
-import org.keycloak.testsuite.Retry;
-import org.keycloak.testsuite.pages.AccountPasswordPage;
-import org.keycloak.testsuite.pages.ErrorPage;
-import org.keycloak.testsuite.pages.IdpConfirmLinkPage;
-import org.keycloak.testsuite.pages.LoginPage;
-import org.keycloak.testsuite.pages.UpdateAccountInformationPage;
 import org.keycloak.testsuite.util.UserBuilder;
 
 import com.google.common.collect.ImmutableList;
@@ -26,17 +17,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.ws.rs.core.Response;
-import org.jboss.arquillian.graphene.page.Page;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.openqa.selenium.TimeoutException;
 
 import static org.junit.Assert.*;
 import static org.hamcrest.Matchers.*;
 import static org.keycloak.testsuite.admin.ApiUtil.*;
-import static org.keycloak.testsuite.broker.BrokerTestTools.encodeUrl;
-import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage;
 
 /**
  *
@@ -142,7 +128,7 @@ public abstract class AbstractUserAttributeMapperTest extends AbstractBaseBroker
             for (Map.Entry<String, List<String>> me : attrs.entrySet()) {
                 String mappedAttrName = ATTRIBUTE_NAME_TRANSLATION.get(me.getKey());
                 if (mappedAttrNames.contains(mappedAttrName)) {
-                    assertThat(userRep.getAttributes().get(mappedAttrName), equalTo(me.getValue()));
+                    assertThat(userRep.getAttributes().get(mappedAttrName), containsInAnyOrder(me.getValue().toArray()));
                 }
             }
         }