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

ALF-9727: Querying using NodeRef type now uses ActivitiScriptNodeVariableType insead of ByteArrayVariableType (which isn't queryable) + fixed activiti components text-context

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Frederik Heremans
2011-09-29 12:07:28 +00:00
parent da831724d7
commit 5866905265
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/repo/workflow/activiti/ActivitiTaskComponentTest.java
View File

@@ -680,7 +680,28 @@ public class ActivitiTaskComponentTest extends AbstractActivitiComponentTest
tasks = workflowEngine.queryTasks(taskQuery); tasks = workflowEngine.queryTasks(taskQuery);
assertNotNull(tasks); assertNotNull(tasks);
assertEquals(0, tasks.size()); assertEquals(0, tasks.size());
}
@Test
public void testQueryUsingNodeRef() {
NodeRef nodeRef = new NodeRef("workspace:///someRef");
QName nodeRefPropQname = QName.createQName("testProp");
HashMap<QName, Serializable> props = new HashMap<QName, Serializable>();
props.put(nodeRefPropQname, nodeRef);
// Start the workflow-path
workflowEngine.startWorkflow(workflowDef.getId(), props);
// Test querying with a value of type NodeRef
WorkflowTaskQuery taskQuery = createWorkflowTaskQuery(WorkflowTaskState.IN_PROGRESS);
HashMap<QName, Object> queryParams = new HashMap<QName, Object>();
queryParams.put(nodeRefPropQname, nodeRef);
taskQuery.setProcessCustomProps(queryParams);
List<WorkflowTask> tasks = workflowEngine.queryTasks(taskQuery);
assertNotNull(tasks);
assertEquals(1, tasks.size());
} }
private void checkTaskVariableTaskPresent(WorkflowTaskState state, private void checkTaskVariableTaskPresent(WorkflowTaskState state,

22
source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
View File

@@ -1647,7 +1647,10 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
for(Entry<QName, Object> customProperty : processCustomProps.entrySet()) for(Entry<QName, Object> customProperty : processCustomProps.entrySet())
{ {
String name =factory.mapQNameToName(customProperty.getKey()); String name =factory.mapQNameToName(customProperty.getKey());
taskQuery.processVariableValueEquals(name, customProperty.getValue());
// Perform minimal property conversions
Object converted = propertyConverter.convertPropertyToValue(customProperty.getValue());
taskQuery.processVariableValueEquals(name, converted);
} }
} }
@@ -1764,8 +1767,11 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
{ {
for(Entry<QName, Object> customProperty : taskCustomProps.entrySet()) for(Entry<QName, Object> customProperty : taskCustomProps.entrySet())
{ {
String name =factory.mapQNameToName(customProperty.getKey()); String name = factory.mapQNameToName(customProperty.getKey());
taskQuery.taskVariableValueEquals(name, customProperty.getValue());
// Perform minimal property conversions
Object converted = propertyConverter.convertPropertyToValue(customProperty.getValue());
taskQuery.taskVariableValueEquals(name, converted);
} }
} }
@@ -1854,7 +1860,10 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
for(Entry<QName, Object> customProperty : taskCustomProps.entrySet()) for(Entry<QName, Object> customProperty : taskCustomProps.entrySet())
{ {
String name =factory.mapQNameToName(customProperty.getKey()); String name =factory.mapQNameToName(customProperty.getKey());
taskQuery.taskVariableValueEquals(name, customProperty.getValue());
// Perform minimal property conversions
Object converted = propertyConverter.convertPropertyToValue(customProperty.getValue());
taskQuery.taskVariableValueEquals(name, converted);
} }
} }
@@ -1864,7 +1873,10 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
for(Entry<QName, Object> customProperty : processCustomProps.entrySet()) for(Entry<QName, Object> customProperty : processCustomProps.entrySet())
{ {
String name =factory.mapQNameToName(customProperty.getKey()); String name =factory.mapQNameToName(customProperty.getKey());
taskQuery.processVariableValueEquals(name, customProperty.getValue());
// Perform minimal property conversions
Object converted = propertyConverter.convertPropertyToValue(customProperty.getValue());
taskQuery.processVariableValueEquals(name, converted);
} }
} }

4
source/test-resources/activiti/test-activiti-component-context.xml
View File

@@ -43,6 +43,10 @@
<bean id="bpm_engineRegistry" class="org.mockito.Mockito" factory-method="mock"> <bean id="bpm_engineRegistry" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.alfresco.repo.workflow.BPMEngineRegistry" /> <constructor-arg value="org.alfresco.repo.workflow.BPMEngineRegistry" />
</bean> </bean>
<bean id="workflowAdminService" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.alfresco.service.cmr.workflow.WorkflowAdminService" />
</bean>
<bean id="baseWorkflowEngineStatus" class="org.alfresco.repo.workflow.WorkflowEngineStatus" abstract="true" /> <bean id="baseWorkflowEngineStatus" class="org.alfresco.repo.workflow.WorkflowEngineStatus" abstract="true" />