You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by as...@apache.org on 2013/01/26 19:44:30 UTC
svn commit: r1438941 - in /syncope/trunk/core: ./
src/test/java/org/apache/syncope/core/rest/
src/test/java/org/apache/syncope/core/rest/jaxrs/
Author: ashakirin
Date: Sat Jan 26 18:44:29 2013
New Revision: 1438941
URL: http://svn.apache.org/viewvc?rev=1438941&view=rev
Log:
[SYNCOPE-289] Reverted to non-parameterized tests, introduced new profile (jaxrs) for CXF tests, added environment variable for content type (jaxrs.content.type)
Added:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ConfigurationTestITCaseJAXRS.java (with props)
Modified:
syncope/trunk/core/pom.xml
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.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/SearchTestITCase.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/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java
Modified: syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1438941&r1=1438940&r2=1438941&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Sat Jan 26 18:44:29 2013
@@ -1267,6 +1267,44 @@ under the License.
</build>
</profile>
+ <profile>
+ <id>jaxrs</id>
+ <properties>
+ <waitForCheck>true</waitForCheck>
+ <javaagent />
+ </properties>
+ <build>
+ <defaultGoal>clean verify</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <excludes>
+ <exclude>**/*TestITCase.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*TestITCaseJAXRS.java</include>
+ </includes>
+ <systemPropertyVariables>
+ <jaxrsContentType>${jaxrs.content.type}</jaxrsContentType>
+ </systemPropertyVariables>
+ </configuration>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java?rev=1438941&r1=1438940&r2=1438941&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java Sat Jan 26 18:44:29 2013
@@ -69,7 +69,6 @@ import org.apache.syncope.common.to.Attr
import org.apache.syncope.common.validation.SyncopeClientErrorHandler;
import org.junit.Before;
import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,10 +76,10 @@ import org.springframework.beans.factory
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestContextManager;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.RestTemplate;
-@RunWith(Parameterized.class)
+@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:restClientContext.xml", "classpath:testJDBCContext.xml"})
public abstract class AbstractTest {
@@ -94,8 +93,9 @@ public abstract class AbstractTest {
protected static final String ADMIN_UID = "admin";
protected static final String ADMIN_PWD = "password";
-
- protected boolean activatedCXF;
+
+ private static final String DEFAULT_CONTENT_TYPE = "application/json";
+ private static final String ENV_KEY_CONTENT_TYPE = "jaxrsContentType";
@Autowired
private RestTemplate restTemplate;
@@ -106,16 +106,16 @@ public abstract class AbstractTest {
@Autowired
private PreemptiveAuthHttpRequestFactory httpClientFactory;
- protected String contentType;
-
- private TestContextManager testContextManager;
-
@Autowired
protected JAXRSClientFactoryBean restClientFactory;
@Autowired
protected DataSource testDataSource;
+ private boolean enabledCXF;
+
+ private String contentType;
+
protected UserService userService;
protected RoleService roleService;
@@ -143,24 +143,10 @@ public abstract class AbstractTest {
protected UserRequestService userRequestService;
protected PolicyService policyService;
-
- public AbstractTest(final String contentType) {
- this.contentType = contentType;
- }
-
- private void setupContext() throws Exception {
- this.testContextManager = new TestContextManager(getClass());
- this.testContextManager.prepareTestInstance(this);
- }
-
- protected void activateCXF() {
- activatedCXF = true;
- }
-
+
@Before
public void setup() throws Exception {
- setupContext();
- if (!activatedCXF) {
+ if (!enabledCXF) {
resetRestTemplate();
} else {
setupCXFServices();
@@ -206,8 +192,6 @@ public abstract class AbstractTest {
// BEGIN CXF Initialization
public void setupCXFServices() throws Exception {
- setupContext();
- restClientFactory.setUsername(ADMIN_UID);
userService = createServiceInstance(UserService.class);
roleService = createServiceInstance(RoleService.class);
resourceService = createServiceInstance(ResourceService.class);
@@ -224,16 +208,12 @@ public abstract class AbstractTest {
userRequestService = createServiceInstance(UserRequestService.class);
}
- public void setupConentType(Client restClient) {
- restClient.type(contentType).accept(contentType);
- }
-
protected <T> T createServiceInstance(Class<T> serviceClass) {
return createServiceInstance(serviceClass, ADMIN_UID);
}
protected <T> T createServiceInstance(Class<T> serviceClass, String username) {
- return createServiceInstance(serviceClass, username, null);
+ return createServiceInstance(serviceClass, username, ADMIN_PWD);
}
protected <T> T createServiceInstance(Class<T> serviceClass, String username, String password) {
@@ -241,7 +221,7 @@ public abstract class AbstractTest {
restClientFactory.setPassword(password);
restClientFactory.setServiceClass(serviceClass);
T serviceProxy = restClientFactory.create(serviceClass);
- setupConentType(WebClient.client(serviceProxy));
+ setupContentType(WebClient.client(serviceProxy));
return serviceProxy;
}
@@ -251,12 +231,24 @@ public abstract class AbstractTest {
wc.path(path);
return wc;
}
+
+ public void setupContentType(Client restClient) {
+ if (contentType == null) {
+ String envContentType = System.getProperty(ENV_KEY_CONTENT_TYPE);
+ if ((envContentType != null) && (!envContentType.isEmpty())) {
+ contentType = envContentType;
+ } else {
+ contentType = DEFAULT_CONTENT_TYPE;
+ }
+ }
+ restClient.type(contentType).accept(contentType);
+ }
// END CXF Initialization
public <T> T getObject(final Response response, final Class<T> type, final Object serviceProxy) {
assertNotNull(response);
assertNotNull(response.getLocation());
- if (!activatedCXF) {
+ if (!enabledCXF) {
return getObjectSpring(response, type);
} else {
return getObjectCXF(response, type, serviceProxy);
@@ -267,6 +259,14 @@ public abstract class AbstractTest {
return restTemplate.getForEntity(response.getLocation(), type).getBody();
}
+ public void setEnabledCXF(boolean enabledCXF) {
+ this.enabledCXF = enabledCXF;
+ }
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
+
private static <T> T getObjectCXF(final Response response, final Class<T> type, final Object serviceProxy) {
String location = response.getLocation().toString();
WebClient webClient = WebClient.fromClient(WebClient.client(serviceProxy));
@@ -274,7 +274,7 @@ public abstract class AbstractTest {
return webClient.get(type);
}
-
+
protected static String getUUIDString() {
return UUID.randomUUID().toString().substring(0, 8);
}
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -53,11 +53,6 @@ import org.springframework.web.client.Ht
@FixMethodOrder(MethodSorters.JVM)
public class AuthenticationTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public AuthenticationTestITCase(final String contentType) {
- super(contentType);
- }
-
@Test
public void testAdminEntitlements() {
// 1. as anonymous, read all available entitlements
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -36,11 +36,6 @@ import org.springframework.web.client.Ht
@FixMethodOrder(MethodSorters.JVM)
public class ConfigurationTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public ConfigurationTestITCase(String contentType) {
- super(contentType);
- }
-
@Test
public void create() {
ConfigurationTO configurationTO = new ConfigurationTO();
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -57,11 +57,6 @@ public class ConnInstanceTestITCase exte
private static String bundlesDirectory;
- // Enable running test more than once with parameters
- public ConnInstanceTestITCase(final String contentType) {
- super(contentType);
- }
-
@BeforeClass
public static void init()
throws IOException {
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -39,11 +39,6 @@ import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.JVM)
public class DerivedSchemaTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public DerivedSchemaTestITCase(String contentType) {
- super(contentType);
- }
-
@Test
public void list() {
@SuppressWarnings("unchecked")
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -39,11 +39,6 @@ import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.JVM)
public class LoggerTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public LoggerTestITCase(String contentType) {
- super(contentType);
- }
-
@Test
public void listLogs() {
List<LoggerTO> loggers = loggerService.list(LoggerType.NORMAL);
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -43,11 +43,6 @@ import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.JVM)
public class NotificationTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public NotificationTestITCase(String contentType) {
- super(contentType);
- }
-
@Test
public void read() {
NotificationTO notificationTO = notificationService.read(100L);
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -42,11 +42,6 @@ import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.JVM)
public class PolicyTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public PolicyTestITCase(String contentType) {
- super(contentType);
- }
-
@Test
public void listByType() {
List<SyncPolicyTO> policyTOs = policyService.list(PolicyType.SYNC);
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -53,11 +53,6 @@ public class ReportTestITCase extends Ab
return reportService.read(reportId);
}
- // Enable running test more than once with parameters
- public ReportTestITCase(String contentType) {
- super(contentType);
- }
-
@Test
public void getReportletClasses() {
Set<String> reportletClasses = reportService.getReportletConfClasses();
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -51,11 +51,6 @@ import org.springframework.web.client.Ht
@FixMethodOrder(MethodSorters.JVM)
public class ResourceTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public ResourceTestITCase(final String contentType) {
- super(contentType);
- }
-
@Test
public void getPropagationActionsClasses() {
Set<PropagationActionClassTO> actions = resourceService.getPropagationActionsClasses();
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -47,11 +47,6 @@ import org.springframework.web.client.Ht
@FixMethodOrder(MethodSorters.JVM)
public class RoleTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public RoleTestITCase(String contentType) {
- super(contentType);
- }
-
private RoleTO buildBasicRoleTO(final String name) {
RoleTO roleTO = new RoleTO();
roleTO.setName(name + getUUIDString());
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -50,11 +50,6 @@ import org.springframework.web.client.Ht
@FixMethodOrder(MethodSorters.JVM)
public class SchemaTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public SchemaTestITCase(String contentType) {
- super(contentType);
- }
-
@Test
public void create() {
SchemaTO schemaTO = buildSchemaTO("testAttribute", SchemaType.String);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java?rev=1438941&r1=1438940&r2=1438941&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java Sat Jan 26 18:44:29 2013
@@ -41,11 +41,6 @@ import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.JVM)
public class SearchTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public SearchTestITCase(String contentType) {
- super(contentType);
- }
-
@Test
public void searchUser() {
// LIKE
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -66,11 +66,6 @@ public class TaskTestITCase extends Abst
private static final Long SYNC_TASK_ID = 4L;
- // Enable running test more than once with parameters
- public TaskTestITCase(String contentType) {
- super(contentType);
- }
-
@Test
public void getJobClasses() {
Set<String> jobClasses = taskService.getJobClasses();
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -46,11 +46,6 @@ import org.springframework.web.client.Ht
@FixMethodOrder(MethodSorters.JVM)
public class UserRequestTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public UserRequestTestITCase(String contentType) {
- super(contentType);
- }
-
@Test
public void create() {
// 1. set create request not allowed
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -32,7 +32,9 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
+
import javax.ws.rs.core.Response;
+
import org.apache.syncope.common.mod.AttributeMod;
import org.apache.syncope.common.mod.MembershipMod;
import org.apache.syncope.common.mod.UserMod;
@@ -75,11 +77,6 @@ import org.springframework.web.client.Ht
@FixMethodOrder(MethodSorters.JVM)
public class UserTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public UserTestITCase(final String contentType) {
- super(contentType);
- }
-
private ConnObjectTO readUserConnObj(final String resourceName, final String userId) {
return resourceService.getConnector(resourceName, AttributableType.USER, userId);
}
@@ -122,7 +119,6 @@ public class UserTestITCase extends Abst
assertEquals("user1", userTO.getUsername());
}
- @SuppressWarnings("unchecked")
@Test
public void createUserWithNoPropagation() {
// get task list
@@ -407,7 +403,6 @@ public class UserTestITCase extends Abst
userService.create(newUserTO);
}
- @SuppressWarnings("unchecked")
@Test
public void create() {
// get task list
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=1438941&r1=1438940&r2=1438941&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 Sat Jan 26 18:44:29 2013
@@ -37,11 +37,6 @@ import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.JVM)
public class VirtualSchemaTestITCase extends AbstractTest {
- // Enable running test more than once with parameters
- public VirtualSchemaTestITCase(String contentType) {
- super(contentType);
- }
-
@Test
public void list() {
@SuppressWarnings("unchecked")
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java?rev=1438941&r1=1438940&r2=1438941&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java Sat Jan 26 18:44:29 2013
@@ -34,11 +34,6 @@ public class WorkflowTestITCase extends
public static final String USER_TYPE = "user";
- // Enable running test more than once with parameters
- public WorkflowTestITCase(String contentType) {
- super(contentType);
- }
-
@Test //TODO TestCase needs to be extended
public void testGetUserDefinition() {
WorkflowDefinitionTO definition = workflowService.getDefinition(USER_TYPE);
Added: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ConfigurationTestITCaseJAXRS.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ConfigurationTestITCaseJAXRS.java?rev=1438941&view=auto
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ConfigurationTestITCaseJAXRS.java (added)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ConfigurationTestITCaseJAXRS.java Sat Jan 26 18:44:29 2013
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.core.rest.jaxrs;
+
+import org.apache.syncope.core.rest.ConfigurationTestITCase;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+
+@FixMethodOrder(MethodSorters.JVM)
+public class ConfigurationTestITCaseJAXRS extends ConfigurationTestITCase {
+
+ public ConfigurationTestITCaseJAXRS() {
+ setEnabledCXF(true);
+ }
+}
Propchange: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/ConfigurationTestITCaseJAXRS.java
------------------------------------------------------------------------------
svn:mime-type = text/plain