Author: ilgrosso
Date: Wed Jan 9 11:29:37 2013
New Revision: 1430794
URL: http://svn.apache.org/viewvc?rev=1430794&view=rev
Log:
[SYNCOPE-259] Fixing minor issues on WorkflowTestITCase
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.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/WorkflowTestITCase.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java?rev=1430794&r1=1430793&r2=1430794&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
Wed Jan 9 11:29:37 2013
@@ -52,9 +52,11 @@ public class SpringContextInitializer im
private static String uwfAdapterClassName;
+ private static String rwfAdapterClassName;
+
static {
try {
- initUWFAdapterClassName();
+ initWFAdapterClassNames();
} catch (IOException e) {
LOG.error("Could not init uwfAdapterClassName", e);
}
@@ -65,13 +67,14 @@ public class SpringContextInitializer im
*
* @throws IOException if anything goes wrong
*/
- private static void initUWFAdapterClassName() throws IOException {
+ private static void initWFAdapterClassNames() throws IOException {
Properties props = new java.util.Properties();
InputStream propStream = null;
try {
propStream =
ContentLoader.class.getResourceAsStream("/workflow.properties");
props.load(propStream);
uwfAdapterClassName = props.getProperty("uwfAdapter");
+ rwfAdapterClassName = props.getProperty("rwfAdapter");
} catch (Exception e) {
LOG.error("Could not load workflow.properties", e);
} finally {
@@ -84,12 +87,23 @@ public class SpringContextInitializer im
/**
* Check if the configured user workflow adapter is Activiti's.
*
- * @return whether Activiti is configured for workflow or not
+ * @return whether Activiti is configured for user workflow or not
*/
public static boolean isActivitiEnabledForUsers() {
return uwfAdapterClassName != null &&
uwfAdapterClassName.equals(ActivitiUserWorkflowAdapter.class.getName());
}
+ /**
+ * Check if the configured role workflow adapter is Activiti's.
+ *
+ * @return whether Activiti is configured for role workflow or not
+ */
+ public static boolean isActivitiEnabledForRoles() {
+ // ActivitiRoleWorkflowAdapter hasn't been developed (yet) as part of
SYNCOPE-173
+ //return rwfAdapterClassName != null &&
rwfAdapterClassName.equals(ActivitiRoleWorkflowAdapter.class.getName());
+ return false;
+ }
+
@Autowired
private ConnectorFactory connInstanceLoader;
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java?rev=1430794&r1=1430793&r2=1430794&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java
Wed Jan 9 11:29:37 2013
@@ -50,6 +50,7 @@ public class WorkflowController extends
@Autowired
private RoleWorkflowAdapter rwfAdapter;
+
private WorkflowDefinitionTO getDefinition(final WorkflowAdapter adapter)
throws WorkflowException {
WorkflowDefinitionTO result = adapter.getDefinition();
@@ -86,6 +87,7 @@ public class WorkflowController extends
@RequestMapping(method = RequestMethod.PUT, value = "/definition/user")
public void updateUserDefinition(@RequestBody final WorkflowDefinitionTO
definition)
throws NotFoundException, WorkflowException {
+
updateDefinition(uwfAdapter, definition);
}
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=1430794&r1=1430793&r2=1430794&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
Wed Jan 9 11:29:37 2013
@@ -18,12 +18,7 @@
*/
package org.apache.syncope.core.rest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -31,10 +26,6 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
-
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.syncope.client.http.PreemptiveAuthHttpRequestFactory;
import org.apache.syncope.client.mod.AttributeMod;
import org.apache.syncope.client.mod.MembershipMod;
import org.apache.syncope.client.mod.UserMod;
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=1430794&r1=1430793&r2=1430794&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
Wed Jan 9 11:29:37 2013
@@ -18,21 +18,19 @@
*/
package org.apache.syncope.core.rest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import java.util.List;
-
import org.apache.syncope.client.to.WorkflowDefinitionTO;
-import org.junit.Ignore;
+import org.apache.syncope.core.init.SpringContextInitializer;
+import org.junit.Assume;
import org.junit.Test;
public class WorkflowTestITCase extends AbstractTest {
public static final String ROLE_TYPE = "role";
- public static final String USER_TYPE = "role";
+ public static final String USER_TYPE = "user";
@Test //TODO TestCase needs to be extended
public void testGetUserDefinition() {
@@ -46,46 +44,41 @@ public class WorkflowTestITCase extends
assertNotNull(definition);
}
- @Test
- @Ignore //TODO TestCase needs to be extended
+ @Test//TODO TestCase needs to be extended
public void testUpdateUserDefinition() {
+
Assume.assumeTrue(SpringContextInitializer.isActivitiEnabledForUsers());
+
WorkflowDefinitionTO definition =
workflowService.getDefinition(USER_TYPE);
assertNotNull(definition);
- String newID = (definition.getId() != null)
- ? definition.getId() + "1"
- : "1";
- definition.setId(newID);
+
workflowService.updateDefinition(USER_TYPE, definition);
WorkflowDefinitionTO newDefinition =
workflowService.getDefinition(USER_TYPE);
- assertEquals(newID, newDefinition.getId());
+ assertNotNull(newDefinition);
}
- @Test
- @Ignore //TODO TestCase needs to be extended
+ @Test//TODO TestCase needs to be extended
public void testUpdateRoleDefinition() {
+
Assume.assumeTrue(SpringContextInitializer.isActivitiEnabledForRoles());
+
WorkflowDefinitionTO definition =
workflowService.getDefinition(ROLE_TYPE);
assertNotNull(definition);
- String newID = (definition.getId() != null)
- ? definition.getId() + "1"
- : "1";
- definition.setId(newID);
+
workflowService.updateDefinition(ROLE_TYPE, definition);
WorkflowDefinitionTO newDefinition =
workflowService.getDefinition(ROLE_TYPE);
- assertEquals(newID, newDefinition.getId());
+ assertNotNull(newDefinition);
}
@Test
public void testGetUserTasks() {
List<String> tasks = workflowService.getDefinedTasks(USER_TYPE);
assertNotNull(tasks);
- assertTrue(tasks.size() > 0);
+ assertFalse(tasks.isEmpty());
}
@Test
public void testGetRoleTasks() {
List<String> tasks = workflowService.getDefinedTasks(ROLE_TYPE);
assertNotNull(tasks);
- assertTrue(tasks.size() > 0);
+ assertFalse(tasks.isEmpty());
}
-
}
\ No newline at end of file
