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

KEYCLOAK-19457 Unignore JsonFileImportTests now that KEYCLOAK-19521 is done

Browse source
This commit is contained in:
Dominik 2021-10-11 16:36:29 +02:00 committed by Pedro Igor
parent 395cd792ff
commit ce0070508f
7 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@
*/
package org.keycloak.testsuite.migration;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import org.junit.Assert;
@ -43,8 +44,8 @@ public abstract class AbstractJsonFileImportMigrationTest extends AbstractMigrat
* The method will throw javax.ws.rs.NotFoundException in case the realm is not successfully imported
*/
protected void checkRealmsImported() {
Assert.assertThat(migrationRealm.toRepresentation().getRealm(), is(equalTo("Migration")));
Assert.assertThat(migrationRealm2.toRepresentation().getRealm(), is(equalTo("Migration2")));
assertThat(migrationRealm.toRepresentation().getRealm(), is(equalTo("Migration")));
assertThat(migrationRealm2.toRepresentation().getRealm(), is(equalTo("Migration2")));
}
@Override

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

@ -84,6 +84,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.equalTo;
@ -93,7 +94,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.keycloak.models.AccountRoles.MANAGE_ACCOUNT;
@ -578,7 +578,7 @@ public abstract class AbstractMigrationTest extends AbstractKeycloakTest {
ClientsResource clients = migrationRealm.clients();
ClientRepresentation clientRepresentation = clients.findByClientId("authz-servlet").get(0);
ResourceRepresentation resource = clients.get(clientRepresentation.getId()).authorization().resources().findByName("Protected Resource").get(0);
org.junit.Assert.assertThat(resource.getUris(), containsInAnyOrder("/*"));
assertThat(resource.getUris(), containsInAnyOrder("/*"));
}
protected void testAuthorizationServices(RealmResource... realms) {

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

@ -38,7 +38,7 @@ import org.keycloak.util.JsonSerialization;
*
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
*/
@AuthServerContainerExclude(value = {AuthServerContainerExclude.AuthServer.REMOTE, AuthServerContainerExclude.AuthServer.QUARKUS}, details = "It works locally for Quarkus, but failing on CI for unknown reason")
@AuthServerContainerExclude(value = {AuthServerContainerExclude.AuthServer.REMOTE})
public class JsonFileImport1301MigrationClientPoliciesTest extends AbstractJsonFileImportMigrationTest {
@Override

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

@ -35,7 +35,7 @@ import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.A
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
@AuthServerContainerExclude(value = {AuthServer.REMOTE, AuthServer.QUARKUS}, details = "It works locally for Quarkus, but failing on CI for unknown reason")
@AuthServerContainerExclude(value = {AuthServer.REMOTE})
public class JsonFileImport198MigrationTest extends AbstractJsonFileImportMigrationTest {
@Override
@ -50,12 +50,10 @@ public class JsonFileImport198MigrationTest extends AbstractJsonFileImportMigrat
for (RealmRepresentation rep : reps.values()) {
testRealms.add(rep);
}
}
@Test
public void migration1_9_8Test() throws Exception {
public void migration1_9_8Test() {
checkRealmsImported();
testMigratedMigrationData(false);
testMigrationTo2_0_0();

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

@ -37,7 +37,7 @@ import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.A
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
@AuthServerContainerExclude(value = {AuthServer.REMOTE, AuthServer.QUARKUS}, details = "It works locally for Quarkus, but failing on CI for unknown reason")
@AuthServerContainerExclude(value = {AuthServer.REMOTE})
public class JsonFileImport255MigrationTest extends AbstractJsonFileImportMigrationTest {
@Override

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

@ -37,7 +37,7 @@ import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.A
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
@AuthServerContainerExclude(value = {AuthServer.REMOTE, AuthServer.QUARKUS}, details = "It works locally for Quarkus, but failing on CI for unknown reason")
@AuthServerContainerExclude(value = {AuthServer.REMOTE})
public class JsonFileImport343MigrationTest extends AbstractJsonFileImportMigrationTest {
@Override

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

@ -33,7 +33,7 @@ import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.A
/**
* Tests that we can import json file from previous version. MigrationTest only tests DB.
*/
@AuthServerContainerExclude(value = {AuthServer.REMOTE, AuthServer.QUARKUS}, details = "It works locally for Quarkus, but failing on CI for unknown reason")
@AuthServerContainerExclude(value = {AuthServer.REMOTE})
public class JsonFileImport483MigrationTest extends AbstractJsonFileImportMigrationTest {
@Override