From 484cbe93312b6ec61ea4a2867a2b297935452391 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 18 Apr 2013 01:31:50 +0000 Subject: [PATCH] RM: Modificaiton to unit test to see if issue seen only on Bamboo can be worked around. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@49383 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../test/action/CreateRecordActionTest.java | 7 +++++-- .../test/util/BaseRMTestCase.java | 12 ++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java index d756c838b3..e2ed0a01de 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java @@ -65,8 +65,11 @@ public class CreateRecordActionTest extends BaseRMTestCase { // Testing AuthorityDAO authDao = (AuthorityDAO)applicationContext.getBean("authorityDAO"); - assertTrue(authDao.authorityExists(AuthenticationUtil.getSystemUserName())); - assertFalse(true); + if (authDao.authorityExists(AuthenticationUtil.getSystemUserName()) == false) + { + createPerson(AuthenticationUtil.getSystemUserName(), false); + } + assertTrue("No person object for System available.", authDao.authorityExists(AuthenticationUtil.getSystemUserName())); super.setupTestDataImpl(); } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java index 5f8d710b51..476c47d5b3 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java @@ -582,13 +582,21 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase * @param userName user name * @return NodeRef user node reference */ - protected NodeRef createPerson(String userName) + protected NodeRef createPerson(String userName, boolean createAuth) { - authenticationService.createAuthentication(userName, "password".toCharArray()); + if (createAuth == true) + { + authenticationService.createAuthentication(userName, "password".toCharArray()); + } Map properties = new HashMap(); properties.put(ContentModel.PROP_USERNAME, userName); return personService.createPerson(properties); } + + protected NodeRef createPerson(String userName) + { + return createPerson(userName, true); + } /** * Setup multi hierarchy test data