From e2bd99e9e40b5de9b03db4edebcba956ae8ca4aa Mon Sep 17 00:00:00 2001
From: vramik <vramik@redhat.com>
Date: Wed, 26 Feb 2020 10:07:37 +0100
Subject: [PATCH] KEYCLOAK-13097 fix UserStorageTest - add cleanup after test

---
 .../keycloak/testsuite/federation/UserMapStorage.java    | 4 ++--
 .../testsuite/federation/UserMapStorageFactory.java      | 9 +++++++--
 .../testsuite/federation/storage/UserStorageTest.java    | 8 +++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java
index a6d80c3474..4c1572ad99 100644
--- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java
+++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java
@@ -60,8 +60,8 @@ public class UserMapStorage implements UserLookupProvider, UserStorageProvider,
 
     private static final Logger log = Logger.getLogger(UserMapStorage.class);
     
-    protected Map<String, String> userPasswords;
-    protected ConcurrentMap<String, Set<String>> userGroups;
+    protected final Map<String, String> userPasswords;
+    protected final ConcurrentMap<String, Set<String>> userGroups;
     protected ComponentModel model;
     protected KeycloakSession session;
     protected EditMode editMode;
diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java
index f7f36be22c..6c9006ca3c 100644
--- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java
+++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java
@@ -48,8 +48,8 @@ public class UserMapStorageFactory implements UserStorageProviderFactory<UserMap
         configProperties.add(attr);
     }
 
-    protected Map<String, String> userPasswords = new ConcurrentHashMap<>();
-    protected ConcurrentMap<String, Set<String>> userGroups = new ConcurrentHashMap<>();
+    private final Map<String, String> userPasswords = new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, Set<String>> userGroups = new ConcurrentHashMap<>();
 
     @Override
     public List<ProviderConfigProperty> getConfigProperties() {
@@ -80,4 +80,9 @@ public class UserMapStorageFactory implements UserStorageProviderFactory<UserMap
     public void close() {
 
     }
+
+    public void clear() {
+        userPasswords.clear();
+        userGroups.clear();
+    }
 }
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java
index 44707195b6..3ac850a959 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java
@@ -67,6 +67,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.keycloak.models.UserModel.RequiredAction.UPDATE_PROFILE;
+import org.keycloak.provider.ProviderFactory;
 import static org.keycloak.storage.UserStorageProviderModel.CACHE_POLICY;
 import static org.keycloak.storage.UserStorageProviderModel.EVICTION_DAY;
 import static org.keycloak.storage.UserStorageProviderModel.EVICTION_HOUR;
@@ -142,7 +143,7 @@ public class UserStorageTest extends AbstractAuthTest {
     }
 
     @After
-    public void removeTestUser() throws URISyntaxException, IOException {
+    public void afterTestCleanUp() throws URISyntaxException, IOException {
         testingClient.server().run(session -> {
             RealmModel realm = session.realms().getRealmByName("test");
             if (realm == null) {
@@ -154,6 +155,11 @@ public class UserStorageTest extends AbstractAuthTest {
                 session.userLocalStorage().removeUser(realm, user);
                 session.userCache().clear();
             }
+
+            //we need to clear userPasswords and userGroups from UserMapStorageFactory
+            UserMapStorageFactory userMapStorageFactory = (UserMapStorageFactory) session.getKeycloakSessionFactory().getProviderFactory(UserStorageProvider.class, UserMapStorageFactory.PROVIDER_ID);
+            Assert.assertNotNull(userMapStorageFactory);
+            userMapStorageFactory.clear();
         });
     }