[syncope] branch master updated: Splitting wa-reference test classes into separate runs on Travis (#246)

[il...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new 3514e04  Splitting wa-reference test classes into separate runs on Travis (#246)
3514e04 is described below

commit 3514e04b4fb7908885a20e8ed713802edfeb4006
Author: Francesco Chicchiriccò <il...@users.noreply.github.com>
AuthorDate: Tue Mar 16 15:48:53 2021 +0100

    Splitting wa-reference test classes into separate runs on Travis (#246)
---
 .travis.yml                                        | 41 ++++++++++++++--------
 .../syncope/core/logic/saml2/SAML2ClientCache.java |  5 ++-
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b2359a8..34f1f42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,6 @@ git:
 env:
   global:
   - MAVEN_OPTS="-Xmx4096M -Xss128M -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -noverify"
-  - DBMS=H2
   - jaxrsContentType=application/json
   - TestCommand="mvn -U -T 1C clean test -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dsass.skip=true"
 before_install:
@@ -78,42 +77,54 @@ jobs:
       script: mvn -f core/persistence-jpa-json/pom.xml -P mysql -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Dsass.skip=true
       ######################################################
     - stage: fit
-      name: "Integration Tests: Tomcat / H2 / JSON Content-Type"
+      name: "Integration Tests: Tomcat / H2 / JSON"
       script: mvn -f fit/core-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: Tomcat / H2 / XML Content-Type"
+      name: "Integration Tests: Tomcat / H2 / XML"
       script: mvn -f fit/core-reference/pom.xml verify -Djaxrs.content.type=application/xml -Dit.test=org.apache.syncope.fit.core.*ITCase -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: Tomcat / H2 / YAML Content-Type"
+      name: "Integration Tests: Tomcat / H2 / YAML"
       script: mvn -f fit/core-reference/pom.xml verify -Djaxrs.content.type=application/yaml -Dit.test=org.apache.syncope.fit.core.*ITCase -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: Wildfly / H2 / JSON Content-Type"
+      name: "Integration Tests: Wildfly / H2 / JSON"
       script: mvn -f fit/core-reference/pom.xml -P wildfly-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: Payara / H2 / JSON Content-Type"
+      name: "Integration Tests: Payara / H2 / JSON"
       script: mvn -f fit/core-reference/pom.xml -P payara-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: Tomcat / PostgreSQL / JSON Content-Type"
+      name: "Integration Tests: Tomcat / PostgreSQL / JSON"
       script: mvn -f fit/core-reference/pom.xml -P postgres-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: Tomcat / PostgreSQL (JSONB) / JSON Content-Type"
+      name: "Integration Tests: Tomcat / PostgreSQL (JSONB) / JSON"
       script: mvn -f fit/core-reference/pom.xml -P pgjsonb-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: Tomcat / MySQL / JSON Content-Type"
+      name: "Integration Tests: Tomcat / MySQL / JSON"
       script: mvn -f fit/core-reference/pom.xml -P mysql-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: Tomcat / MySQL (JSON) / JSON Content-Type"
+      name: "Integration Tests: Tomcat / MySQL (JSON) / JSON"
       script: mvn -f fit/core-reference/pom.xml -P myjson-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: Tomcat / MariaDB / JSON Content-Type"
+      name: "Integration Tests: Tomcat / MariaDB / JSON"
       script: mvn -f fit/core-reference/pom.xml -P mariadb-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: Tomcat / H2 / JSON Content-Type + Elasticsearch"
+      name: "Integration Tests: Tomcat / H2 / JSON + Elasticsearch"
       script: mvn -f fit/core-reference/pom.xml -P elasticsearch-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: Tomcat / H2 / JSON Content-Type + Zookeeper"
+      name: "Integration Tests: Tomcat / H2 / JSON + Zookeeper"
       script: mvn -f fit/core-reference/pom.xml -P zookeeper-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true
     - stage: fit
-      name: "Integration Tests: SRA and WA"
-      script: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true "-Dit.test=!*SAML*"
+      name: "WA: SRA Integration Tests: CAS client"
+      script: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.CASSRAITCase
+    - stage: fit
+      name: "WA: SRA Integration Tests: OAuth 2.0"
+      script: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.OAUTH2SRAITCase
+    - stage: fit
+      name: "WA: SRA Integration Tests:OIDC 1.0"
+      script: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.OIDCSRAITCase
+    - stage: fit
+      name: "WA: SRA Integration Tests:  SAML 2.0"
+      script: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.sra.SAML2SRAITCase
+    - stage: fit
+      name: "WA: SSO Integration Tests: SAML2SP4UI / OIDC4UI"
+      script: mvn -f fit/wa-reference/pom.xml verify -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Dianal.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true -Dit.test=org.apache.syncope.fit.ui.OIDC4UIITCase
     #####################################################
diff --git a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ClientCache.java b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ClientCache.java
index 6db5727..af95548 100644
--- a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ClientCache.java
+++ b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2ClientCache.java
@@ -27,6 +27,7 @@ import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.syncope.common.lib.to.ItemTO;
 import org.apache.syncope.common.lib.to.SAML2SP4UIIdPTO;
@@ -63,8 +64,10 @@ public class SAML2ClientCache {
     }
 
     public static Optional<String> getSPMetadataPath(final String spEntityID) {
+        String entityIDPath = StringUtils.replaceChars(
+                StringUtils.removeStart(StringUtils.removeStart(spEntityID, "https://"), "http://"), ":/", "__");
         return Optional.ofNullable(METADATA_PATH).
-                map(path -> Optional.of(path.resolve(spEntityID).toAbsolutePath().toString())).
+                map(path -> Optional.of(path.resolve(entityIDPath).toAbsolutePath().toString())).
                 orElse(Optional.empty());
     }