Author: ilgrosso
Date: Tue Dec 4 14:07:25 2012
New Revision: 1416947
URL: http://svn.apache.org/viewvc?rev=1416947&view=rev
Log:
Merge from 1_0_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/LoggerTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserRequestTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1416868-1416936
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/Notification.java
Tue Dec 4 14:07:25 2012
@@ -35,8 +35,8 @@ import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import org.apache.syncope.client.search.NodeCond;
-import org.apache.syncope.core.persistence.validation.entity.NotificationCheck;
import org.apache.syncope.client.util.XMLSerializer;
+import org.apache.syncope.core.persistence.validation.entity.NotificationCheck;
import org.apache.syncope.types.IntMappingType;
import org.apache.syncope.types.TraceLevel;
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserTest.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserTest.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserTest.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/UserTest.java
Tue Dec 4 14:07:25 2012
@@ -18,10 +18,10 @@
*/
package org.apache.syncope.core.persistence.relationships;
-import java.util.List;
import static org.junit.Assert.*;
-import org.junit.Test;
+import java.util.List;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.apache.syncope.core.persistence.beans.user.UAttr;
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -38,7 +38,10 @@ import org.apache.syncope.client.validat
import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.types.SchemaType;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class AuthenticationTestITCase extends AbstractTest {
@Test
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -27,7 +27,10 @@ import org.junit.Test;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpStatusCodeException;
import org.apache.syncope.client.to.ConfigurationTO;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class ConfigurationTestITCase extends AbstractTest {
@Test
@@ -56,7 +59,7 @@ public class ConfigurationTestITCase ext
ConfigurationTO deletedConfig =
restTemplate.getForObject(
- BASE_URL + "configuration/delete/{key}.json",
ConfigurationTO.class, "token.length");
+ BASE_URL + "configuration/delete/{key}.json",
ConfigurationTO.class, "token.length");
assertNotNull(deletedConfig);
try {
restTemplate
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -45,7 +45,10 @@ import org.apache.syncope.types.ConnConf
import org.apache.syncope.types.ConnConfProperty;
import org.apache.syncope.types.ConnectorCapability;
import org.apache.syncope.types.IntMappingType;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class ConnInstanceTestITCase extends AbstractTest {
private static String connidSoapVersion;
@@ -523,7 +526,8 @@ public class ConnInstanceTestITCase exte
assertNotNull(schemaNames);
assertFalse(schemaNames.isEmpty());
- schemaNames = Arrays.asList(restTemplate.postForObject(BASE_URL +
"connector/schema/list", conn, String[].class));
+ schemaNames = Arrays.
+ asList(restTemplate.postForObject(BASE_URL +
"connector/schema/list", conn, String[].class));
assertNotNull(schemaNames);
assertEquals(0, schemaNames.size());
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/DerivedSchemaTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -18,14 +18,18 @@
*/
package org.apache.syncope.core.rest;
+import static org.junit.Assert.*;
+
import
org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
import java.util.Arrays;
import java.util.List;
import org.apache.syncope.client.to.DerivedSchemaTO;
import org.junit.Test;
import org.apache.syncope.types.SyncopeClientExceptionType;
-import static org.junit.Assert.*;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class DerivedSchemaTestITCase extends AbstractTest {
@Test
@@ -69,7 +73,7 @@ public class DerivedSchemaTestITCase ext
DerivedSchemaTO schemaToDelete =
restTemplate.getForObject(
- BASE_URL + "derivedSchema/role/delete/{schema}",
DerivedSchemaTO.class, schema.getName());
+ BASE_URL + "derivedSchema/role/delete/{schema}",
DerivedSchemaTO.class, schema.getName());
assertNotNull(schemaToDelete);
Throwable t = null;
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/LoggerTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/LoggerTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/LoggerTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/LoggerTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -27,7 +27,10 @@ import org.apache.syncope.client.to.Logg
import org.apache.syncope.types.AuditElements;
import org.apache.syncope.types.AuditLoggerName;
import org.apache.syncope.types.SyncopeLoggerLevel;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class LoggerTestITCase extends AbstractTest {
@Test
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -31,8 +31,11 @@ import org.apache.syncope.client.validat
import org.apache.syncope.types.IntMappingType;
import org.apache.syncope.types.SyncopeClientExceptionType;
import org.apache.syncope.types.TraceLevel;
+import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class NotificationTestITCase extends AbstractTest {
@Test
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/PolicyTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -32,7 +32,10 @@ import org.apache.syncope.types.Password
import org.apache.syncope.types.PolicyType;
import org.apache.syncope.types.SyncPolicySpec;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class PolicyTestITCase extends AbstractTest {
@Test
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ReportTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -36,7 +36,10 @@ import org.apache.syncope.client.report.
import org.apache.syncope.client.to.ReportExecTO;
import org.apache.syncope.client.to.ReportTO;
import org.apache.syncope.client.to.UserTO;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class ReportTestITCase extends AbstractTest {
@Test
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -37,7 +37,10 @@ import org.apache.syncope.types.ConnConf
import org.apache.syncope.types.ConnConfProperty;
import org.apache.syncope.types.IntMappingType;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class ResourceTestITCase extends AbstractTest {
@Test
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -18,10 +18,10 @@
*/
package org.apache.syncope.core.rest;
-import java.util.ArrayList;
import static org.junit.Assert.*;
import java.util.Arrays;
+import java.util.ArrayList;
import java.util.List;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.impl.client.DefaultHttpClient;
@@ -37,7 +37,10 @@ import org.apache.syncope.types.SyncopeC
import org.junit.Test;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpStatusCodeException;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class RoleTestITCase extends AbstractTest {
@Test
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SchemaTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -33,10 +33,13 @@ import org.apache.syncope.client.validat
import org.apache.syncope.types.EntityViolationType;
import org.apache.syncope.types.SchemaType;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.junit.FixMethodOrder;
import org.junit.Test;
+import org.junit.runners.MethodSorters;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpClientErrorException;
+@FixMethodOrder(MethodSorters.JVM)
public class SchemaTestITCase extends AbstractTest {
@Test
@@ -111,8 +114,8 @@ public class SchemaTestITCase extends Ab
@Test
public void delete() {
- SchemaTO deletedSchema =
- restTemplate.getForObject(BASE_URL +
"schema/user/delete/cool.json", SchemaTO.class);
+ SchemaTO deletedSchema =
+ restTemplate.getForObject(BASE_URL +
"schema/user/delete/cool.json", SchemaTO.class);
assertNotNull(deletedSchema);
SchemaTO firstname = null;
try {
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -44,8 +44,11 @@ import org.apache.syncope.types.Propagat
import org.apache.syncope.core.quartz.TestSyncActions;
import org.apache.syncope.types.IntMappingType;
import org.apache.syncope.types.TraceLevel;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
import org.springframework.jdbc.core.JdbcTemplate;
+@FixMethodOrder(MethodSorters.JVM)
public class TaskTestITCase extends AbstractTest {
@Test
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserRequestTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserRequestTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserRequestTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserRequestTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -37,7 +37,10 @@ import org.apache.syncope.client.to.User
import
org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
import org.apache.syncope.client.validation.SyncopeClientException;
import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class UserRequestTestITCase extends AbstractTest {
@Test
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -66,9 +66,12 @@ import org.apache.syncope.types.CipherAl
import org.apache.syncope.types.PropagationTaskExecStatus;
import org.apache.syncope.types.SyncopeClientExceptionType;
import org.junit.Assume;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
import org.springframework.util.StringUtils;
import org.springframework.web.client.HttpClientErrorException;
+@FixMethodOrder(MethodSorters.JVM)
public class UserTestITCase extends AbstractTest {
public static UserTO getSampleTO(final String email) {
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirtualSchemaTestITCase.java
Tue Dec 4 14:07:25 2012
@@ -18,14 +18,18 @@
*/
package org.apache.syncope.core.rest;
-import
org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.apache.syncope.types.SyncopeClientExceptionType;
+import static org.junit.Assert.*;
+
import java.util.Arrays;
import java.util.List;
import org.apache.syncope.client.to.VirtualSchemaTO;
+import
org.apache.syncope.client.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.types.SyncopeClientExceptionType;
+import org.junit.FixMethodOrder;
import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.runners.MethodSorters;
+@FixMethodOrder(MethodSorters.JVM)
public class VirtualSchemaTestITCase extends AbstractTest {
@Test
@@ -65,9 +69,9 @@ public class VirtualSchemaTestITCase ext
VirtualSchemaTO.class);
assertNotNull(schema);
- VirtualSchemaTO deletedSchema =
- restTemplate.getForObject(BASE_URL +
"virtualSchema/role/delete/{schema}", VirtualSchemaTO.class,
- schema.getName());
+ VirtualSchemaTO deletedSchema =
+ restTemplate.getForObject(BASE_URL +
"virtualSchema/role/delete/{schema}", VirtualSchemaTO.class,
+ schema.getName());
assertNotNull(deletedSchema);
Throwable t = null;
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1416947&r1=1416946&r2=1416947&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Dec 4 14:07:25 2012
@@ -289,7 +289,7 @@ under the License.
<logback.version>1.0.7</logback.version>
<slf4j.version>1.7.2</slf4j.version>
- <junit.version>4.10</junit.version>
+ <junit.version>4.11</junit.version>
<selenium-java-client-driver.version>1.0.2</selenium-java-client-driver.version>
<apacheds.version>1.5.7</apacheds.version>
