libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-8670 remove support for migration.mode=import as there are separate tests

Browse source
This commit is contained in:
vramik 2018-10-30 13:49:33 +01:00 committed by Marek Posolda
parent ffcd8e09e7
commit 76e4253a21
3 changed files with 10 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
testsuite/integration-arquillian/HOW-TO-RUN.md
View file

@ -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

29
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java
View file

@ -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);
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());
}
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();

70
testsuite/integration-arquillian/tests/pom.xml
View file

@ -1355,56 +1355,6 @@
</build>
</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>
@ -1417,26 +1367,6 @@
</properties>
</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>