inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/test/java/org/alfresco/rest/workflow/processes/AddProcessItemSanityTests.java
#	src/test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java
#	src/test/java/org/alfresco/rest/workflow/processes/AddProcessVariableSanityTests.java
#	src/test/java/org/alfresco/rest/workflow/tasks/AddTaskItemSanityTests.java
#	src/test/java/org/alfresco/rest/workflow/tasks/GetTaskItemsSanityTests.java
#	src/test/java/org/alfresco/rest/workflow/tasks/RemoveTaskItemSanityTests.java
#	src/test/java/org/alfresco/rest/workflow/tasks/UpdateTaskVariableSanityTests.java
This commit is contained in:
Paul Brodner
2016-10-25 14:39:39 +03:00
parent 92d3327751 0e6bdaabdd
commit a297b2890d
11 changed files with 91 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/java/org/alfresco/rest/favorites/AddFavoritesSanityTests.java
+5 -5
View File
@@ -52,7 +52,7 @@ public class AddFavoritesSanityTests extends RestTest
TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user add site to favorites with Rest API and status code is 201")
public void adminIsAbleToAddToFavorites() throws Exception
{
favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}
@@ -61,7 +61,7 @@ public class AddFavoritesSanityTests extends RestTest
public void managerIsAbleToAddToFavorites() throws Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}
@@ -70,7 +70,7 @@ public class AddFavoritesSanityTests extends RestTest
public void collaboratorIsAbleToAddToFavorites() throws Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}
@@ -79,7 +79,7 @@ public class AddFavoritesSanityTests extends RestTest
public void contributorIsAbleToAddToFavorites() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}
@@ -88,7 +88,7 @@ public class AddFavoritesSanityTests extends RestTest
public void consumerIsAbleToAddToFavorites() throws Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}
e2e-test/java/org/alfresco/rest/favorites/DeleteFavoritesSanityTests.java
+13 -13
View File
@@ -50,10 +50,10 @@ public class DeleteFavoritesSanityTests extends RestTest
TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user deletes site from favorites with Rest API and status code is 204")
public void adminIsAbleToDeleteFavorites() throws JsonToModelConversionException, Exception
{
favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.deleteSiteFromFavorites(adminUserModel, siteModel);
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT);
favoritesAPI.getFavorites(adminUserModel).assertEntriesListDoesNotContain("targetGuid", siteModel.getGuid());
favoritesAPI.getFavorites(adminUserModel).assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid());
}
@TestRail(section = { TestGroup.REST_API,
@@ -62,10 +62,10 @@ public class DeleteFavoritesSanityTests extends RestTest
{
UserModel siteManager = usersWithRoles.getOneUserWithRole(UserRole.SiteManager);
restClient.authenticateUser(siteManager);
favoritesAPI.addSiteToFavorites(siteManager, siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(siteManager, siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.deleteSiteFromFavorites(siteManager, siteModel);
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT);
favoritesAPI.getFavorites(siteManager).assertEntriesListDoesNotContain("targetGuid", siteModel.getGuid());
favoritesAPI.getFavorites(siteManager).assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid());
}
@TestRail(section = { TestGroup.REST_API,
@@ -74,10 +74,10 @@ public class DeleteFavoritesSanityTests extends RestTest
{
UserModel siteCollaborator = usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator);
restClient.authenticateUser(siteCollaborator);
favoritesAPI.addSiteToFavorites(siteCollaborator, siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(siteCollaborator, siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.deleteSiteFromFavorites(siteCollaborator, siteModel);
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT);
favoritesAPI.getFavorites(siteCollaborator).assertEntriesListDoesNotContain("targetGuid", siteModel.getGuid());
favoritesAPI.getFavorites(siteCollaborator).assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid());
}
@TestRail(section = { TestGroup.REST_API,
@@ -86,10 +86,10 @@ public class DeleteFavoritesSanityTests extends RestTest
{
UserModel siteContributor = usersWithRoles.getOneUserWithRole(UserRole.SiteContributor);
restClient.authenticateUser(siteContributor);
favoritesAPI.addSiteToFavorites(siteContributor, siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(siteContributor, siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.deleteSiteFromFavorites(siteContributor, siteModel);
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT);
favoritesAPI.getFavorites(siteContributor).assertEntriesListDoesNotContain("targetGuid", siteModel.getGuid());
favoritesAPI.getFavorites(siteContributor).assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid());
}
@TestRail(section = { TestGroup.REST_API,
@@ -98,10 +98,10 @@ public class DeleteFavoritesSanityTests extends RestTest
{
UserModel siteConsumer = usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer);
restClient.authenticateUser(siteConsumer);
favoritesAPI.addSiteToFavorites(siteConsumer, siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(siteConsumer, siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.deleteSiteFromFavorites(siteConsumer, siteModel);
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT);
favoritesAPI.getFavorites(siteConsumer).assertEntriesListDoesNotContain("targetGuid", siteModel.getGuid());
favoritesAPI.getFavorites(siteConsumer).assertThat().entriesListDoesNotContain("targetGuid", siteModel.getGuid());
}
@TestRail(section = { TestGroup.REST_API,
@@ -111,7 +111,7 @@ public class DeleteFavoritesSanityTests extends RestTest
{
UserModel siteCollaborator = usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator);
restClient.authenticateUser(siteCollaborator);
favoritesAPI.addSiteToFavorites(siteCollaborator, siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(siteCollaborator, siteModel).and().field("targetGuid").is(siteModel.getGuid());
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer));
favoritesAPI.deleteSiteFromFavorites(siteCollaborator, siteModel);
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED);
@@ -122,7 +122,7 @@ public class DeleteFavoritesSanityTests extends RestTest
public void userIsNotAbleToDeleteFavoritesOfAdminUser() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(adminUserModel);
favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().field("targetGuid").is(siteModel.getGuid());
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer));
favoritesAPI.deleteSiteFromFavorites(adminUserModel, siteModel);
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED);
@@ -134,7 +134,7 @@ public class DeleteFavoritesSanityTests extends RestTest
{
UserModel siteCollaborator = usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator);
restClient.authenticateUser(siteCollaborator);
favoritesAPI.addSiteToFavorites(siteCollaborator, siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(siteCollaborator, siteModel).and().field("targetGuid").is(siteModel.getGuid());
restClient.authenticateUser(adminUserModel);
favoritesAPI.deleteSiteFromFavorites(siteCollaborator, siteModel);
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(ErrorModel.PERMISSION_WAS_DENIED);
e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSanityTests.java
+20 -15
View File
@@ -7,7 +7,12 @@ import org.alfresco.rest.requests.RestFavoritesApi;
import org.alfresco.rest.requests.RestSitesApi;
import org.alfresco.utility.constants.UserRole;
import org.alfresco.utility.data.DataUser.ListUserWithRoles;
import org.alfresco.utility.model.*;
import org.alfresco.utility.model.ErrorModel;
import org.alfresco.utility.model.FileModel;
import org.alfresco.utility.model.FolderModel;
import org.alfresco.utility.model.SiteModel;
import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.report.Bug;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
@@ -52,8 +57,8 @@ public class GetFavoriteSanityTests extends RestTest
TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorite site with Rest API and status code is 200")
public void adminIsAbleToRetrieveFavoritesSite() throws JsonToModelConversionException, Exception
{
favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.getSiteFavorites(adminUserModel, siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(adminUserModel, siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.getSiteFavorites(adminUserModel, siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -61,8 +66,8 @@ public class GetFavoriteSanityTests extends RestTest
TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorite folder with Rest API and status code is 200")
public void adminIsAbleToRetrieveFavoritesFolder() throws JsonToModelConversionException, Exception
{
favoritesAPI.addFolderToFavorites(adminUserModel, folderModel).and().assertField("targetGuid").is(folderModel.getNodeRef());
favoritesAPI.getFolderFavorites(adminUserModel, folderModel).and().assertField("targetGuid").is(folderModel.getNodeRef());
favoritesAPI.addFolderToFavorites(adminUserModel, folderModel).and().field("targetGuid").is(folderModel.getNodeRef());
favoritesAPI.getFolderFavorites(adminUserModel, folderModel).and().field("targetGuid").is(folderModel.getNodeRef());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -70,8 +75,8 @@ public class GetFavoriteSanityTests extends RestTest
TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorite file with Rest API and status code is 200")
public void adminIsAbleToRetrieveFavoritesFile() throws JsonToModelConversionException, Exception
{
favoritesAPI.addFileToFavorites(adminUserModel, fileModel).and().assertField("targetGuid").is(fileModel.getNodeRef().replace(";1.0", ""));
favoritesAPI.getFileFavorites(adminUserModel, fileModel).and().assertField("targetGuid").is(fileModel.getNodeRef().replace(";1.0", ""));
favoritesAPI.addFileToFavorites(adminUserModel, fileModel).and().field("targetGuid").is(fileModel.getNodeRef().replace(";1.0", ""));
favoritesAPI.getFileFavorites(adminUserModel, fileModel).and().field("targetGuid").is(fileModel.getNodeRef().replace(";1.0", ""));
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -80,8 +85,8 @@ public class GetFavoriteSanityTests extends RestTest
public void managerIsAbleToRetrieveFavorite() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -90,8 +95,8 @@ public class GetFavoriteSanityTests extends RestTest
public void collaboratorIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -100,8 +105,8 @@ public class GetFavoriteSanityTests extends RestTest
public void contributorIsAbleToRetrieveFavorite() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -110,8 +115,8 @@ public class GetFavoriteSanityTests extends RestTest
public void consumerIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel).and().assertField("targetGuid").is(siteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.getSiteFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), siteModel).and().field("targetGuid").is(siteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
e2e-test/java/org/alfresco/rest/favorites/GetFavoritesSanityTests.java
+34 -29
View File
@@ -7,7 +7,12 @@ import org.alfresco.rest.requests.RestFavoritesApi;
import org.alfresco.rest.requests.RestSitesApi;
import org.alfresco.utility.constants.UserRole;
import org.alfresco.utility.data.DataUser.ListUserWithRoles;
import org.alfresco.utility.model.*;
import org.alfresco.utility.model.ErrorModel;
import org.alfresco.utility.model.FileModel;
import org.alfresco.utility.model.FolderModel;
import org.alfresco.utility.model.SiteModel;
import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.report.Bug;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
@@ -60,11 +65,11 @@ public class GetFavoritesSanityTests extends RestTest
TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorites sites with Rest API and status code is 200")
public void adminIsAbleToRetrieveFavoritesSites() throws JsonToModelConversionException, Exception
{
favoritesAPI.addSiteToFavorites(adminUserModel, firstSiteModel).and().assertField("targetGuid").is(firstSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(adminUserModel, secondSiteModel).and().assertField("targetGuid").is(secondSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(adminUserModel, firstSiteModel).and().field("targetGuid").is(firstSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(adminUserModel, secondSiteModel).and().field("targetGuid").is(secondSiteModel.getGuid());
favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(adminUserModel)
.assertEntriesListContains("targetGuid", firstSiteModel.getGuid())
.assertEntriesListContains("targetGuid", secondSiteModel.getGuid());
.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid())
.and().entriesListContains("targetGuid", secondSiteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -72,11 +77,11 @@ public class GetFavoritesSanityTests extends RestTest
TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorites folders with Rest API and status code is 200")
public void adminIsAbleToRetrieveFavoritesFolders() throws JsonToModelConversionException, Exception
{
favoritesAPI.addFolderToFavorites(adminUserModel, firstFolderModel).and().assertField("targetGuid").is(firstFolderModel.getNodeRef());
favoritesAPI.addFolderToFavorites(adminUserModel, secondFolderModel).and().assertField("targetGuid").is(secondFolderModel.getNodeRef());
favoritesAPI.addFolderToFavorites(adminUserModel, firstFolderModel).and().field("targetGuid").is(firstFolderModel.getNodeRef());
favoritesAPI.addFolderToFavorites(adminUserModel, secondFolderModel).and().field("targetGuid").is(secondFolderModel.getNodeRef());
favoritesAPI.where().targetFolderExist().filterAnd().getFavorites(adminUserModel)
.assertEntriesListContains("targetGuid", firstFolderModel.getNodeRef())
.assertEntriesListContains("targetGuid", secondFolderModel.getNodeRef());
.assertThat().entriesListContains("targetGuid", firstFolderModel.getNodeRef())
.and().entriesListContains("targetGuid", secondFolderModel.getNodeRef());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -84,11 +89,11 @@ public class GetFavoritesSanityTests extends RestTest
TestGroup.FAVORITES }, executionType = ExecutionType.SANITY, description = "Verify Admin user gets favorites files with Rest API and status code is 200")
public void adminIsAbleToRetrieveFavoritesFiles() throws JsonToModelConversionException, Exception
{
favoritesAPI.addFileToFavorites(adminUserModel, firstFileModel).and().assertField("targetGuid").is(firstFileModel.getNodeRef().replace(";1.0", ""));
favoritesAPI.addFileToFavorites(adminUserModel, secondFileModel).and().assertField("targetGuid").is(secondFileModel.getNodeRef().replace(";1.0", ""));
favoritesAPI.addFileToFavorites(adminUserModel, firstFileModel).and().field("targetGuid").is(firstFileModel.getNodeRef().replace(";1.0", ""));
favoritesAPI.addFileToFavorites(adminUserModel, secondFileModel).and().field("targetGuid").is(secondFileModel.getNodeRef().replace(";1.0", ""));
favoritesAPI.where().targetFileExist().filterAnd().getFavorites(adminUserModel)
.assertEntriesListContains("targetGuid", firstFileModel.getNodeRef().replace(";1.0", ""))
.assertEntriesListContains("targetGuid", secondFileModel.getNodeRef().replace(";1.0", ""));
.assertThat().entriesListContains("targetGuid", firstFileModel.getNodeRef().replace(";1.0", ""))
.and().entriesListContains("targetGuid", secondFileModel.getNodeRef().replace(";1.0", ""));
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -97,11 +102,11 @@ public class GetFavoritesSanityTests extends RestTest
public void managerIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), firstSiteModel).and().assertField("targetGuid").is(firstSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), secondSiteModel).and().assertField("targetGuid").is(secondSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), firstSiteModel).and().field("targetGuid").is(firstSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager), secondSiteModel).and().field("targetGuid").is(secondSiteModel.getGuid());
favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteManager))
.assertEntriesListContains("targetGuid", firstSiteModel.getGuid())
.assertEntriesListContains("targetGuid", secondSiteModel.getGuid());
.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid())
.assertThat().entriesListContains("targetGuid", secondSiteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -110,11 +115,11 @@ public class GetFavoritesSanityTests extends RestTest
public void collaboratorIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), firstSiteModel).and().assertField("targetGuid").is(firstSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), secondSiteModel).and().assertField("targetGuid").is(secondSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), firstSiteModel).and().field("targetGuid").is(firstSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator), secondSiteModel).and().field("targetGuid").is(secondSiteModel.getGuid());
favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator))
.assertEntriesListContains("targetGuid", firstSiteModel.getGuid())
.assertEntriesListContains("targetGuid", secondSiteModel.getGuid());
.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid())
.and().entriesListContains("targetGuid", secondSiteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -123,11 +128,11 @@ public class GetFavoritesSanityTests extends RestTest
public void contributorIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), firstSiteModel).and().assertField("targetGuid").is(firstSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), secondSiteModel).and().assertField("targetGuid").is(secondSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), firstSiteModel).and().field("targetGuid").is(firstSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor), secondSiteModel).and().field("targetGuid").is(secondSiteModel.getGuid());
favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor))
.assertEntriesListContains("targetGuid", firstSiteModel.getGuid())
.assertEntriesListContains("targetGuid", secondSiteModel.getGuid());
.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid()).and()
.entriesListContains("targetGuid", secondSiteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -136,11 +141,11 @@ public class GetFavoritesSanityTests extends RestTest
public void consumerIsAbleToRetrieveFavorites() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer));
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), firstSiteModel).and().assertField("targetGuid").is(firstSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), secondSiteModel).and().assertField("targetGuid").is(secondSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), firstSiteModel).and().field("targetGuid").is(firstSiteModel.getGuid());
favoritesAPI.addSiteToFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer), secondSiteModel).and().field("targetGuid").is(secondSiteModel.getGuid());
favoritesAPI.where().targetSiteExist().filterAnd().getFavorites(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer))
.assertEntriesListContains("targetGuid", firstSiteModel.getGuid())
.assertEntriesListContains("targetGuid", secondSiteModel.getGuid());
.assertThat().entriesListContains("targetGuid", firstSiteModel.getGuid())
.assertThat().entriesListContains("targetGuid", secondSiteModel.getGuid());
favoritesAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessItemSanityTests.java
+3 -1
View File
@@ -92,7 +92,9 @@ public class AddProcessItemSanityTests extends RestWorkflowTest
.and().field("mimeType").is(processItem.getMimeType());
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
processesApi.getProcessesItems(processModel).assertThat().entriesListContains("id", processItem.getId());
processesApi.getProcessesItems(processModel)
.assertThat().entriesListContains("id", processItem.getId()).and()
.entriesListContains("name", document3.getName());
processItem = processesApi.addProcessItem(processModel, document3);
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.BAD_REQUEST);
}
e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessSanityTests.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class AddProcessSanityTests extends RestWorkflowTest
restClient.authenticateUser(userWhoStartsProcess);
addedProcess = processesApi.addProcess("activitiAdhoc", assignee, false, Priority.Normal);
addedProcess.assertThat().field("id").is(addedProcess.getId())
.and().field("startUserId").is(addedProcess.getStartUserId());
.and().field("startUserId").is(addedProcess.getStartUserId());
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
processesApi.getProcesses().assertThat().entriesListContains("id", addedProcess.getId());
e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessVariableSanityTests.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest
processVariable = processesApi.addProcessVariable(processModel, variableModel);
processVariable.assertThat().field("name").is(processVariable.getName())
.and().field("type").is(processVariable.getType())
.and().field("value").is(processVariable.getValue());
.and().field("value").is(processVariable.getValue());
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
processesApi.getProcessesVariables(processModel).assertThat().entriesListContains("name", processVariable.getName());
e2e-test/java/org/alfresco/rest/workflow/tasks/AddTaskItemSanityTests.java
+2 -2
View File
@@ -108,7 +108,7 @@ public class AddTaskItemSanityTests extends RestWorkflowTest
dataWorkflow.usingUser(tenantUser).usingSite(siteModel).usingResource(fileModel).createNewTaskAndAssignTo(tenantUserAssignee);
document4 = dataContent.usingSite(siteModel).createContent(DocumentType.XML);
taskItem = tasksApi.addTaskItem(taskModel, document4);
taskItem = tasksApi.addTaskItem(taskModel, document4);
taskItem.assertThat().field("createdAt").is(taskItem.getCreatedAt())
.and().field("size").is(taskItem.getSize())
.and().field("createdBy").is(taskItem.getCreatedBy())
@@ -116,7 +116,7 @@ public class AddTaskItemSanityTests extends RestWorkflowTest
.and().field("name").is(taskItem.getName())
.and().field("modifiedBy").is(taskItem.getModifiedBy())
.and().field("id").is(taskItem.getId())
.and().field("mimeType").is(taskItem.getMimeType());
.and().field("mimeType").is(taskItem.getMimeType());
tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}
}
e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskItemsSanityTests.java
+8 -3
View File
@@ -5,6 +5,7 @@ import org.alfresco.rest.RestWorkflowTest;
import org.alfresco.rest.model.RestItemModel;
import org.alfresco.rest.requests.RestTasksApi;
import org.alfresco.rest.requests.RestTenantApi;
import org.alfresco.utility.Utility;
import org.alfresco.utility.model.FileModel;
import org.alfresco.utility.model.SiteModel;
import org.alfresco.utility.model.TaskModel;
@@ -51,9 +52,11 @@ public class GetTaskItemsSanityTests extends RestWorkflowTest
restClient.authenticateUser(userWhoStartsTask);
document1 = dataContent.usingSite(siteModel).createContent(DocumentType.XML);
taskItem = tasksApi.addTaskItem(taskModel, document1);
Utility.checkObjectIsInitialized(taskItem, "taskItem");
tasksApi.getTaskItems(taskModel).assertThat()
.entriesListIsNotEmpty().and()
.entriesListContains("id", taskItem.getId());
.entriesListContains("id", taskItem.getId()).and()
.entriesListContains("name", document1.getName());
tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -67,7 +70,8 @@ public class GetTaskItemsSanityTests extends RestWorkflowTest
taskItem = tasksApi.addTaskItem(taskModel, document1);
tasksApi.getTaskItems(taskModel).assertThat()
.entriesListIsNotEmpty().and()
.entriesListContains("id", taskItem.getId());
.entriesListContains("id", taskItem.getId()).and()
.entriesListContains("name", document1.getName());
tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -93,7 +97,8 @@ public class GetTaskItemsSanityTests extends RestWorkflowTest
taskItem = tasksApi.addTaskItem(taskModel, document1);
tasksApi.getTaskItems(taskModel).assertThat()
.entriesListIsNotEmpty().and()
.entriesListContains("id", taskItem.getId());
.entriesListContains("id", taskItem.getId()).and()
.entriesListContains("name", document1.getName());
tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
}
e2e-test/java/org/alfresco/rest/workflow/tasks/RemoveTaskItemSanityTests.java
+3 -1
View File
@@ -56,7 +56,9 @@ public class RemoveTaskItemSanityTests extends RestWorkflowTest
taskItem = tasksApi.addTaskItem(taskModel, document2);
tasksApi.deleteTaskItem(taskModel, taskItem);
tasksApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT);
tasksApi.getTaskItems(taskModel).assertThat().entriesListDoesNotContain("id", taskItem.getId());
tasksApi.getTaskItems(taskModel)
.assertThat().entriesListDoesNotContain("id", taskItem.getId()).and()
.entriesListDoesNotContain("name", document2.getName());
}
@TestRail(section = {TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.TASKS }, executionType = ExecutionType.SANITY,
e2e-test/java/org/alfresco/rest/workflow/tasks/UpdateTaskVariableSanityTests.java
+1 -1
View File
@@ -108,7 +108,7 @@ public class UpdateTaskVariableSanityTests extends RestWorkflowTest
taskVariable.assertThat().field("scope").is(taskVariable.getScope())
.and().field("name").is(taskVariable.getName())
.and().field("type").is(taskVariable.getType())
.and().field("value").is(taskVariable.getValue());
.and().field("value").is(taskVariable.getValue());
variableModel.setValue("updatedValue");
taskVariable = tasksApi.updateTaskVariable(taskModel, variableModel).and().field("value").is("updatedValue");