diff --git a/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java b/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java index 0ef23d3a1a..a9bd6fe681 100644 --- a/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java +++ b/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java @@ -132,6 +132,7 @@ public class SimpleAuthorityServiceTest extends TestCase assertTrue(pubAuthorityService.getAllAuthorities(AuthorityType.GUEST).contains(PermissionService.GUEST)); assertEquals(0, pubAuthorityService.getAllAuthorities(AuthorityType.OWNER).size()); assertEquals(0, pubAuthorityService.getAllAuthorities(AuthorityType.ROLE).size()); + assertEquals(2, pubAuthorityService.getAllAuthorities(AuthorityType.USER).size()); assertEquals(personService.getAllPeople().size(), pubAuthorityService.getAllAuthorities(AuthorityType.USER) .size()); diff --git a/source/java/org/alfresco/repo/security/person/PersonTest.java b/source/java/org/alfresco/repo/security/person/PersonTest.java index 4d4cad853d..481bbdf489 100644 --- a/source/java/org/alfresco/repo/security/person/PersonTest.java +++ b/source/java/org/alfresco/repo/security/person/PersonTest.java @@ -179,8 +179,6 @@ public class PersonTest extends BaseSpringTest assertTrue(personService.getAllPeople().contains(personService.getPerson("andy"))); assertTrue(personService.getAllPeople().contains(personService.getPerson("derek"))); - setComplete(); - endTransaction(); } public void testMutableProperties() @@ -191,9 +189,7 @@ public class PersonTest extends BaseSpringTest assertTrue(personService.getMutableProperties().contains(ContentModel.PROP_LASTNAME)); assertTrue(personService.getMutableProperties().contains(ContentModel.PROP_EMAIL)); assertTrue(personService.getMutableProperties().contains(ContentModel.PROP_ORGID)); - - setComplete(); - endTransaction(); + } public void testPersonCRUD1() @@ -265,9 +261,7 @@ public class PersonTest extends BaseSpringTest personService.deletePerson("derek"); assertEquals(0, personService.getAllPeople().size()); - - setComplete(); - endTransaction(); + } private void testProperties(NodeRef nodeRef, String userName, String firstName, String lastName, String email,