diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java index 46ab7454e9..c31ee2faff 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java @@ -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(); diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java index 1e6cdd2622..aa436c0877 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/ActivitiWorkflowRestApiTest.java @@ -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; diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/JBPMWorkflowRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/workflow/JBPMWorkflowRestApiTest.java index d8578e2cc4..764c1d0999 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/JBPMWorkflowRestApiTest.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/JBPMWorkflowRestApiTest.java @@ -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;