From 6c464705929b0bb92c58b9d3cbf76bc87d92aaca Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Thu, 7 Sep 2017 10:02:53 +0300 Subject: [PATCH 1/3] update TAS dependency updates for tests for RM-5391(1) --- rm-automation/rm-automation-community-rest-api/pom.xml | 7 ++++++- .../alfresco/rest/rm/community/site/RMSiteTests.java | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 151b0bcce1..0fc4781ef4 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -15,7 +15,7 @@ 1.8 alfresco-rm-community-share alfresco-rm-community-repo - 5.2.0-7 + 5.2.0-9 2.0.0 @@ -68,5 +68,10 @@ fluent-json ${fluent.json.version} + + org.alfresco.test + alfresco-testng + 1.1 + diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java index 709881d2e4..cc0f560dd5 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java @@ -44,10 +44,10 @@ import static org.springframework.http.HttpStatus.FORBIDDEN; import static org.springframework.http.HttpStatus.NOT_FOUND; import static org.springframework.http.HttpStatus.NO_CONTENT; import static org.springframework.http.HttpStatus.OK; -import static org.springframework.social.alfresco.api.entities.Site.Visibility.PUBLIC; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import org.alfresco.dataprep.SiteService.Visibility; import org.alfresco.rest.rm.community.base.BaseRMRestTest; import org.alfresco.rest.rm.community.base.TestData; import org.alfresco.rest.rm.community.model.site.RMSite; @@ -97,7 +97,7 @@ public class RMSiteTests extends BaseRMRestTest assertEquals(rmSiteResponse.getTitle(), RM_TITLE); assertEquals(rmSiteResponse.getDescription(), RM_DESCRIPTION); assertEquals(rmSiteResponse.getCompliance(), STANDARD); - assertEquals(rmSiteResponse.getVisibility(), PUBLIC); + assertEquals(rmSiteResponse.getVisibility(), Visibility.PUBLIC); assertEquals(rmSiteResponse.getRole(), SiteManager.toString()); } @@ -178,7 +178,7 @@ public class RMSiteTests extends BaseRMRestTest assertEquals(rmSiteModel.getId(), RM_ID); assertEquals(rmSiteModel.getDescription(), RM_DESCRIPTION); assertEquals(rmSiteModel.getCompliance(), STANDARD); - assertEquals(rmSiteModel.getVisibility(), PUBLIC); + assertEquals(rmSiteModel.getVisibility(), Visibility.PUBLIC); } } @@ -217,7 +217,7 @@ public class RMSiteTests extends BaseRMRestTest assertEquals(rmSiteModel.getTitle(), RM_TITLE); assertEquals(rmSiteModel.getDescription(), RM_DESCRIPTION); assertEquals(rmSiteModel.getCompliance(), DOD5015); - assertEquals(rmSiteModel.getVisibility(), PUBLIC); + assertEquals(rmSiteModel.getVisibility(), Visibility.PUBLIC); assertEquals(rmSiteModel.getRole(), SiteManager.toString()); } @@ -259,7 +259,7 @@ public class RMSiteTests extends BaseRMRestTest assertEquals(rmSiteModel.getTitle(), NEW_TITLE); assertEquals(rmSiteModel.getDescription(), NEW_DESCRIPTION); assertNotNull(rmSiteModel.getCompliance()); - assertEquals(rmSiteModel.getVisibility(), PUBLIC); + assertEquals(rmSiteModel.getVisibility(), Visibility.PUBLIC); } /** From 53ca5e68edfb81fe204fce2b722caa6f51fe98f0 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Thu, 7 Sep 2017 15:06:32 +0300 Subject: [PATCH 2/3] exclude the initialization of web driver from the tas utility (issue introduce after upgrade the rest api tas dependency) --- .../java/org/alfresco/rest/rm/community/site/RMSiteTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java index cc0f560dd5..6b9653f284 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java @@ -47,7 +47,6 @@ import static org.springframework.http.HttpStatus.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import org.alfresco.dataprep.SiteService.Visibility; import org.alfresco.rest.rm.community.base.BaseRMRestTest; import org.alfresco.rest.rm.community.base.TestData; import org.alfresco.rest.rm.community.model.site.RMSite; @@ -55,6 +54,7 @@ import org.alfresco.rest.rm.community.requests.gscore.api.RMSiteAPI; import org.alfresco.utility.data.RandomData; import org.alfresco.utility.model.UserModel; import org.alfresco.utility.report.Bug; +import org.springframework.social.alfresco.api.entities.Site.Visibility; import org.testng.annotations.Test; /** From a8123895ae4e98fd21d689541776773f0d8a9c3e Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Mon, 11 Sep 2017 08:58:07 +0300 Subject: [PATCH 3/3] data prep dependency update and modification to address the issues encounter add a helper method to retrieve the rm node id based on the relative path using the core api --- .../src/main/java/org/alfresco/rest/core/v0/BaseAPI.java | 2 +- .../java/org/alfresco/rest/rm/community/site/RMSiteTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java index 1e88d4be45..dd0341b446 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java @@ -87,7 +87,7 @@ public abstract class BaseAPI private ContentService contentService; private static final String NODE_REF_WORKSPACE_SPACES_STORE = "workspace://SpacesStore/"; - private static final String FILE_PLAN_PATH = "Sites/rm/documentLibrary"; + private static final String FILE_PLAN_PATH = "/Sites/rm/documentLibrary"; /** * Helper method to extract list of properties values from result. diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java index 6b9653f284..cc0f560dd5 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java @@ -47,6 +47,7 @@ import static org.springframework.http.HttpStatus.OK; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import org.alfresco.dataprep.SiteService.Visibility; import org.alfresco.rest.rm.community.base.BaseRMRestTest; import org.alfresco.rest.rm.community.base.TestData; import org.alfresco.rest.rm.community.model.site.RMSite; @@ -54,7 +55,6 @@ import org.alfresco.rest.rm.community.requests.gscore.api.RMSiteAPI; import org.alfresco.utility.data.RandomData; import org.alfresco.utility.model.UserModel; import org.alfresco.utility.report.Bug; -import org.springframework.social.alfresco.api.entities.Site.Visibility; import org.testng.annotations.Test; /**