From a654c31d57813d2491dfc51d589ab6b17a053793 Mon Sep 17 00:00:00 2001 From: Cristina Axinte Date: Fri, 30 Sep 2016 17:20:39 +0300 Subject: [PATCH 1/7] TAS-992 getPersonActivities call test with Manager role --- .../rest/people/GetPeopleActivitiesTests.java | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java new file mode 100644 index 000000000..4dc57da78 --- /dev/null +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java @@ -0,0 +1,53 @@ +package org.alfresco.rest.people; + +import org.alfresco.dataprep.CMISUtil.DocumentType; +import org.alfresco.rest.RestTest; +import org.alfresco.rest.requests.RestPeopleApi; +import org.alfresco.utility.constants.UserRole; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.UserModel; +import org.alfresco.utility.testrail.ExecutionType; +import org.alfresco.utility.testrail.annotation.TestRail; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +/** + * @author Cristina Axinte + * + * Tests for getActivities (/people/{personId}/activities) RestAPI call + * + */ +@Test(groups = { "rest-api", "people", "activities" }) +public class GetPeopleActivitiesTests extends RestTest +{ + @Autowired + RestPeopleApi peopleApi; + + UserModel userModel; + SiteModel siteModel; + UserModel searchedUser; + + @BeforeClass(alwaysRun = true) + public void dataPreparation() throws Exception + { + userModel = dataUser.createRandomTestUser(); + siteModel = dataSite.usingUser(userModel).createPublicRandomSite(); + dataContent.usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); + + peopleApi.useRestClient(restClient); + } + + @TestRail(section = { "rest-api", "people" }, executionType = ExecutionType.SANITY, description = "Verify manager user gets a person with Rest API and response is successful") + public void managerUserChecksIfPersonIsPresent() throws Exception + { + UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); + dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); + dataContent.usingUser(managerUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); + + restClient.authenticateUser(managerUser); + peopleApi.getPersonActivities(managerUser); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); + } +} From 5cd4d65a171bcd1d2bc2c0f65e98c1300ab7042b Mon Sep 17 00:00:00 2001 From: Cristina Axinte Date: Fri, 30 Sep 2016 17:37:51 +0300 Subject: [PATCH 2/7] TAS-993 getPersonActivities call test with Collaborator role --- .../rest/people/GetPeopleActivitiesTests.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java index 4dc57da78..585c13a35 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java @@ -19,7 +19,7 @@ import org.testng.annotations.Test; * Tests for getActivities (/people/{personId}/activities) RestAPI call * */ -@Test(groups = { "rest-api", "people", "activities" }) +@Test(groups = { "rest-api", "people", "activities", "sanity" }) public class GetPeopleActivitiesTests extends RestTest { @Autowired @@ -39,15 +39,27 @@ public class GetPeopleActivitiesTests extends RestTest peopleApi.useRestClient(restClient); } - @TestRail(section = { "rest-api", "people" }, executionType = ExecutionType.SANITY, description = "Verify manager user gets a person with Rest API and response is successful") - public void managerUserChecksIfPersonIsPresent() throws Exception + @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify manager user gets its activities with Rest API and response is successful") + public void managerUserGetsPeopleActivitiesListSuccessful() throws Exception { UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); dataContent.usingUser(managerUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(managerUser); - peopleApi.getPersonActivities(managerUser); + peopleApi.getPersonActivities(managerUser).assertActivityListIsNotEmpty(); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); + } + + @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify collaborator user gets its activities with Rest API and response is successful") + public void collaboratorUserGetsPeopleActivitiesListSuccessful() throws Exception + { + UserModel collaboratorUser = dataUser.usingAdmin().createRandomTestUser(); + dataUser.usingUser(userModel).addUserToSite(collaboratorUser, siteModel, UserRole.SiteCollaborator); + dataContent.usingUser(collaboratorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); + + restClient.authenticateUser(collaboratorUser); + peopleApi.getPersonActivities(collaboratorUser).assertActivityListIsNotEmpty(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } } From 345edf223967196bf4f1f582265c16c7801883f5 Mon Sep 17 00:00:00 2001 From: Cristina Axinte Date: Fri, 30 Sep 2016 17:45:20 +0300 Subject: [PATCH 3/7] TAS-994 getPersonActivities call test with Contributor role --- .../rest/people/GetPeopleActivitiesTests.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java index 585c13a35..988905877 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java @@ -62,4 +62,16 @@ public class GetPeopleActivitiesTests extends RestTest peopleApi.getPersonActivities(collaboratorUser).assertActivityListIsNotEmpty(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } + + @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify contributor user gets its activities with Rest API and response is successful") + public void contributorUserGetsPeopleActivitiesListSuccessful() throws Exception + { + UserModel contributorUser = dataUser.usingAdmin().createRandomTestUser(); + dataUser.usingUser(userModel).addUserToSite(contributorUser, siteModel, UserRole.SiteContributor); + dataContent.usingUser(contributorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); + + restClient.authenticateUser(contributorUser); + peopleApi.getPersonActivities(contributorUser).assertActivityListIsNotEmpty(); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); + } } From acd602122748289338c7db09333bc20341866432 Mon Sep 17 00:00:00 2001 From: Cristina Axinte Date: Fri, 30 Sep 2016 17:51:17 +0300 Subject: [PATCH 4/7] TAS-995 getPersonActivities call test with Consumer role --- .../rest/people/GetPeopleActivitiesTests.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java index 988905877..90c1a01f4 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java @@ -74,4 +74,15 @@ public class GetPeopleActivitiesTests extends RestTest peopleApi.getPersonActivities(contributorUser).assertActivityListIsNotEmpty(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } + + @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify consumer user gets its activities with Rest API and response is successful") + public void consumerUserGetsPeopleActivitiesListSuccessful() throws Exception + { + UserModel consumerUser = dataUser.usingAdmin().createRandomTestUser(); + dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer); + + restClient.authenticateUser(consumerUser); + peopleApi.getPersonActivities(consumerUser).assertActivityListIsNotEmpty(); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); + } } From bc2db32cbe60ec86bb7af1f52dec3f3bfd3a4bdc Mon Sep 17 00:00:00 2001 From: Cristina Axinte Date: Fri, 30 Sep 2016 17:59:31 +0300 Subject: [PATCH 5/7] TAS-996 getPersonActivities call test with admin user --- .../alfresco/rest/people/GetPeopleActivitiesTests.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java index 90c1a01f4..1c9714577 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java @@ -85,4 +85,14 @@ public class GetPeopleActivitiesTests extends RestTest peopleApi.getPersonActivities(consumerUser).assertActivityListIsNotEmpty(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } + + @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify admin user gets another user activities with Rest API and response is successful") + public void adminUserGetsPeopleActivitiesListSuccessful() throws Exception + { + UserModel adminUser = dataUser.getAdminUser(); + + restClient.authenticateUser(adminUser); + peopleApi.getPersonActivities(userModel).assertActivityListIsNotEmpty(); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); + } } From 3298eb0d759380372ef7cb7fed8d1edfa5832b86 Mon Sep 17 00:00:00 2001 From: Cristina Axinte Date: Fri, 30 Sep 2016 18:47:10 +0300 Subject: [PATCH 6/7] TAS-997 fail getPersonActivities call test with Manager role --- .../rest/people/GetPeopleActivitiesTests.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java index 1c9714577..22d4e8800 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java @@ -6,6 +6,7 @@ import org.alfresco.rest.requests.RestPeopleApi; import org.alfresco.utility.constants.UserRole; import org.alfresco.utility.model.SiteModel; 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; import org.springframework.beans.factory.annotation.Autowired; @@ -95,4 +96,17 @@ public class GetPeopleActivitiesTests extends RestTest peopleApi.getPersonActivities(userModel).assertActivityListIsNotEmpty(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } + + @Bug(id = "") + @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify manager user is NOT Authorized to gets another user activities with Rest API") + public void managerUserGetsPeopleActivitiesListIsNotAuthorized() throws Exception + { + UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); + dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); + managerUser.setPassword("newpassword"); + + restClient.authenticateUser(managerUser); + peopleApi.getPersonActivities(userModel); + peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.UNAUTHORIZED); + } } From 10f8ecac5baaa4512b09be4a5283a468002ebde9 Mon Sep 17 00:00:00 2001 From: cnechifor Date: Tue, 4 Oct 2016 10:28:55 +0300 Subject: [PATCH 7/7] refactor --- .../rest/people/GetPeopleActivitiesTests.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java index 22d4e8800..ab02b12c8 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesTests.java @@ -41,65 +41,64 @@ public class GetPeopleActivitiesTests extends RestTest } @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify manager user gets its activities with Rest API and response is successful") - public void managerUserGetsPeopleActivitiesListSuccessful() throws Exception + public void managerUserShouldGetPeopleActivitiesList() throws Exception { UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager); dataContent.usingUser(managerUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(managerUser); - peopleApi.getPersonActivities(managerUser).assertActivityListIsNotEmpty(); + peopleApi.getPersonActivities(managerUser).assertResponseIsNotEmpty(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify collaborator user gets its activities with Rest API and response is successful") - public void collaboratorUserGetsPeopleActivitiesListSuccessful() throws Exception + public void collaboratorUserShouldGetPeopleActivitiesList() throws Exception { UserModel collaboratorUser = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(collaboratorUser, siteModel, UserRole.SiteCollaborator); dataContent.usingUser(collaboratorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(collaboratorUser); - peopleApi.getPersonActivities(collaboratorUser).assertActivityListIsNotEmpty(); + peopleApi.getPersonActivities(collaboratorUser).assertResponseIsNotEmpty(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify contributor user gets its activities with Rest API and response is successful") - public void contributorUserGetsPeopleActivitiesListSuccessful() throws Exception + public void contributorUserShouldGetPeopleActivitiesList() throws Exception { UserModel contributorUser = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(contributorUser, siteModel, UserRole.SiteContributor); dataContent.usingUser(contributorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); restClient.authenticateUser(contributorUser); - peopleApi.getPersonActivities(contributorUser).assertActivityListIsNotEmpty(); + peopleApi.getPersonActivities(contributorUser).assertResponseIsNotEmpty(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify consumer user gets its activities with Rest API and response is successful") - public void consumerUserGetsPeopleActivitiesListSuccessful() throws Exception + public void consumerUserShouldGetPeopleActivitiesList() throws Exception { UserModel consumerUser = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer); - + dataContent.usingUser(consumerUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN); + restClient.authenticateUser(consumerUser); - peopleApi.getPersonActivities(consumerUser).assertActivityListIsNotEmpty(); + peopleApi.getPersonActivities(consumerUser).assertResponseIsNotEmpty(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify admin user gets another user activities with Rest API and response is successful") - public void adminUserGetsPeopleActivitiesListSuccessful() throws Exception + public void adminUserShouldGetPeopleActivitiesList() throws Exception { - UserModel adminUser = dataUser.getAdminUser(); - - restClient.authenticateUser(adminUser); - peopleApi.getPersonActivities(userModel).assertActivityListIsNotEmpty(); + restClient.authenticateUser(dataUser.getAdminUser()); + peopleApi.getPersonActivities(userModel).assertResponseIsNotEmpty(); peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK); } @Bug(id = "") @TestRail(section = { "rest-api", "people", "activities" }, executionType = ExecutionType.SANITY, description = "Verify manager user is NOT Authorized to gets another user activities with Rest API") - public void managerUserGetsPeopleActivitiesListIsNotAuthorized() throws Exception + public void managerUserShouldGetPeopleActivitiesListIsNotAuthorized() throws Exception { UserModel managerUser = dataUser.usingAdmin().createRandomTestUser(); dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager);