Merge branch 'TAS-949' of gitlab.alfresco.com:tas/alfresco-tas-restapi-test

# Conflicts:
#	src/main/java/org/alfresco/rest/model/RestCommentModelsCollection.java
#	src/main/java/org/alfresco/rest/model/RestPersonModel.java
#	src/main/java/org/alfresco/rest/requests/RestCommentsApi.java
#	src/main/java/org/alfresco/rest/requests/RestSitesApi.java
#	src/test/java/org/alfresco/rest/demo/RestDemoTests.java
This commit is contained in:
Paul Brodner
2016-09-29 16:56:54 +03:00
7 changed files with 19 additions and 24 deletions

View File

@@ -36,8 +36,8 @@ public class DeleteCommentsSanityTests extends RestTest
private RestCommentModel comment;
private ListUserWithRoles usersWithRoles;
@BeforeClass
public void initTest() throws Exception
@BeforeClass(alwaysRun=true)
public void dataPreparation() throws Exception
{
adminUserModel = dataUser.getAdminUser();
restClient.authenticateUser(adminUserModel);
@@ -48,8 +48,8 @@ public class DeleteCommentsSanityTests extends RestTest
usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel,UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor);
}
@BeforeMethod
public void initMethod() throws Exception
@BeforeMethod(alwaysRun=true)
public void addCommentToDocument() throws Exception
{
restClient.authenticateUser(adminUserModel);
commentsAPI.useRestClient(restClient);