From e761d6ce107a33b66797bb843bf6a87b25bee33e Mon Sep 17 00:00:00 2001
From: mposolda <mposolda@gmail.com>
Date: Mon, 11 Jan 2016 17:58:52 +0100
Subject: [PATCH] Fix DB tests. Cleanup after AddUserTest

---
 .../org/keycloak/services/managers/ApplianceBootstrap.java     | 2 +-
 .../java/org/keycloak/services/resources/WelcomeResource.java  | 2 +-
 .../src/test/java/org/keycloak/testsuite/KeycloakServer.java   | 2 +-
 .../test/java/org/keycloak/testsuite/adduser/AddUserTest.java  | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java b/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java
index 10a260c790..3b741c13c5 100755
--- a/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java
+++ b/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java
@@ -66,7 +66,7 @@ public class ApplianceBootstrap {
         return true;
     }
 
-    public void createMasterRealmUser(KeycloakSession session, String username, String password) {
+    public void createMasterRealmUser(String username, String password) {
         RealmModel realm = session.realms().getRealm(Config.getAdminRealm());
         if (session.users().getUsersCount(realm) > 0) {
             throw new IllegalStateException("Can't create initial user as users already exists");
diff --git a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java
index e778de3b00..3e6bf3668e 100755
--- a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java
@@ -92,7 +92,7 @@ public class WelcomeResource {
             ApplianceBootstrap applianceBootstrap = new ApplianceBootstrap(session);
             if (applianceBootstrap.isNoMasterUser()) {
                 bootstrap = false;
-                applianceBootstrap.createMasterRealmUser(session, username, password);
+                applianceBootstrap.createMasterRealmUser(username, password);
 
                 logger.infov("Created initial admin user with username {0}", username);
                 return createWelcomePage("User created", null);
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java
index 2466f3621d..eb25ff0ef9 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/KeycloakServer.java
@@ -278,7 +278,7 @@ public class KeycloakServer {
             try {
                 session.getTransaction().begin();
                 if (new ApplianceBootstrap(session).isNoMasterUser()) {
-                    new ApplianceBootstrap(session).createMasterRealmUser(session, "admin", "admin");
+                    new ApplianceBootstrap(session).createMasterRealmUser("admin", "admin");
                 }
                 session.getTransaction().commit();
             } finally {
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adduser/AddUserTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adduser/AddUserTest.java
index 464f376caa..eb1bfcfdfa 100644
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adduser/AddUserTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adduser/AddUserTest.java
@@ -105,6 +105,9 @@ public class AddUserTest {
 
             assertRoles(accountRoles, "view-profile", "manage-account");
 
+            // User needs to delete himself as other tests rely on "admin" user
+            userResource.remove();
+
             keycloak.close();
 
             assertEquals(0, dir.listFiles().length);