You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by jb...@apache.org on 2013/01/28 13:29:09 UTC
svn commit: r1439366 - in /syncope/trunk:
common/src/main/java/org/apache/syncope/common/to/
core/src/test/java/org/apache/syncope/core/rest/jaxrs/
Author: jbernhardt
Date: Mon Jan 28 12:29:09 2013
New Revision: 1439366
URL: http://svn.apache.org/viewvc?rev=1439366&view=rev
Log:
[SYNCOPE-231] Fixing CXF Tests
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AccountPolicyTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PasswordPolicyTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PolicyTO.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncPolicyTO.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/PolicyTestITCaseJAXRS.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/SchemaTestITCaseJAXRS.java
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AccountPolicyTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AccountPolicyTO.java?rev=1439366&r1=1439365&r2=1439366&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AccountPolicyTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/AccountPolicyTO.java Mon Jan 28 12:29:09 2013
@@ -39,9 +39,10 @@ public class AccountPolicyTO extends Pol
public AccountPolicyTO(boolean global) {
super();
- this.type = global
+ PolicyType type = global
? PolicyType.GLOBAL_ACCOUNT
: PolicyType.ACCOUNT;
+ setType(type);
}
public void setSpecification(final AccountPolicySpec specification) {
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PasswordPolicyTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PasswordPolicyTO.java?rev=1439366&r1=1439365&r2=1439366&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PasswordPolicyTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PasswordPolicyTO.java Mon Jan 28 12:29:09 2013
@@ -39,9 +39,10 @@ public class PasswordPolicyTO extends Po
public PasswordPolicyTO(boolean global) {
super();
- this.type = global
+ PolicyType type = global
? PolicyType.GLOBAL_PASSWORD
: PolicyType.PASSWORD;
+ setType(type);
}
public void setSpecification(final PasswordPolicySpec specification) {
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PolicyTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PolicyTO.java?rev=1439366&r1=1439365&r2=1439366&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PolicyTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/PolicyTO.java Mon Jan 28 12:29:09 2013
@@ -37,7 +37,7 @@ public abstract class PolicyTO extends A
private String description;
- protected PolicyType type;
+ private PolicyType type;
public long getId() {
return id;
@@ -58,4 +58,8 @@ public abstract class PolicyTO extends A
public PolicyType getType() {
return type;
}
+
+ public void setType(PolicyType type) {
+ this.type = type;
+ }
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncPolicyTO.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncPolicyTO.java?rev=1439366&r1=1439365&r2=1439366&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncPolicyTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/SyncPolicyTO.java Mon Jan 28 12:29:09 2013
@@ -39,9 +39,10 @@ public class SyncPolicyTO extends Policy
public SyncPolicyTO(boolean global) {
super();
- this.type = global
+ PolicyType type = global
? PolicyType.GLOBAL_SYNC
: PolicyType.SYNC;
+ setType(type);
}
public void setSpecification(final SyncPolicySpec specification) {
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/PolicyTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/PolicyTestITCaseJAXRS.java?rev=1439366&r1=1439365&r2=1439366&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/PolicyTestITCaseJAXRS.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/PolicyTestITCaseJAXRS.java Mon Jan 28 12:29:09 2013
@@ -24,8 +24,10 @@ import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.JVM)
public class PolicyTestITCaseJAXRS extends PolicyTestITCase {
-
+
public PolicyTestITCaseJAXRS() {
- setEnabledCXF(true);
+ setEnabledCXF(true);
+ // JSON is currently not working (fix after CXF migration is complete)
+ setContentType(super.CONTENT_TYPE_XML);
}
}
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/SchemaTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/SchemaTestITCaseJAXRS.java?rev=1439366&r1=1439365&r2=1439366&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/SchemaTestITCaseJAXRS.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/SchemaTestITCaseJAXRS.java Mon Jan 28 12:29:09 2013
@@ -26,8 +26,8 @@ import org.junit.runners.MethodSorters;
public class SchemaTestITCaseJAXRS extends SchemaTestITCase {
public SchemaTestITCaseJAXRS() {
- setEnabledCXF(true);
- //JSON is currently not working (fix after CXF migration is complete)
- setContentType(super.CONTENT_TYPE_XML);
+ setEnabledCXF(true);
+ // JSON is currently not working (fix after CXF migration is complete)
+ setContentType(super.CONTENT_TYPE_XML);
}
}