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

ACE-3121: Workflow Admin Console: Cannot change priority for activiti

Browse Source 
- Removed priority value validation.  Just checked the type.
   - TODO: Determine if DelegateTask also needs similar handling

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ahmed Owian
2014-10-16 21:50:10 +00:00
parent 24560c0afd
commit f16b1ac567
2 changed files with 26 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandler.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2011 Alfresco Software Limited. * Copyright (C) 2005-2014 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -41,8 +41,8 @@ public class ActivitiPriorityPropertyHandler extends ActivitiTaskPropertyHandler
@Override @Override
protected Object handleTaskProperty(Task task, TypeDefinition type, QName key, Serializable value) protected Object handleTaskProperty(Task task, TypeDefinition type, QName key, Serializable value)
{ {
int priority = -1; int priority;
// ACE-3121: According to bpmModel.xml, priority should be an int with allowed values {1,2,3} // ACE-3121: Workflow Admin Console: Cannot change priority for activiti
// It could be a String that converts to an int, like when coming from WorkflowInterpreter.java // It could be a String that converts to an int, like when coming from WorkflowInterpreter.java
if (value instanceof String) if (value instanceof String)
{ {
@@ -52,7 +52,7 @@ public class ActivitiPriorityPropertyHandler extends ActivitiTaskPropertyHandler
} }
catch (NumberFormatException e) catch (NumberFormatException e)
{ {
return DO_NOT_ADD; throw getInvalidPropertyValueException(key, value);
} }
} }
else else
@@ -61,14 +61,8 @@ public class ActivitiPriorityPropertyHandler extends ActivitiTaskPropertyHandler
priority = (Integer) value; priority = (Integer) value;
} }
if (1 <= priority && priority <= 3) // Priority value validation not performed to allow for future model changes
{ task.setPriority(priority);
task.setPriority(priority);
}
else
{
throw getInvalidPropertyValueException(key, value);
}
return DO_NOT_ADD; return DO_NOT_ADD;
} }

47
source/test-java/org/alfresco/repo/workflow/activiti/properties/ActivitiPriorityPropertyHandlerTest.java
View File

@@ -1,3 +1,21 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.workflow.activiti.properties; package org.alfresco.repo.workflow.activiti.properties;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@@ -54,33 +72,9 @@ public class ActivitiPriorityPropertyHandlerTest
} }
@Test(expected = org.alfresco.service.cmr.workflow.WorkflowException.class) @Test(expected = org.alfresco.service.cmr.workflow.WorkflowException.class)
public void handleTaskPropertyDoesNotSetInvalidIntPriority0() public void handleTaskPropertyDoesNotSetInvalidStringPriority()
{ {
int priority = 0; String priority = "Not an integer";
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); handler.handleTaskProperty(task, type, key, priority);
fail("The method should throw an exception and not reach here."); fail("The method should throw an exception and not reach here.");
} }
@@ -92,5 +86,4 @@ public class ActivitiPriorityPropertyHandlerTest
handler.handleTaskProperty(task, type, key, priority); handler.handleTaskProperty(task, type, key, priority);
fail("The method should throw an exception and not reach here."); fail("The method should throw an exception and not reach here.");
} }
} }