From 23d5f2188d7fc7992a4cc5cb7c9e1b4861c4467a Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Tue, 13 Feb 2024 12:38:58 +0100 Subject: [PATCH] Run adapters in a separate job on GitHub Actions (#26962) Closes #25892 Signed-off-by: stianst --- .github/actions/build-keycloak/action.yml | 26 +--------- .github/actions/upload-heapdumps/action.yml | 4 +- .github/workflows/ci.yml | 49 +++++++++++++++++++ testsuite/integration-arquillian/pom.xml | 17 +------ .../servers/app-server/pom.xml | 18 +++++-- .../integration-arquillian/tests/base/pom.xml | 1 - .../arquillian/AppServerTestEnricher.java | 2 +- .../AbstractBaseServletAuthzAdapterTest.java | 2 +- .../AbstractServletAuthzAdapterTest.java | 2 +- .../AbstractServletPolicyEnforcerTest.java | 2 +- .../DefaultAuthzConfigAdapterTest.java | 2 +- .../example/PermissiveModeAdapterTest.java | 2 +- .../example/ServletAuthzCIPAdapterTest.java | 2 +- .../ServletAuthzCacheDisabledAdapterTest.java | 2 +- .../ServletAuthzCacheLifespanAdapterTest.java | 2 +- .../ServletAuthzLazyLoadPathsAdapterTest.java | 2 +- ...ervletAuthzNoLazyLoadPathsAdapterTest.java | 2 +- .../ServletPolicyEnforcerLifespanTest.java | 2 +- .../example/ServletPolicyEnforcerTest.java | 2 +- .../servlet}/SamlXMLAttacksTest.java | 3 +- .../tests/base/testsuites/base-suite | 2 +- .../tests/other/adapters/karaf/fuse61/pom.xml | 2 +- .../tests/other/adapters/karaf/fuse62/pom.xml | 2 +- .../tests/other/adapters/karaf/karaf3/pom.xml | 2 +- .../tests/other/adapters/karaf/pom.xml | 2 +- 25 files changed, 87 insertions(+), 67 deletions(-) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/AbstractBaseServletAuthzAdapterTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/AbstractServletAuthzAdapterTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/AbstractServletPolicyEnforcerTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/DefaultAuthzConfigAdapterTest.java (99%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/PermissiveModeAdapterTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/ServletAuthzCIPAdapterTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/ServletAuthzCacheDisabledAdapterTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/ServletAuthzCacheLifespanAdapterTest.java (98%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/ServletAuthzLazyLoadPathsAdapterTest.java (97%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/ServletAuthzNoLazyLoadPathsAdapterTest.java (96%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/ServletPolicyEnforcerLifespanTest.java (97%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{authz/adapter => adapter/authz}/example/ServletPolicyEnforcerTest.java (96%) rename testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/{saml => adapter/servlet}/SamlXMLAttacksTest.java (98%) diff --git a/.github/actions/build-keycloak/action.yml b/.github/actions/build-keycloak/action.yml index 0c8b9279ed..00758c3ba2 100644 --- a/.github/actions/build-keycloak/action.yml +++ b/.github/actions/build-keycloak/action.yml @@ -32,36 +32,12 @@ runs: name: Frontend Plugin Cache uses: ./.github/actions/frontend-plugin-cache - # Remove once https://github.com/keycloak/keycloak/issues/19299 is solved - ######################################################################################################## - - id: check-adapter-changes - if: github.event_name == 'pull_request' - name: Check changes for WildFly adapters - shell: bash - # If there are no changes for WildFly adapters, we use adapters built in the latest nightly build - run: | - WF_ADAPTERS_REGEX="^adapters/oidc/wildfly|^adapters/saml/wildfly" - - git fetch origin --tags --force - - echo "GIT_WF_ADAPTERS_DIFF=$(git diff origin/main --name-only | egrep -ic -e "$WF_ADAPTERS_REGEX")" >> $GITHUB_ENV - echo "NIGHTLY_DIFF=$(git diff nightly --name-only | egrep -ic -e "$WF_ADAPTERS_REGEX")" >> $GITHUB_ENV - - - id: set-maven-profile - if: ${{ github.event_name != 'pull_request' || env.GIT_WF_ADAPTERS_DIFF != 0 || env.NIGHTLY_DIFF != 0}} - name: Set profile for building distribution - shell: bash - run: | - echo "MVN_PROFILES=-Pdistribution" >> $GITHUB_ENV - echo "WildFly adapters will be built in our codebase" - ######################################################################################################## - - id: build-keycloak name: Build Keycloak shell: bash # By using "dependency:resolve", it will download all dependencies used in later stages for running the tests run: | - ./mvnw install dependency:resolve -V -e -DskipTests -DskipExamples ${{ env.MVN_PROFILES}} + ./mvnw install dependency:resolve -V -e -DskipTests -DskipExamples - id: compress-keycloak-maven-repository name: Compress Keycloak Maven artifacts diff --git a/.github/actions/upload-heapdumps/action.yml b/.github/actions/upload-heapdumps/action.yml index d9c71b4d6f..f83228ad9e 100644 --- a/.github/actions/upload-heapdumps/action.yml +++ b/.github/actions/upload-heapdumps/action.yml @@ -11,5 +11,7 @@ runs: uses: actions/upload-artifact@v3 with: name: jvm-heap-dumps - path: '**/java_pid*.hprof' + path: | + '**/java_pid*.hprof' + !distribution/** if-no-files-found: ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e9b045c0d..fefbe55771 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,6 +122,47 @@ jobs: with: job-id: base-integration-tests-${{ matrix.group }} + adapter-integration-tests: + name: Adapter IT + needs: build + runs-on: ubuntu-latest + timeout-minutes: 100 + steps: + - uses: actions/checkout@v4 + + - id: integration-test-setup + name: Integration test setup + uses: ./.github/actions/integration-test-setup + + - name: Build adapter distributions + run: ./mvnw install -DskipTests -f distribution/pom.xml + + - name: Build app servers + run: ./mvnw install -DskipTests -Pbuild-app-servers -f testsuite/integration-arquillian/servers/app-server/pom.xml + + - name: Run adapter tests + run: | + TESTS="org.keycloak.testsuite.adapter.**" + echo "Tests: $TESTS" + ./mvnw test ${{ env.SUREFIRE_RETRY }} -Pauth-server-quarkus -Papp-server-wildfly "-Dwebdriver.chrome.driver=$CHROMEWEBDRIVER/chromedriver" -Dtest=$TESTS -pl testsuite/integration-arquillian/tests/base 2>&1 | misc/log/trimmer.sh + + - name: Upload JVM Heapdumps + if: always() + uses: ./.github/actions/upload-heapdumps + + - uses: ./.github/actions/upload-flaky-tests + name: Upload flaky tests + env: + GH_TOKEN: ${{ github.token }} + with: + job-name: Base IT + + - name: Surefire reports + if: always() + uses: ./.github/actions/archive-surefire-reports + with: + job-id: adapter-integration-tests + quarkus-unit-tests: name: Quarkus UT needs: build @@ -416,6 +457,13 @@ jobs: with: jdk-version: 17 + - name: Build adapter distributions + run: ./mvnw install -DskipTests -f distribution/pom.xml + + - name: Build app servers + run: ./mvnw install -DskipTests -Pbuild-app-servers -f testsuite/integration-arquillian/servers/app-server/pom.xml + + - name: Prepare Quarkus distribution with BCFIPS run: ./mvnw install -e -pl testsuite/integration-arquillian/servers/auth-server/quarkus -Pauth-server-quarkus,auth-server-fips140-2 @@ -649,6 +697,7 @@ jobs: - build - unit-tests - base-integration-tests + - adapter-integration-tests - quarkus-unit-tests - quarkus-integration-tests - jdk-integration-tests diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index 4532fea9aa..814dd4e966 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -37,7 +37,7 @@ ${project.build.directory}/containers ${java.home} ${java.home} - wildfly + disabled ${java.home} @@ -639,19 +639,4 @@ - - - sonatype-snapshots - Sonatype Snapshots - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - true - daily - - - false - - - - diff --git a/testsuite/integration-arquillian/servers/app-server/pom.xml b/testsuite/integration-arquillian/servers/app-server/pom.xml index 36f1eb30af..3ee99ab0d9 100644 --- a/testsuite/integration-arquillian/servers/app-server/pom.xml +++ b/testsuite/integration-arquillian/servers/app-server/pom.xml @@ -37,11 +37,19 @@ app-server-spi - jboss - karaf - tomcat - undertow - jetty + + + build-app-servers + + jboss + karaf + tomcat + undertow + jetty + + + + diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml index ca4d56e079..2b0db69646 100644 --- a/testsuite/integration-arquillian/tests/base/pom.xml +++ b/testsuite/integration-arquillian/tests/base/pom.xml @@ -513,7 +513,6 @@ app-server-wildfly - true app.server wildfly diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java index 3113d3228c..a17eaec11f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java @@ -73,7 +73,7 @@ public class AppServerTestEnricher { private static final Logger log = Logger.getLogger(AppServerTestEnricher.class); - public static final String CURRENT_APP_SERVER = System.getProperty("app.server", "wildfly"); + public static final String CURRENT_APP_SERVER = System.getProperty("app.server", "disabled"); public static final boolean APP_SERVER_SSL_REQUIRED = Boolean.parseBoolean(System.getProperty("app.server.ssl.required", "false")); @Inject private Instance containerConrollerInstance; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractBaseServletAuthzAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/AbstractBaseServletAuthzAdapterTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractBaseServletAuthzAdapterTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/AbstractBaseServletAuthzAdapterTest.java index 4d9472a7d1..5a0f1d999e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractBaseServletAuthzAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/AbstractBaseServletAuthzAdapterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.graphene.page.Page; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractServletAuthzAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/AbstractServletAuthzAdapterTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractServletAuthzAdapterTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/AbstractServletAuthzAdapterTest.java index 913986b4b7..bac42f8940 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractServletAuthzAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/AbstractServletAuthzAdapterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import org.junit.Ignore; import org.junit.Test; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractServletPolicyEnforcerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/AbstractServletPolicyEnforcerTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractServletPolicyEnforcerTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/AbstractServletPolicyEnforcerTest.java index d1d806f1d0..37c1217f0e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/AbstractServletPolicyEnforcerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/AbstractServletPolicyEnforcerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/DefaultAuthzConfigAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/DefaultAuthzConfigAdapterTest.java similarity index 99% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/DefaultAuthzConfigAdapterTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/DefaultAuthzConfigAdapterTest.java index e685aef250..54c64873b3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/DefaultAuthzConfigAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/DefaultAuthzConfigAdapterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/PermissiveModeAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/PermissiveModeAdapterTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/PermissiveModeAdapterTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/PermissiveModeAdapterTest.java index a0577fbbe3..0c337bc541 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/PermissiveModeAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/PermissiveModeAdapterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import java.io.File; import java.io.IOException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCIPAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzCIPAdapterTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCIPAdapterTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzCIPAdapterTest.java index 7d9530286f..8fc312ff35 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCIPAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzCIPAdapterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.Entity; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCacheDisabledAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzCacheDisabledAdapterTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCacheDisabledAdapterTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzCacheDisabledAdapterTest.java index 97ad2b3a53..35468b5e6a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCacheDisabledAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzCacheDisabledAdapterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCacheLifespanAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzCacheLifespanAdapterTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCacheLifespanAdapterTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzCacheLifespanAdapterTest.java index 947c6595f2..9078ad6846 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzCacheLifespanAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzCacheLifespanAdapterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import java.io.File; import java.io.IOException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzLazyLoadPathsAdapterTest.java similarity index 97% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzLazyLoadPathsAdapterTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzLazyLoadPathsAdapterTest.java index 1cdfa75fcf..9b4b6604e4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzLazyLoadPathsAdapterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzNoLazyLoadPathsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzNoLazyLoadPathsAdapterTest.java similarity index 96% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzNoLazyLoadPathsAdapterTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzNoLazyLoadPathsAdapterTest.java index 51ae530d75..e261370040 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletAuthzNoLazyLoadPathsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletAuthzNoLazyLoadPathsAdapterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import java.io.IOException; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletPolicyEnforcerLifespanTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletPolicyEnforcerLifespanTest.java similarity index 97% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletPolicyEnforcerLifespanTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletPolicyEnforcerLifespanTest.java index 828f336faf..9cee4bbc36 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletPolicyEnforcerLifespanTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletPolicyEnforcerLifespanTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import java.io.File; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletPolicyEnforcerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletPolicyEnforcerTest.java similarity index 96% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletPolicyEnforcerTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletPolicyEnforcerTest.java index d9c72259a2..c00bcea934 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/adapter/example/ServletPolicyEnforcerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/authz/example/ServletPolicyEnforcerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.authz.adapter.example; +package org.keycloak.testsuite.adapter.authz.example; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlXMLAttacksTest.java similarity index 98% rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java rename to testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlXMLAttacksTest.java index e0d2652bb7..ab2888985e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlXMLAttacksTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlXMLAttacksTest.java @@ -1,4 +1,4 @@ -package org.keycloak.testsuite.saml; +package org.keycloak.testsuite.adapter.servlet; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; @@ -12,6 +12,7 @@ import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.saml.processing.web.util.PostBindingUtil; import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; +import org.keycloak.testsuite.saml.AbstractSamlTest; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/testsuite/integration-arquillian/tests/base/testsuites/base-suite b/testsuite/integration-arquillian/tests/base/testsuites/base-suite index 4eb4cf52ec..90cfda0b05 100644 --- a/testsuite/integration-arquillian/tests/base/testsuites/base-suite +++ b/testsuite/integration-arquillian/tests/base/testsuites/base-suite @@ -1,6 +1,6 @@ account,4 actions,1 -adapter,2 +adapter,IGNORED admin,1 authz,3 broker,2 diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse61/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse61/pom.xml index 4f8c67e768..165ab3386b 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse61/pom.xml +++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse61/pom.xml @@ -24,7 +24,7 @@ org.keycloak.testsuite integration-arquillian-tests-adapters-karaf - 999-SNAPSHOT + 999.0.0-SNAPSHOT integration-arquillian-tests-adapters-fuse61 diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse62/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse62/pom.xml index 8085daefe8..012da49743 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse62/pom.xml +++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse62/pom.xml @@ -24,7 +24,7 @@ org.keycloak.testsuite integration-arquillian-tests-adapters-karaf - 999-SNAPSHOT + 999.0.0-SNAPSHOT integration-arquillian-tests-adapters-fuse62 diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/karaf3/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/karaf/karaf3/pom.xml index e1bbedf3cb..e4eb4dc312 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/karaf/karaf3/pom.xml +++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/karaf3/pom.xml @@ -24,7 +24,7 @@ org.keycloak.testsuite integration-arquillian-tests-adapters-karaf - 999-SNAPSHOT + 999.0.0-SNAPSHOT integration-arquillian-tests-adapters-karaf3 diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml index fd669a37de..c11a2e159a 100644 --- a/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml +++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml @@ -24,7 +24,7 @@ org.keycloak.testsuite integration-arquillian-tests-adapters - 999-SNAPSHOT + 999.0.0-SNAPSHOT integration-arquillian-tests-adapters-karaf