From ce0070508f0ca7636c0a8a16371c0e574e2e5a8a Mon Sep 17 00:00:00 2001 From: Dominik Date: Mon, 11 Oct 2021 16:36:29 +0200 Subject: [PATCH] KEYCLOAK-19457 Unignore JsonFileImportTests now that KEYCLOAK-19521 is done --- .../migration/AbstractJsonFileImportMigrationTest.java | 5 +++-- .../keycloak/testsuite/migration/AbstractMigrationTest.java | 4 ++-- .../JsonFileImport1301MigrationClientPoliciesTest.java | 2 +- .../testsuite/migration/JsonFileImport198MigrationTest.java | 6 ++---- .../testsuite/migration/JsonFileImport255MigrationTest.java | 2 +- .../testsuite/migration/JsonFileImport343MigrationTest.java | 2 +- .../testsuite/migration/JsonFileImport483MigrationTest.java | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) 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 010ca0ecc0..e0ed5e7ef9 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 @@ -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 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 75a241023d..f0f0887ffb 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 @@ -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) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java index b147598d45..9e40454765 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java @@ -38,7 +38,7 @@ import org.keycloak.util.JsonSerialization; * * @author Marek Posolda */ -@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 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 56998cbb94..72835dcab8 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 @@ -35,7 +35,7 @@ import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.A * @author Bill Burke * @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(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java index 852a24530b..1303e6e3f0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java @@ -37,7 +37,7 @@ import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.A * @author Bill Burke * @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 diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java index 51db0f0c1f..83d29c4ad3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java @@ -37,7 +37,7 @@ import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.A * @author Bill Burke * @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 diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java index 3303ad3fcc..f2f7f5e358 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java @@ -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