keycloak-aplcache

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractJsonFileImportMigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractJsonFileImportMigrationTest.java
index ce59659..176c9a3 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractJsonFileImportMigrationTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractJsonFileImportMigrationTest.java
@@ -40,7 +40,9 @@ public abstract class AbstractJsonFileImportMigrationTest extends AbstractMigrat
         migrationRealm2 = adminClient.realms().realm(MIGRATION2);
         migrationRealm3 = adminClient.realms().realm("authorization");
         masterRealm = adminClient.realms().realm(MASTER);
+    }
 
+    /*
 
 
         // hack to reuse AbstractMigrationTest  need to create a bunch of stuff in master realm for tests to work
@@ -77,4 +79,5 @@ public abstract class AbstractJsonFileImportMigrationTest extends AbstractMigrat
         masterRealm.users().get(user.getId()).remove();
 
     }
+    */
 }

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java
index 47de484..b8282f8 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java
@@ -78,14 +78,12 @@ public abstract class AbstractMigrationTest extends AbstractKeycloakTest {
     protected void testMigratedData() {
         log.info("testing migrated data");
         //master realm
-        assertNames(masterRealm.roles().list(), "offline_access", "uma_authorization", "create-realm", "master-test-realm-role", "admin");
-        assertNames(masterRealm.clients().findAll(), "admin-cli", "security-admin-console", "broker", "account",
-                "master-realm", "master-test-client", "Migration-realm", "Migration2-realm");
-        String id = masterRealm.clients().findByClientId("master-test-client").get(0).getId();
-        assertNames(masterRealm.clients().get(id).roles().list(), "master-test-client-role");
-        assertNames(masterRealm.users().search("", 0, 5), "admin", "master-test-user");
-        assertNames(masterRealm.groups().groups(), "master-test-group");
+        testMigratedMasterData();
         //migrationRealm
+        testMigratedMigrationData();
+    }
+
+    protected void testMigratedMigrationData() {
         assertNames(migrationRealm.roles().list(), "offline_access", "uma_authorization", "migration-test-realm-role");
         assertNames(migrationRealm.clients().findAll(), "account", "admin-cli", "broker", "migration-test-client", "realm-management", "security-admin-console");
         String id2 = migrationRealm.clients().findByClientId("migration-test-client").get(0).getId();
@@ -94,6 +92,16 @@ public abstract class AbstractMigrationTest extends AbstractKeycloakTest {
         assertNames(migrationRealm.groups().groups(), "migration-test-group");
     }
 
+    protected void testMigratedMasterData() {
+        assertNames(masterRealm.roles().list(), "offline_access", "uma_authorization", "create-realm", "master-test-realm-role", "admin");
+        assertNames(masterRealm.clients().findAll(), "admin-cli", "security-admin-console", "broker", "account",
+                "master-realm", "master-test-client", "Migration-realm", "Migration2-realm");
+        String id = masterRealm.clients().findByClientId("master-test-client").get(0).getId();
+        assertNames(masterRealm.clients().get(id).roles().list(), "master-test-client-role");
+        assertNames(masterRealm.users().search("", 0, 5), "admin", "master-test-user");
+        assertNames(masterRealm.groups().groups(), "master-test-group");
+    }
+
     /**
      * @see org.keycloak.migration.migrators.MigrateTo2_0_0
      */

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java
index 3d721bd..5f757ec 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java
@@ -52,7 +52,7 @@ public class JsonFileImport198MigrationTest extends AbstractJsonFileImportMigrat
 
     @Test
     public void migration1_9_8Test() throws Exception {
-        testMigratedData();
+        testMigratedMigrationData();
         testMigrationTo2_0_0();
         testMigrationTo2_1_0();
         testMigrationTo2_2_0();