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

ActionTrackingService test updates

Browse Source 
Make the cache key generation less brittle, add unit tests for listing functions, and stub out the cancel related tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2010-07-21 13:52:16 +00:00
parent 3b6972a208
commit 0442d3564d
3 changed files with 238 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/action/ActionTrackingServiceImpl.java
View File

@@ -65,6 +65,9 @@ public class ActionTrackingServiceImpl implements ActionTrackingService
*/
private short nextExecutionId = 1;
/** How we separate bits of the cache key */
private static final char cacheKeyPartSeparator = '=';
/**
* Set the transaction service
*
@@ -291,7 +294,8 @@ public class ActionTrackingServiceImpl implements ActionTrackingService
public List<ExecutionSummary> getExecutingActions(Action action) {
Collection<String> actions = executingActionsCache.getKeys();
List<ExecutionSummary> details = new ArrayList<ExecutionSummary>();
String match = action.getActionDefinitionName() + "-" + action.getId();
String match = action.getActionDefinitionName() + cacheKeyPartSeparator +
action.getId() + cacheKeyPartSeparator;
for(String key : actions) {
if(key.startsWith(match)) {
details.add( buildExecutionSummary(key) );
@@ -303,8 +307,9 @@ public class ActionTrackingServiceImpl implements ActionTrackingService
public List<ExecutionSummary> getExecutingActions(String type) {
Collection<String> actions = executingActionsCache.getKeys();
List<ExecutionSummary> details = new ArrayList<ExecutionSummary>();
String match = type + cacheKeyPartSeparator;
for(String key : actions) {
if(key.startsWith(type)) {
if(key.startsWith(match)) {
details.add( buildExecutionSummary(key) );
}
}
@@ -327,16 +332,16 @@ public class ActionTrackingServiceImpl implements ActionTrackingService
protected static String generateCacheKey(Action action)
{
return
action.getActionDefinitionName() + "=" +
action.getId() + "=" +
action.getActionDefinitionName() + cacheKeyPartSeparator +
action.getId() + cacheKeyPartSeparator +
"1"//action.getExecutionInstance // TODO
;
}
protected static String generateCacheKey(ExecutionSummary summary)
{
return
summary.getActionType() + "=" +
summary.getActionId() + "=" +
summary.getActionType() + cacheKeyPartSeparator +
summary.getActionId() + cacheKeyPartSeparator +
summary.getExecutionInstance()
;
}
@@ -364,7 +369,7 @@ public class ActionTrackingServiceImpl implements ActionTrackingService
*/
protected static ExecutionSummary buildExecutionSummary(String key)
{
StringTokenizer st = new StringTokenizer(key, "=");
StringTokenizer st = new StringTokenizer(key, new String(new char[]{cacheKeyPartSeparator}));
String actionType = st.nextToken();
String actionId = st.nextToken();
int executionInstance = Integer.parseInt(st.nextToken());