This is an automated email from the ASF dual-hosted git repository.
ilgrosso 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 7691e4c Fixing test content
7691e4c is described below
commit 7691e4cc64cb8f1f3d5f9ec24770a151e953a055
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Mar 25 13:55:38 2020 +0100
Fixing test content
---
.../common/lib/policy/DefaultAuthPolicyConf.java | 1 -
.../common/lib/types/AMImplementationType.java | 9 ++++-----
.../src/test/resources/domains/MasterContent.xml | 22 +++++++++-------------
.../src/test/resources/domains/MasterContent.xml | 22 +++++++++-------------
.../org/apache/syncope/fit/core/PolicyITCase.java | 2 +-
5 files changed, 23 insertions(+), 33 deletions(-)
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAuthPolicyConf.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAuthPolicyConf.java
index 08ebb4e..3076d39 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAuthPolicyConf.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/policy/DefaultAuthPolicyConf.java
@@ -40,5 +40,4 @@ public class DefaultAuthPolicyConf extends
AbstractAuthPolicyConf implements Aut
public List<String> getAuthModules() {
return authModules;
}
-
}
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AMImplementationType.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AMImplementationType.java
index 430f0cf..6c6be03 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AMImplementationType.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/types/AMImplementationType.java
@@ -37,16 +37,15 @@ public final class AMImplementationType {
private static final Map<String, String> VALUES = Map.ofEntries(
Pair.of(AUTH_MODULE_CONFIGURATIONS,
-
"org.apache.syncope.common.lib.authentication.policy.AuthPolicyConf"),
+ "org.apache.syncope.common.lib.auth.AuthModuleConf"),
Pair.of(AUTH_POLICY_CONFIGURATIONS,
-
"org.apache.syncope.common.lib.authentication.module.AuthModuleConf"),
+ "org.apache.syncope.common.lib.policy.AuthPolicyConf"),
Pair.of(ATTR_RELEASE_POLICY_CONFIGURATIONS,
-
"org.apache.syncope.common.lib.authentication.module.AuthModuleConf"),
+
"org.apache.syncope.common.lib.policy.AttrReleasePolicyConf"),
Pair.of(ACCESS_POLICY_CONFIGURATIONS,
-
"org.apache.syncope.common.lib.attrs.AttrReleasePolicyConf"));
+ "org.apache.syncope.common.lib.policy.AccessPolicyConf"));
public static Map<String, String> values() {
return VALUES;
}
-
}
diff --git
a/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
b/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
index 510cf48..be9293a 100644
--- a/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa-json/src/test/resources/domains/MasterContent.xml
@@ -46,27 +46,23 @@ under the License.
<!-- authentication policies -->
<Implementation id="MyDefaultAuthPolicyConf"
type="AUTH_POLICY_CONFIGURATIONS" engine="JAVA"
-
body='{"@class":"org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf","authModules":["LdapAuthenticationTest"]}'/>
- <AuthPolicy id="659b9906-4b6e-4bc0-aca0-6809dff346d4"
name="MyDefaultAuthPolicyConf"
- description="an authentication policy"/>
- <AuthPolicy id="b912a0d4-a890-416f-9ab8-84ab077eb028"
name="DefaultAuthPolicy"
- description="Default authentication policy"/>
+
body='{"@class":"org.apache.syncope.common.lib.policy.DefaultAuthPolicyConf","authModules":["LdapAuthenticationTest"]}'/>
+ <AuthPolicy id="659b9906-4b6e-4bc0-aca0-6809dff346d4"
name="MyDefaultAuthPolicyConf" description="an authentication policy"/>
+ <AuthPolicy id="b912a0d4-a890-416f-9ab8-84ab077eb028"
name="DefaultAuthPolicy" description="Default authentication policy"/>
<AuthModule id="be456831-593d-4003-b273-4c3fb61700df"
name="DefaultAuthModule"/>
-
+
<!-- access policies -->
<Implementation id="MyDefaultAccessPolicyConf"
type="ACCESS_POLICY_CONFIGURATIONS" engine="JAVA"
-
body='{"@class":"org.apache.syncope.common.lib.access.DefaultAccessPolicyConf","name":"MyDefaultAccessPolicyConf","enabled":true,"ssoEnabled":true}'/>
- <AccessPolicy id="419935c7-deb3-40b3-8a9a-683037e523a2"
name="MyDefaultAccessPolicyConf"
- description="an access policy"/>
+
body='{"@class":"org.apache.syncope.common.lib.policy.DefaultAccessPolicyConf","name":"MyDefaultAccessPolicyConf","enabled":true,"ssoEnabled":true}'/>
+ <AccessPolicy id="419935c7-deb3-40b3-8a9a-683037e523a2"
name="MyDefaultAccessPolicyConf" description="an access policy"/>
<!-- Attr Release Policies -->
<Implementation id="AllowedAttrReleasePolicyConf"
type="ATTR_RELEASE_CONFIGURATIONS" engine="JAVA"
-
body='{"@class":"org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf","name":"AllowedAttrReleasePolicy","allowedAttributes":["cn","givenName","uid"]}'/>
- <AttrReleasePolicy id="319935c7-deb3-40b3-8a9a-683037e523a2"
name="AllowedAttrReleasePolicy"
- description="allowed attribute release policy policy"/>
+
body='{"@class":"org.apache.syncope.common.lib.policy.AllowedAttrReleasePolicyConf","name":"AllowedAttrReleasePolicy","allowedAttributes":["cn","givenName","uid"]}'/>
+ <AttrReleasePolicy id="319935c7-deb3-40b3-8a9a-683037e523a2"
name="AllowedAttrReleasePolicy" description="allowed attribute release policy
policy"/>
<Implementation id="DenyAttrReleasePolicyConf"
type="ATTR_RELEASE_CONFIGURATIONS" engine="JAVA"
-
body='{"@class":"org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf","name":"DenyAttrReleasePolicyConf"}'/>
+
body='{"@class":"org.apache.syncope.common.lib.policy.AllowedAttrReleasePolicyConf","name":"DenyAttrReleasePolicyConf"}'/>
<AttrReleasePolicy id="219935c7-deb3-40b3-8a9a-683037e523a2"
name="DenyAttrReleasePolicy" description="deny attribute release policy
policy"/>
<RelationshipType id="inclusion" description="Models the act that an object
is included in another"/>
diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
index d801f31..29fe303 100644
--- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
@@ -46,27 +46,23 @@ under the License.
<!-- authentication policies -->
<Implementation id="MyDefaultAuthPolicyConf"
type="AUTH_POLICY_CONFIGURATIONS" engine="JAVA"
-
body='{"@class":"org.apache.syncope.common.lib.authentication.policy.DefaultAuthPolicyConf","authModules":["LdapAuthenticationTest"]}'/>
- <AuthPolicy id="659b9906-4b6e-4bc0-aca0-6809dff346d4"
name="MyDefaultAuthPolicyConf"
- description="an authentication policy"/>
- <AuthPolicy id="b912a0d4-a890-416f-9ab8-84ab077eb028"
name="DefaultAuthPolicy"
- description="Default authentication policy"/>
+
body='{"@class":"org.apache.syncope.common.lib.policy.DefaultAuthPolicyConf","authModules":["LdapAuthenticationTest"]}'/>
+ <AuthPolicy id="659b9906-4b6e-4bc0-aca0-6809dff346d4"
name="MyDefaultAuthPolicyConf" description="an authentication policy"/>
+ <AuthPolicy id="b912a0d4-a890-416f-9ab8-84ab077eb028"
name="DefaultAuthPolicy" description="Default authentication policy"/>
<AuthModule id="be456831-593d-4003-b273-4c3fb61700df"
name="DefaultAuthModule"/>
-
+
<!-- access policies -->
<Implementation id="MyDefaultAccessPolicyConf"
type="ACCESS_POLICY_CONFIGURATIONS" engine="JAVA"
-
body='{"@class":"org.apache.syncope.common.lib.access.DefaultAccessPolicyConf","name":"MyDefaultAccessPolicyConf","enabled":true,"ssoEnabled":true}'/>
- <AccessPolicy id="419935c7-deb3-40b3-8a9a-683037e523a2"
name="MyDefaultAccessPolicyConf"
- description="an access policy"/>
+
body='{"@class":"org.apache.syncope.common.lib.policy.DefaultAccessPolicyConf","name":"MyDefaultAccessPolicyConf","enabled":true,"ssoEnabled":true}'/>
+ <AccessPolicy id="419935c7-deb3-40b3-8a9a-683037e523a2"
name="MyDefaultAccessPolicyConf" description="an access policy"/>
<!-- Attr Release Policies -->
<Implementation id="AllowedAttrReleasePolicyConf"
type="ATTR_RELEASE_CONFIGURATIONS" engine="JAVA"
-
body='{"@class":"org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf","name":"AllowedAttrReleasePolicy","allowedAttributes":["cn","givenName","uid"]}'/>
- <AttrReleasePolicy id="319935c7-deb3-40b3-8a9a-683037e523a2"
name="AllowedAttrReleasePolicy"
- description="allowed attribute release policy policy"/>
+
body='{"@class":"org.apache.syncope.common.lib.policy.AllowedAttrReleasePolicyConf","name":"AllowedAttrReleasePolicy","allowedAttributes":["cn","givenName","uid"]}'/>
+ <AttrReleasePolicy id="319935c7-deb3-40b3-8a9a-683037e523a2"
name="AllowedAttrReleasePolicy" description="allowed attribute release policy
policy"/>
<Implementation id="DenyAttrReleasePolicyConf"
type="ATTR_RELEASE_CONFIGURATIONS" engine="JAVA"
-
body='{"@class":"org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf","name":"DenyAttrReleasePolicyConf"}'/>
+
body='{"@class":"org.apache.syncope.common.lib.policy.AllowedAttrReleasePolicyConf","name":"DenyAttrReleasePolicyConf"}'/>
<AttrReleasePolicy id="219935c7-deb3-40b3-8a9a-683037e523a2"
name="DenyAttrReleasePolicy" description="deny attribute release policy
policy"/>
<RelationshipType id="inclusion" description="Models the act that an object
is included in another"/>
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
index b35211f..8aa015b 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PolicyITCase.java
@@ -63,7 +63,7 @@ import org.apache.syncope.common.lib.to.AuthPolicyTO;
public class PolicyITCase extends AbstractITCase {
private static AuthPolicyTO buildAuthPolicyTO() {
- final String authPolicyName = "TestAuthPolicy" + getUUIDString();
+ String authPolicyName = "TestAuthPolicy" + getUUIDString();
ImplementationTO implementationTO = null;
try {
implementationTO = implementationService.read(
