keycloak-memoizeit

KEYCLOAK-8670 remove support for migration.mode=import

10/30/2018 9:49:33 AM

Details

diff --git a/testsuite/integration-arquillian/HOW-TO-RUN.md b/testsuite/integration-arquillian/HOW-TO-RUN.md
index a50043c..2d85a04 100644
--- a/testsuite/integration-arquillian/HOW-TO-RUN.md
+++ b/testsuite/integration-arquillian/HOW-TO-RUN.md
@@ -306,9 +306,8 @@ This will start latest Keycloak and import the realm JSON file, which was previo
 
     mvn -f testsuite/integration-arquillian/pom.xml \
       clean install \
-      -Pauth-server-wildfly,migration-import,test-70-migration \
-      -Dtest=MigrationTest \
-      -Dmigration.mode=import
+      -Pauth-server-wildfly \
+      -Dtest=JsonFileImport*MigrationTest
 
 
 ## Server configuration migration test
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 ecd5b63..0b0b99d 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
@@ -477,19 +477,15 @@ public abstract class AbstractMigrationTest extends AbstractKeycloakTest {
     }
 
     protected void testOfflineTokenLogin() throws Exception {
-        if (isImportMigrationMode()) {
-            log.info("Skip offline token login test in the 'import' migrationMode");
-        } else {
-            log.info("test login with old offline token");
-            String oldOfflineToken = suiteContext.getMigrationContext().loadOfflineToken();
-            Assert.assertNotNull(oldOfflineToken);
-
-            oauth.realm(MIGRATION);
-            oauth.clientId("migration-test-client");
-            OAuthClient.AccessTokenResponse response = oauth.doRefreshTokenRequest(oldOfflineToken, "b2c07929-69e3-44c6-8d7f-76939000b3e4");
-            AccessToken accessToken = oauth.verifyToken(response.getAccessToken());
-            assertEquals("migration-test-user", accessToken.getPreferredUsername());
-        }
+        log.info("test login with old offline token");
+        String oldOfflineToken = suiteContext.getMigrationContext().loadOfflineToken();
+        Assert.assertNotNull(oldOfflineToken);
+
+        oauth.realm(MIGRATION);
+        oauth.clientId("migration-test-client");
+        OAuthClient.AccessTokenResponse response = oauth.doRefreshTokenRequest(oldOfflineToken, "b2c07929-69e3-44c6-8d7f-76939000b3e4");
+        AccessToken accessToken = oauth.verifyToken(response.getAccessToken());
+        assertEquals("migration-test-user", accessToken.getPreferredUsername());
     }
 
     private void testRealmDefaultClientScopes(RealmResource realm) {
@@ -554,15 +550,6 @@ public abstract class AbstractMigrationTest extends AbstractKeycloakTest {
         }
     }
 
-    protected String getMigrationMode() {
-        return System.getProperty("migration.mode");
-    }
-
-    protected boolean isImportMigrationMode() {
-        String mode = getMigrationMode();
-        return "import".equals(mode);
-    }
-
     protected void testMigrationTo2_x() throws Exception {
         testMigrationTo2_0_0();
         testMigrationTo2_1_0();
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 07ed2a5..c5918f1 100755
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -1356,56 +1356,6 @@
         </profile>
 
         <profile>
-            <id>migration-import</id>
-            <activation>
-                <property>
-                    <name>migration.mode</name>
-                    <value>import</value>
-                </property>
-            </activation>
-            <properties>
-                <migration.import.file>target/test-classes/migration-test/migration-realm-${migrated.auth.server.version}.json</migration.import.file>
-                <migration.import.properties>
-                    -Dkeycloak.migration.action=import
-                    -Dkeycloak.migration.provider=singleFile
-                    -Dkeycloak.migration.file=${migration.import.file}
-                    -Dkeycloak.migration.strategy=OVERWRITE_EXISTING
-                </migration.import.properties>
-                <skip.add.user.json>true</skip.add.user.json>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-enforcer-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>enforce</goal>
-                                </goals>
-                                <configuration>
-                                    <rules>
-                                        <requireProperty>
-                                            <property>migrated.auth.server.version</property>
-                                        </requireProperty>
-                                    </rules>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <migrated.auth.server.version>${migrated.auth.server.version}</migrated.auth.server.version>
-                                <migration.import.properties>${migration.import.properties}</migration.import.properties>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>    
-
-        <profile>
             <id>migration-productized</id>
             <activation>
                 <property>
@@ -1418,26 +1368,6 @@
         </profile>
 
         <profile>
-            <id>no-account</id>
-            <properties>
-                <exclude.account>**/account/**/*Test.java</exclude.account>
-            </properties>
-        </profile>
-        <profile>
-            <id>no-client</id>
-            <properties>
-                <exclude.client>**/client/**/*Test.java</exclude.client>
-            </properties>
-        </profile>
-        <profile>
-            <id>no-base</id>
-            <properties>
-                <exclude.account>**/account/**/*Test.java</exclude.account>
-                <exclude.client>**/client/**/*Test.java</exclude.client>
-            </properties>
-        </profile>
-
-        <profile>
             <id>common-test-dependencies</id>
             <activation>
                 <file>