inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where localised WorkflowDefinition Title was not being set correctly.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-03-15 17:01:34 +00:00
parent 4cafc69e95
commit bf5b60444c
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java
View File

@@ -719,18 +719,22 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
assertTrue(workflowDefinitionJSON.getString("name").length() > 0);
assertTrue(workflowDefinitionJSON.has("title"));
assertTrue(workflowDefinitionJSON.getString("title").length() > 0);
String title = workflowDefinitionJSON.getString("title");
assertTrue(title.length() > 0);
assertTrue(workflowDefinitionJSON.has("description"));
assertTrue(workflowDefinitionJSON.getString("description").length() > 0);
String description = workflowDefinitionJSON.getString("description");
assertTrue(description.length() > 0);
if(getAdhocWorkflowDefinitionName().equals(workflowDefinitionJSON.getString("name")))
{
assertEquals(getAdhocWorkflowDefinitionTitle(), title);
assertEquals(getAdhocWorkflowDefinitionDescription(), description);
adhocWorkflowPresent = true;
}
}
}
assertTrue("Adhoc workflow definition was returned", adhocWorkflowPresent);
assertTrue("Adhoc workflow definition was not present!", adhocWorkflowPresent);
// filter the workflow definitions and check they are not returned
String exclude = getAdhocWorkflowDefinitionName();
@@ -1337,6 +1341,10 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
protected abstract String getAdhocWorkflowDefinitionName();
protected abstract String getAdhocWorkflowDefinitionTitle();
protected abstract String getAdhocWorkflowDefinitionDescription();
protected abstract String getReviewWorkflowDefinitionName();
protected abstract String getReviewPooledWorkflowDefinitionName();

14
source/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java
View File

@@ -10,6 +10,8 @@ public class ActivitiWorkflowRestApiTest extends AbstractWorkflowRestApiTest
{
private static final String ADHOC_WORKFLOW_DEFINITION_NAME = "activiti$activitiAdhoc";
private static final String ADHOC_WORKFLOW_DEFINITION_TITLE = "Adhoc Workflow (Activiti)";
private static final String ADHOC_WORKFLOW_DEFINITION_DESCRIPTION = "Assign arbitrary task to colleague using Activiti workflow engine.";
private static final String REVIEW_WORKFLOW_DEFINITION_NAME = "activiti$activitiReview";
private static final String REVIEW_POOLED_WORKFLOW_DEFINITION_NAME = "activiti$activitiReviewPooled";
@@ -19,6 +21,18 @@ public class ActivitiWorkflowRestApiTest extends AbstractWorkflowRestApiTest
return ADHOC_WORKFLOW_DEFINITION_NAME;
}
@Override
protected String getAdhocWorkflowDefinitionTitle()
{
return ADHOC_WORKFLOW_DEFINITION_TITLE;
}
@Override
protected String getAdhocWorkflowDefinitionDescription()
{
return ADHOC_WORKFLOW_DEFINITION_DESCRIPTION;
}
@Override
protected String getReviewWorkflowDefinitionName() {
return REVIEW_WORKFLOW_DEFINITION_NAME;

14
source/java/org/alfresco/repo/web/scripts/workflow/JBPMWorkflowRestApiTest.java
View File

@@ -9,6 +9,8 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
public class JBPMWorkflowRestApiTest extends AbstractWorkflowRestApiTest
{
private static final String ADHOC_WORKFLOW_DEFINITION_NAME = "jbpm$wf:adhoc";
private static final String ADHOC_WORKFLOW_DEFINITION_TITLE = "Adhoc Workflow (JBPM)";
private static final String ADHOC_WORKFLOW_DEFINITION_DESCRIPTION = "Assign arbitrary task to colleague using JBPM workflow engine.";
private static final String REVIEW_WORKFLOW_DEFINITION_NAME = "jbpm$wf:review";
private static final String REVIEW_POOLED_WORKFLOW_DEFINITION_NAME = "jbpm$wf:reviewPooled";
@@ -18,6 +20,18 @@ public class JBPMWorkflowRestApiTest extends AbstractWorkflowRestApiTest
return ADHOC_WORKFLOW_DEFINITION_NAME;
}
@Override
protected String getAdhocWorkflowDefinitionTitle()
{
return ADHOC_WORKFLOW_DEFINITION_TITLE;
}
@Override
protected String getAdhocWorkflowDefinitionDescription()
{
return ADHOC_WORKFLOW_DEFINITION_DESCRIPTION;
}
@Override
protected String getReviewWorkflowDefinitionName() {
return REVIEW_WORKFLOW_DEFINITION_NAME;