From 90da8420352113d95219bdab7b120938908c31ec Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Mon, 22 Nov 2010 16:07:50 +0000 Subject: [PATCH] Merged BRANCHES/V3.4 to HEAD: 23857: Add in UserTransactions to a few places that now need it, to fix webscript unit test 23859: Add in UserTransactions to a few places that now need it, to fix webscript unit test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/action/RunningActionRestApiTest.java | 6 ++++++ .../web/scripts/replication/ReplicationRestApiTest.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java index 5ce7efc6a1..97374bd5e0 100644 --- a/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java +++ b/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java @@ -216,7 +216,10 @@ public class RunningActionRestApiTest extends BaseWebScriptTest // Remove one, check it goes + UserTransaction txn = transactionService.getUserTransaction(); + txn.begin(); actionTrackingService.recordActionComplete(rd); + txn.commit(); has1 = false; has2 = false; has3 = false; @@ -509,7 +512,10 @@ public class RunningActionRestApiTest extends BaseWebScriptTest // Remove one, check it goes + UserTransaction txn = transactionService.getUserTransaction(); + txn.begin(); actionTrackingService.recordActionComplete(rd); + txn.commit(); has1 = false; has2 = false; has3 = false; diff --git a/source/java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java index 30e1874e58..31493d0672 100644 --- a/source/java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java +++ b/source/java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java @@ -259,10 +259,13 @@ public class ReplicationRestApiTest extends BaseWebScriptTest // Set start times and statuses on these other two + UserTransaction txn = transactionService.getUserTransaction(); + txn.begin(); rd = replicationService.loadReplicationDefinition("Test2"); actionTrackingService.recordActionExecuting(rd); actionTrackingService.recordActionComplete(rd); String startedAt2 = ISO8601DateFormat.format(rd.getExecutionStartDate()); + txn.commit(); // Try the different sorts @@ -790,7 +793,10 @@ public class ReplicationRestApiTest extends BaseWebScriptTest // These show up again when no longer running + txn = transactionService.getUserTransaction(); + txn.begin(); actionTrackingService.recordActionComplete(rd); + txn.commit(); response = sendRequest(new GetRequest(URL_DEFINITION + "Test3"), 200); assertEquals(Status.STATUS_OK, response.getStatus());