inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
129180 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128642 jvonka: V1 REST API: cleanup and rationalise new api tests (re: remotable helpers & runAs user / admin) - round 5b
      - fix test fallout
      REPO-113


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129354 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:14:36 +00:00
parent 14b303bbca
commit d4af90d5ab
5 changed files with 85 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/test-java/org/alfresco/rest/api/tests/BaseCustomModelApiTest.java
View File

@@ -90,10 +90,11 @@ public class BaseCustomModelApiTest extends AbstractBaseApiTest
final AuthorityService authorityService = applicationContext.getBean("authorityService", AuthorityService.class);
this.nonAdminUserName = createUser("nonAdminUser" + System.currentTimeMillis());
this.customModelAdmin = createUser("customModelAdmin" + System.currentTimeMillis());
this.nonAdminUserName = createUser("nonAdminUser" + System.currentTimeMillis(), "password", null);
this.customModelAdmin = createUser("customModelAdmin" + System.currentTimeMillis(), "password", null);
users.add(nonAdminUserName);
users.add(customModelAdmin);
// Add 'customModelAdmin' user into 'ALFRESCO_MODEL_ADMINISTRATORS' group
transactionHelper.doInTransaction(new RetryingTransactionCallback<Void>()
{
@@ -117,8 +118,7 @@ public class BaseCustomModelApiTest extends AbstractBaseApiTest
@Override
public Void execute() throws Throwable
{
authenticationService.deleteAuthentication(user);
personService.deletePerson(user);
deleteUser(user, null);
return null;
}
});