From cdef522d4fa410e043c30e641a3d5bb3b91d080d Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Thu, 10 Aug 2017 10:02:43 +0300 Subject: [PATCH 1/4] REPO-1858 --- .../people/GetAvatarPeopleSanityTest.java | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 e2e-test/java/org/alfresco/rest/people/GetAvatarPeopleSanityTest.java diff --git a/e2e-test/java/org/alfresco/rest/people/GetAvatarPeopleSanityTest.java b/e2e-test/java/org/alfresco/rest/people/GetAvatarPeopleSanityTest.java new file mode 100644 index 000000000..8f6bc81f4 --- /dev/null +++ b/e2e-test/java/org/alfresco/rest/people/GetAvatarPeopleSanityTest.java @@ -0,0 +1,56 @@ +package org.alfresco.rest.people; + +import java.io.File; + +import org.alfresco.rest.RestTest; +import org.alfresco.utility.Utility; +import org.alfresco.utility.exception.DataPreparationException; +import org.alfresco.utility.model.TestGroup; +import org.alfresco.utility.model.UserModel; +import org.alfresco.utility.testrail.ExecutionType; +import org.alfresco.utility.testrail.annotation.TestRail; +import org.springframework.http.HttpStatus; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +public class GetAvatarPeopleSanityTest extends RestTest { + + private UserModel userModel; + + @BeforeClass(alwaysRun = true) + public void dataPreparation() throws DataPreparationException { + userModel = dataUser.createRandomTestUser(); + } + + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Update Avatar for People") + public void updateGetAvatarForPeople() throws Exception { + + File avatarFile = Utility.getResourceTestDataFile("avatar.jpg"); + restClient.authenticateUser(userModel); + restClient.withCoreAPI().usingAuthUser() + .uploadAvatarContent(restProperties.envProperty().getFullServerUrl(), avatarFile).statusCode(200); + restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().downloadAvatarContent(); + restClient.assertStatusCodeIs(HttpStatus.OK); + + } + + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Update Avatar for People") + public void removeGetAvatarForPeople() throws Exception { + File avatarFile = Utility.getResourceTestDataFile("avatar.jpg"); + restClient.authenticateUser(userModel); + restClient.withCoreAPI().usingAuthUser() + .uploadAvatarContent(restProperties.envProperty().getFullServerUrl(), avatarFile).statusCode(200); + + restClient.authenticateUser(userModel); + restClient.withCoreAPI().usingAuthUser().resetAvatarImageRequest(); + restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); + + restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().downloadAvatarContent(); + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND); + } + +} From fed62445767c87b618de4321c490d56123f86708 Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Thu, 10 Aug 2017 16:12:26 +0300 Subject: [PATCH 2/4] problem init dataPreparation --- e2e-test/java/org/alfresco/rest/audit/AuditTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e-test/java/org/alfresco/rest/audit/AuditTest.java b/e2e-test/java/org/alfresco/rest/audit/AuditTest.java index a64f4147f..535e277e6 100644 --- a/e2e-test/java/org/alfresco/rest/audit/AuditTest.java +++ b/e2e-test/java/org/alfresco/rest/audit/AuditTest.java @@ -51,6 +51,7 @@ public abstract class AuditTest extends RestTest { //Audit API is designed for users with admin rights (except /nodes/{nodeId}/audit-entries) //Create users and add userModel as SiteCollaborator on private site + privateTestSite = dataSite.createPrivateRandomSite(); userModel = dataUser.createRandomTestUser(); userModel1 = dataUser.createRandomTestUser(); adminUser = dataUser.getAdminUser(); From 77209423e6b6ef554cbd650b7b30e9e3507352bb Mon Sep 17 00:00:00 2001 From: Alexandru-Eusebiu Epure Date: Thu, 10 Aug 2017 17:30:08 +0300 Subject: [PATCH 3/4] REPO-1821 : Avatar REST API Rename GetAvatarPeopleSanityTest.java to AvatarPeopleSanityTests.java because this class contains GET/PUT/POST /people/{personId}/avatar requests. Format the code avatar API specific code (Tests+requests). --- .../rest/people/AvatarPeopleSanityTest.java | 57 +++++++++++++++++++ .../people/GetAvatarPeopleSanityTest.java | 56 ------------------ e2e-test/resources/default.properties | 2 +- 3 files changed, 58 insertions(+), 57 deletions(-) create mode 100644 e2e-test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java delete mode 100644 e2e-test/java/org/alfresco/rest/people/GetAvatarPeopleSanityTest.java diff --git a/e2e-test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java b/e2e-test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java new file mode 100644 index 000000000..709dc6ce1 --- /dev/null +++ b/e2e-test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java @@ -0,0 +1,57 @@ +package org.alfresco.rest.people; + +import java.io.File; + +import org.alfresco.rest.RestTest; +import org.alfresco.utility.Utility; +import org.alfresco.utility.exception.DataPreparationException; +import org.alfresco.utility.model.TestGroup; +import org.alfresco.utility.model.UserModel; +import org.alfresco.utility.testrail.ExecutionType; +import org.alfresco.utility.testrail.annotation.TestRail; +import org.springframework.http.HttpStatus; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +public class AvatarPeopleSanityTest extends RestTest { + + private UserModel userModel; + + @BeforeClass(alwaysRun = true) + public void dataPreparation() throws DataPreparationException + { + userModel = dataUser.createRandomTestUser(); + } + + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Update Avatar for People") + public void updateGetAvatarForPeople() throws Exception + { + + File avatarFile = Utility.getResourceTestDataFile("avatar.jpg"); + restClient.authenticateUser(userModel); + restClient.withCoreAPI().usingAuthUser().uploadAvatarContent(restProperties.envProperty().getFullServerUrl(), avatarFile).statusCode(200); + restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().downloadAvatarContent(); + restClient.assertStatusCodeIs(HttpStatus.OK); + + } + + @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) + @TestRail(section = { TestGroup.REST_API, + TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Update Avatar for People") + public void removeGetAvatarForPeople() throws Exception + { + File avatarFile = Utility.getResourceTestDataFile("avatar.jpg"); + restClient.authenticateUser(userModel); + restClient.withCoreAPI().usingAuthUser().uploadAvatarContent(restProperties.envProperty().getFullServerUrl(), avatarFile).statusCode(200); + + restClient.authenticateUser(userModel); + restClient.withCoreAPI().usingAuthUser().resetAvatarImageRequest(); + restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); + + restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().downloadAvatarContent(); + restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND); + } + +} diff --git a/e2e-test/java/org/alfresco/rest/people/GetAvatarPeopleSanityTest.java b/e2e-test/java/org/alfresco/rest/people/GetAvatarPeopleSanityTest.java deleted file mode 100644 index 8f6bc81f4..000000000 --- a/e2e-test/java/org/alfresco/rest/people/GetAvatarPeopleSanityTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.alfresco.rest.people; - -import java.io.File; - -import org.alfresco.rest.RestTest; -import org.alfresco.utility.Utility; -import org.alfresco.utility.exception.DataPreparationException; -import org.alfresco.utility.model.TestGroup; -import org.alfresco.utility.model.UserModel; -import org.alfresco.utility.testrail.ExecutionType; -import org.alfresco.utility.testrail.annotation.TestRail; -import org.springframework.http.HttpStatus; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -public class GetAvatarPeopleSanityTest extends RestTest { - - private UserModel userModel; - - @BeforeClass(alwaysRun = true) - public void dataPreparation() throws DataPreparationException { - userModel = dataUser.createRandomTestUser(); - } - - @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Update Avatar for People") - public void updateGetAvatarForPeople() throws Exception { - - File avatarFile = Utility.getResourceTestDataFile("avatar.jpg"); - restClient.authenticateUser(userModel); - restClient.withCoreAPI().usingAuthUser() - .uploadAvatarContent(restProperties.envProperty().getFullServerUrl(), avatarFile).statusCode(200); - restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().downloadAvatarContent(); - restClient.assertStatusCodeIs(HttpStatus.OK); - - } - - @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Update Avatar for People") - public void removeGetAvatarForPeople() throws Exception { - File avatarFile = Utility.getResourceTestDataFile("avatar.jpg"); - restClient.authenticateUser(userModel); - restClient.withCoreAPI().usingAuthUser() - .uploadAvatarContent(restProperties.envProperty().getFullServerUrl(), avatarFile).statusCode(200); - - restClient.authenticateUser(userModel); - restClient.withCoreAPI().usingAuthUser().resetAvatarImageRequest(); - restClient.assertStatusCodeIs(HttpStatus.NO_CONTENT); - - restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().downloadAvatarContent(); - restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND); - } - -} diff --git a/e2e-test/resources/default.properties b/e2e-test/resources/default.properties index 2e4c58893..c195a6344 100644 --- a/e2e-test/resources/default.properties +++ b/e2e-test/resources/default.properties @@ -1,6 +1,6 @@ # dataprep related alfresco.scheme=http -alfresco.server=localhost +alfresco.server=172.29.100.209 alfresco.port=8080 # credentials From 7215d336801b3bf076d774c60a577096451c728e Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Thu, 31 Aug 2017 12:10:04 +0300 Subject: [PATCH 4/4] added more check on getAvatar --- .../rest/people/AvatarPeopleSanityTest.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java b/e2e-test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java index 709dc6ce1..5b6276d24 100644 --- a/e2e-test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java +++ b/e2e-test/java/org/alfresco/rest/people/AvatarPeopleSanityTest.java @@ -13,7 +13,12 @@ import org.springframework.http.HttpStatus; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -public class AvatarPeopleSanityTest extends RestTest { +import com.jayway.restassured.response.ValidatableResponse; + +import junit.framework.Assert; + +public class AvatarPeopleSanityTest extends RestTest +{ private UserModel userModel; @@ -24,22 +29,21 @@ public class AvatarPeopleSanityTest extends RestTest { } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Update Avatar for People") + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Update Avatar for People") public void updateGetAvatarForPeople() throws Exception { - File avatarFile = Utility.getResourceTestDataFile("avatar.jpg"); restClient.authenticateUser(userModel); - restClient.withCoreAPI().usingAuthUser().uploadAvatarContent(restProperties.envProperty().getFullServerUrl(), avatarFile).statusCode(200); + ValidatableResponse response = restClient.withCoreAPI().usingAuthUser() + .uploadAvatarContent(restProperties.envProperty().getFullServerUrl(), avatarFile).statusCode(200); restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().downloadAvatarContent(); restClient.assertStatusCodeIs(HttpStatus.OK); - + Assert.assertNotNull(response.extract().body().asByteArray()); + Assert.assertTrue("Avatar Image not uploaded", response.extract().body().asByteArray().length > 0); } @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY }) - @TestRail(section = { TestGroup.REST_API, - TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Update Avatar for People") + @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.SANITY, description = "Remove Avatar for People") public void removeGetAvatarForPeople() throws Exception { File avatarFile = Utility.getResourceTestDataFile("avatar.jpg");