From f29c220c43c21d16e1421ffc063decb8e1b126df Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Tue, 4 Aug 2015 10:36:39 +0000 Subject: [PATCH] Fixed build failure in Bamboo as a result of r109490. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../CustomModelServiceImplTest.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/source/test-java/org/alfresco/repo/dictionary/CustomModelServiceImplTest.java b/source/test-java/org/alfresco/repo/dictionary/CustomModelServiceImplTest.java index e34c7004b2..f20f1da93f 100644 --- a/source/test-java/org/alfresco/repo/dictionary/CustomModelServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/dictionary/CustomModelServiceImplTest.java @@ -311,17 +311,28 @@ public class CustomModelServiceImplTest testUser.put(ContentModel.PROP_LASTNAME, "Doe"); testUser.put(ContentModel.PROP_PASSWORD, "password"); - transactionHelper.doInTransaction(new RetryingTransactionCallback() + final NodeRef personNodeRef = transactionHelper.doInTransaction(new RetryingTransactionCallback() { - public Void execute() throws Exception + public NodeRef execute() throws Exception { - personService.createPerson(testUser); - + NodeRef nodeRef = personService.createPerson(testUser); + assertNotNull(nodeRef); assertFalse(customModelService.isModelAdmin(userName)); // Add the user to the group authorityService.addAuthority(CustomModelServiceImpl.GROUP_ALFRESCO_MODEL_ADMINISTRATORS_AUTHORITY, userName); assertTrue(customModelService.isModelAdmin(userName)); + + return nodeRef; + } + }); + + // Cleanup + transactionHelper.doInTransaction(new RetryingTransactionCallback() + { + public Void execute() throws Exception + { + personService.deletePerson(personNodeRef); return null; } });