From d1924830c97f3d170460af5f0c53427e55b33648 Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Fri, 20 Aug 2010 13:49:50 +0000 Subject: [PATCH] Added "type" property to the workflow instance response, mainly for future use and consistency with the task response, it currently duplicates the "name" property git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21901 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/workflow/WorkflowModelBuilderTest.java | 1 + .../alfresco/repo/web/scripts/workflow/WorkflowRestApiTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilderTest.java b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilderTest.java index 256f376466..64b613b54a 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilderTest.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilderTest.java @@ -235,6 +235,7 @@ public class WorkflowModelBuilderTest extends TestCase assertEquals(workflowInstance.getId(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_ID)); assertTrue(model.containsKey(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_URL)); assertEquals(workflowInstance.getDefinition().getName(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_NAME)); + assertEquals(workflowInstance.getDefinition().getName(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_TYPE)); assertEquals(workflowInstance.getDefinition().getTitle(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_TITLE)); assertEquals(workflowInstance.getDefinition().getDescription(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_DESCRIPTION)); assertEquals(workflowInstance.isActive(), model.get(WorkflowModelBuilder.TASK_WORKFLOW_INSTANCE_IS_ACTIVE)); diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowRestApiTest.java index 65c2beb069..aebca30f45 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowRestApiTest.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowRestApiTest.java @@ -391,6 +391,7 @@ public class WorkflowRestApiTest extends BaseWebScriptTest assertEquals(adhocInstance.id, result.getString("id")); assertEquals(adhocInstance.definition.name, result.getString("name")); + assertEquals(adhocInstance.definition.name, result.getString("type")); assertEquals(adhocInstance.definition.title, result.getString("title")); assertEquals(adhocInstance.definition.description, result.getString("description")); assertEquals(adhocInstance.active, result.getBoolean("isActive"));