[syncope] branch SYNCOPE-163-1 updated: started with ITs

[mm...@apache.org]

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

mmoayyed pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
     new 7501a59  started with ITs
7501a59 is described below

commit 7501a59430335ab54b5fb4d90e927557122eb760
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Thu Feb 27 17:51:04 2020 +0330

    started with ITs
---
 .../lib/authentication/AbstractAuthenticationModuleConf.java     | 2 ++
 .../lib/authentication/DefaultAuthenticationPolicyConf.java      | 2 +-
 .../src/test/java/org/apache/syncope/fit/AbstractITCase.java     | 9 +++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationModuleConf.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationModuleConf.java
index 94d9c90..c7b3ba7 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationModuleConf.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationModuleConf.java
@@ -18,11 +18,13 @@
  */
 package org.apache.syncope.common.lib.authentication;
 
+import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 
 import java.io.Serializable;
 
 @XmlType
+@XmlSeeAlso({JaasAuthenticationModuleConf.class, PredefinedAuthenticationModuleConf.class})
 public abstract class AbstractAuthenticationModuleConf implements Serializable, AuthenticationModuleConf {
 
     private static final long serialVersionUID = 4153200197344709778L;
diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/DefaultAuthenticationPolicyConf.java b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/DefaultAuthenticationPolicyConf.java
index 467ecfb..7142a3c 100644
--- a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/DefaultAuthenticationPolicyConf.java
+++ b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/DefaultAuthenticationPolicyConf.java
@@ -27,7 +27,7 @@ import java.util.List;
 
 @XmlRootElement(name = "defaultAuthenticationModuleConf")
 @XmlType
-public class DefaultAuthenticationPolicyConf extends AbstractAuthenticationModuleConf {
+public class DefaultAuthenticationPolicyConf extends AbstractAuthenticationPolicyConf {
     private static final long serialVersionUID = -2969836600059025380L;
 
     private List<String> authenticationModules = new ArrayList<>();
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
index 111690f..895ff5d 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java
@@ -90,6 +90,7 @@ import org.apache.syncope.common.rest.api.service.ConnectorService;
 import org.apache.syncope.common.rest.api.service.DynRealmService;
 import org.apache.syncope.common.rest.api.service.LoggerService;
 import org.apache.syncope.common.rest.api.service.NotificationService;
+import org.apache.syncope.common.rest.api.service.OpenIdConnectRelyingPartyService;
 import org.apache.syncope.common.rest.api.service.PolicyService;
 import org.apache.syncope.common.rest.api.service.ReportService;
 import org.apache.syncope.common.rest.api.service.ResourceService;
@@ -106,6 +107,7 @@ import org.apache.syncope.common.rest.api.service.ReportTemplateService;
 import org.apache.syncope.common.rest.api.service.RoleService;
 import org.apache.syncope.common.rest.api.service.SAML2IdPService;
 import org.apache.syncope.common.rest.api.service.SAML2SPService;
+import org.apache.syncope.common.rest.api.service.SAML2ServiceProviderService;
 import org.apache.syncope.common.rest.api.service.SCIMConfService;
 import org.apache.syncope.common.rest.api.service.SchemaService;
 import org.apache.syncope.common.rest.api.service.SecurityQuestionService;
@@ -117,6 +119,7 @@ import org.apache.syncope.common.rest.api.service.UserRequestService;
 import org.apache.syncope.common.rest.api.service.BpmnProcessService;
 import org.apache.syncope.common.rest.api.service.GatewayRouteService;
 import org.apache.syncope.common.rest.api.service.UserWorkflowTaskService;
+import org.apache.syncope.core.persistence.api.entity.authentication.OpenIdConnectRelyingParty;
 import org.apache.syncope.fit.core.CoreITContext;
 import org.apache.syncope.fit.core.UserITCase;
 import org.identityconnectors.common.security.Encryptor;
@@ -286,6 +289,10 @@ public abstract class AbstractITCase {
 
     protected static SCIMConfService scimConfService;
 
+    protected static OpenIdConnectRelyingPartyService openIdConnectRelyingPartyService;
+
+    protected static SAML2ServiceProviderService saml2ServiceProviderService;
+
     @BeforeAll
     public static void securitySetup() {
         try (InputStream propStream = Encryptor.class.getResourceAsStream("/security.properties")) {
@@ -355,6 +362,8 @@ public abstract class AbstractITCase {
         oidcClientService = adminClient.getService(OIDCClientService.class);
         oidcProviderService = adminClient.getService(OIDCProviderService.class);
         scimConfService = adminClient.getService(SCIMConfService.class);
+        openIdConnectRelyingPartyService = adminClient.getService(OpenIdConnectRelyingPartyService.class);
+        saml2ServiceProviderService = adminClient.getService(SAML2ServiceProviderService.class);
     }
 
     @Autowired