From 24560c0afd552bfbbfadb9530827c727749ef14d Mon Sep 17 00:00:00 2001
From: Ahmed Owian <ahmed.owian@alfresco.com>
Date: Thu, 16 Oct 2014 21:34:08 +0000
Subject: [PATCH] ACE-3121: Workflow Admin Console: Cannot change priority for
 activiti    - Handled priority property for Task    - Determine if
 DelegateTask also needs similar handling

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88557 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../ActivitiPriorityPropertyHandler.java      |  4 +
 .../ActivitiPriorityPropertyHandlerTest.java  | 96 +++++++++++++++++++
 2 files changed, 100 insertions(+)
 create mode 100644 source/test-java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandlerTest.java

diff --git a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java
index d60740d16f..5336e246b7 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java
@@ -65,6 +65,10 @@ public class ActivitiPriorityPropertyHandler extends ActivitiTaskPropertyHandler
         {
             task.setPriority(priority);
         }
+        else
+        {
+            throw getInvalidPropertyValueException(key, value);
+        }
 
         return DO_NOT_ADD;
     }
diff --git a/source/test-java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandlerTest.java b/source/test-java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandlerTest.java
new file mode 100644
index 0000000000..d2a2db0d14
--- /dev/null
+++ b/source/test-java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandlerTest.java
@@ -0,0 +1,96 @@
+package org.alfresco.repo.workflow.activiti.properties;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import org.activiti.engine.task.Task;
+import org.alfresco.repo.i18n.MessageService;
+import org.alfresco.repo.workflow.WorkflowPropertyHandler;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.namespace.QName;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ActivitiPriorityPropertyHandlerTest
+{
+    private static ActivitiPriorityPropertyHandler handler;
+    private @Mock
+    Task task;
+    private TypeDefinition type = null;
+    private QName key = null;
+
+    @BeforeClass
+    public static void setUp()
+    {
+        handler = new ActivitiPriorityPropertyHandler();
+        MessageService messageService = mock(MessageService.class);
+        handler.setMessageService(messageService);
+    }
+
+    @Test
+    public void handleTaskPropertySetsValidIntPriority()
+    {
+        for (int priority = 1; priority <= 3; priority++)
+        {
+            Object result = handler.handleTaskProperty(task, type, key, priority);
+            assertEquals(WorkflowPropertyHandler.DO_NOT_ADD, result);
+            verify(task).setPriority(priority);
+        }
+    }
+
+    @Test
+    public void handleTaskPropertySetsValidStringPriority()
+    {
+        for (int priority = 1; priority <= 3; priority++)
+        {
+            Object result = handler.handleTaskProperty(task, type, key, "" + priority);
+            assertEquals(WorkflowPropertyHandler.DO_NOT_ADD, result);
+            verify(task).setPriority(priority);
+        }
+    }
+
+    @Test(expected = org.alfresco.service.cmr.workflow.WorkflowException.class)
+    public void handleTaskPropertyDoesNotSetInvalidIntPriority0()
+    {
+        int priority = 0;
+        handler.handleTaskProperty(task, type, key, priority);
+        fail("The method should throw an exception and not reach here.");
+    }
+
+    @Test(expected = org.alfresco.service.cmr.workflow.WorkflowException.class)
+    public void handleTaskPropertyDoesNotSetInvalidIntPriority4()
+    {
+        int priority = 4;
+        handler.handleTaskProperty(task, type, key, priority);
+        fail("The method should throw an exception and not reach here.");
+    }
+
+    @Test(expected = org.alfresco.service.cmr.workflow.WorkflowException.class)
+    public void handleTaskPropertyDoesNotSetInvalidStringPriority0()
+    {
+        String priority = "0";
+        handler.handleTaskProperty(task, type, key, priority);
+        fail("The method should throw an exception and not reach here.");
+    }
+
+    @Test(expected = org.alfresco.service.cmr.workflow.WorkflowException.class)
+    public void handleTaskPropertyDoesNotSetInvalidStringPriority4()
+    {
+        String priority = "4";
+        handler.handleTaskProperty(task, type, key, priority);
+        fail("The method should throw an exception and not reach here.");
+    }
+
+    @Test(expected = org.alfresco.service.cmr.workflow.WorkflowException.class)
+    public void handleTaskPropertyDoesNotSetInvalidClassPriority()
+    {
+        Long priority = 2l;
+        handler.handleTaskProperty(task, type, key, priority);
+        fail("The method should throw an exception and not reach here.");
+    }
+
+}