diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 7eeb2dd519..42b6aba536 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -14,6 +14,8 @@ 1.8 1.8 + testng.xml + true @@ -34,4 +36,19 @@ 2.0.0 + + + + + maven-surefire-plugin + + false + + ${project.build.testOutputDirectory}/${suiteXmlFile} + + ${skip.automationtests} + + + + diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponent.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponent.java similarity index 94% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponent.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponent.java index 2090616ac9..cebc2086ce 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponent.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponent.java @@ -9,10 +9,10 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model.fileplancomponents; +package org.alfresco.rest.rm.model.fileplancomponents; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.ALLOWABLE_OPERATIONS; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.PROPERTIES; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.ALLOWABLE_OPERATIONS; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.PROPERTIES; import java.util.List; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentAlias.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentAlias.java similarity index 92% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentAlias.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentAlias.java index 975324531a..c4ace365e8 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentAlias.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentAlias.java @@ -9,9 +9,9 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model.fileplancomponents; +package org.alfresco.rest.rm.model.fileplancomponents; -import static org.alfresco.rest.util.ParameterCheck.mandatoryString; +import static org.alfresco.rest.rm.util.ParameterCheck.mandatoryString; /** * File plan component alias enumeration diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentCreatedByUser.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentCreatedByUser.java similarity index 94% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentCreatedByUser.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentCreatedByUser.java index c7abc2f920..37b7cbab97 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentCreatedByUser.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentCreatedByUser.java @@ -9,7 +9,7 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model.fileplancomponents; +package org.alfresco.rest.rm.model.fileplancomponents; /** * POJO for file plan component created by object diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentEntry.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentEntry.java similarity index 83% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentEntry.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentEntry.java index 134ea684ba..3d3bd42609 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentEntry.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentEntry.java @@ -9,9 +9,9 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model.fileplancomponents; +package org.alfresco.rest.rm.model.fileplancomponents; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.ENTRY; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.ENTRY; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentFields.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentFields.java similarity index 95% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentFields.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentFields.java index fe59991f0e..34be00c579 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentFields.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentFields.java @@ -9,7 +9,7 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model.fileplancomponents; +package org.alfresco.rest.rm.model.fileplancomponents; /** * File plan component field names constants diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentProperties.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentProperties.java similarity index 81% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentProperties.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentProperties.java index 729c444eb5..91a2fbf681 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentProperties.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentProperties.java @@ -9,12 +9,12 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model.fileplancomponents; +package org.alfresco.rest.rm.model.fileplancomponents; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_DESCRIPTION; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_HOLD_REASON; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_VITAL_RECORD_INDICATOR; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_DESCRIPTION; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_HOLD_REASON; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_VITAL_RECORD_INDICATOR; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentType.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentType.java similarity index 93% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentType.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentType.java index 26173d3a8a..aa4eda6563 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentType.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentType.java @@ -9,9 +9,9 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model.fileplancomponents; +package org.alfresco.rest.rm.model.fileplancomponents; -import static org.alfresco.rest.util.ParameterCheck.mandatoryString; +import static org.alfresco.rest.rm.util.ParameterCheck.mandatoryString; /** * File plan component type enumeration diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentsCollection.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentsCollection.java similarity index 91% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentsCollection.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentsCollection.java index 14a40d6d9e..0b50a94d56 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentsCollection.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/fileplancomponents/FilePlanComponentsCollection.java @@ -9,7 +9,7 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model.fileplancomponents; +package org.alfresco.rest.rm.model.fileplancomponents; import org.alfresco.rest.core.RestModels; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/site/RMSite.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/site/RMSite.java similarity index 96% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/site/RMSite.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/site/RMSite.java index 296afaa9a1..c68d56bf96 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/site/RMSite.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/site/RMSite.java @@ -9,7 +9,7 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model.site; +package org.alfresco.rest.rm.model.site; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/site/RMSiteCompliance.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/site/RMSiteCompliance.java similarity index 91% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/site/RMSiteCompliance.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/site/RMSiteCompliance.java index ceb010694e..c2b57860bf 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/site/RMSiteCompliance.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/site/RMSiteCompliance.java @@ -9,7 +9,7 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model.site; +package org.alfresco.rest.rm.model.site; /** * RM Site compliance diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/site/RMSiteFields.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/site/RMSiteFields.java similarity index 96% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/site/RMSiteFields.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/site/RMSiteFields.java index 2f4804e78d..075b9e1b87 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/model/site/RMSiteFields.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/model/site/RMSiteFields.java @@ -9,7 +9,7 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model.site; +package org.alfresco.rest.rm.model.site; /** *RM Site properties from the RM Model Schema diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/requests/FilePlanComponentAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/requests/FilePlanComponentAPI.java similarity index 95% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/requests/FilePlanComponentAPI.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/requests/FilePlanComponentAPI.java index 72c2375325..de87b72593 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/requests/FilePlanComponentAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/requests/FilePlanComponentAPI.java @@ -9,12 +9,12 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.requests; +package org.alfresco.rest.rm.requests; import static org.alfresco.rest.core.RestRequest.requestWithBody; import static org.alfresco.rest.core.RestRequest.simpleRequest; -import static org.alfresco.rest.util.ParameterCheck.mandatoryObject; -import static org.alfresco.rest.util.ParameterCheck.mandatoryString; +import static org.alfresco.rest.rm.util.ParameterCheck.mandatoryObject; +import static org.alfresco.rest.rm.util.ParameterCheck.mandatoryString; import static org.springframework.http.HttpMethod.DELETE; import static org.springframework.http.HttpMethod.GET; import static org.springframework.http.HttpMethod.POST; @@ -23,8 +23,8 @@ import static org.springframework.http.HttpMethod.PUT; import com.google.gson.JsonObject; import org.alfresco.rest.core.RestAPI; -import org.alfresco.rest.model.fileplancomponents.FilePlanComponent; -import org.alfresco.rest.model.fileplancomponents.FilePlanComponentsCollection; +import org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponent; +import org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentsCollection; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/requests/RMSiteAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/requests/RMSiteAPI.java similarity index 96% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/requests/RMSiteAPI.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/requests/RMSiteAPI.java index 580d7703ea..83afd562e4 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/requests/RMSiteAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/requests/RMSiteAPI.java @@ -9,11 +9,11 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.requests; +package org.alfresco.rest.rm.requests; import static org.alfresco.rest.core.RestRequest.requestWithBody; import static org.alfresco.rest.core.RestRequest.simpleRequest; -import static org.alfresco.rest.util.ParameterCheck.mandatoryObject; +import static org.alfresco.rest.rm.util.ParameterCheck.mandatoryObject; import static org.springframework.http.HttpMethod.DELETE; import static org.springframework.http.HttpMethod.GET; import static org.springframework.http.HttpMethod.POST; @@ -22,7 +22,7 @@ import static org.springframework.http.HttpMethod.PUT; import com.google.gson.JsonObject; import org.alfresco.rest.core.RestAPI; -import org.alfresco.rest.model.site.RMSite; +import org.alfresco.rest.rm.model.site.RMSite; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/util/ParameterCheck.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/util/ParameterCheck.java similarity index 98% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/util/ParameterCheck.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/util/ParameterCheck.java index 2895d538b6..49e7a56eb5 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/util/ParameterCheck.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/util/ParameterCheck.java @@ -9,7 +9,7 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.util; +package org.alfresco.rest.rm.util; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/base/AllowableOperations.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/AllowableOperations.java similarity index 94% rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/base/AllowableOperations.java rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/AllowableOperations.java index e48322595c..d11d730c9d 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/base/AllowableOperations.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/AllowableOperations.java @@ -9,7 +9,7 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.base; +package org.alfresco.rest.rm.base; /** * List of allowable operations diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/base/BaseRestTest.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/BaseRestTest.java similarity index 90% rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/base/BaseRestTest.java rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/BaseRestTest.java index 6151551afa..e2dce213f6 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/base/BaseRestTest.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/BaseRestTest.java @@ -9,14 +9,14 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.base; +package org.alfresco.rest.rm.base; import static java.lang.Integer.parseInt; -import static org.alfresco.rest.model.site.RMSiteCompliance.STANDARD; -import static org.alfresco.rest.model.site.RMSiteFields.COMPLIANCE; -import static org.alfresco.rest.model.site.RMSiteFields.DESCRIPTION; -import static org.alfresco.rest.model.site.RMSiteFields.TITLE; +import static org.alfresco.rest.rm.model.site.RMSiteCompliance.STANDARD; +import static org.alfresco.rest.rm.model.site.RMSiteFields.COMPLIANCE; +import static org.alfresco.rest.rm.model.site.RMSiteFields.DESCRIPTION; +import static org.alfresco.rest.rm.model.site.RMSiteFields.TITLE; import static org.jglue.fluentjson.JsonBuilderFactory.buildObject; import static org.springframework.http.HttpStatus.CREATED; import static org.springframework.http.HttpStatus.OK; @@ -26,7 +26,7 @@ import com.jayway.restassured.RestAssured; import org.alfresco.rest.RestTest; import org.alfresco.rest.core.RestWrapper; -import org.alfresco.rest.requests.RMSiteAPI; +import org.alfresco.rest.rm.requests.RMSiteAPI; import org.alfresco.utility.data.DataUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/base/TestData.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/TestData.java similarity index 69% rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/base/TestData.java rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/TestData.java index fb71b4f37c..43c5e26a35 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/base/TestData.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/TestData.java @@ -9,16 +9,16 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.base; +package org.alfresco.rest.rm.base; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentAlias.HOLDS_ALIAS; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentAlias.TRANSFERS_ALIAS; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentType.FILE_PLAN_TYPE; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentType.HOLD_CONTAINER_TYPE; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentType.TRANSFER_CONTAINER_TYPE; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentType.UNFILED_CONTAINER_TYPE; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentAlias.HOLDS_ALIAS; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentAlias.TRANSFERS_ALIAS; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentType.FILE_PLAN_TYPE; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentType.HOLD_CONTAINER_TYPE; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentType.TRANSFER_CONTAINER_TYPE; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentType.UNFILED_CONTAINER_TYPE; import org.testng.annotations.DataProvider; diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/fileplancomponents/FilePlanTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/fileplancomponents/FilePlanTests.java similarity index 89% rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/fileplancomponents/FilePlanTests.java rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/fileplancomponents/FilePlanTests.java index 427e080cde..8c7d933ba2 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/fileplancomponents/FilePlanTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/fileplancomponents/FilePlanTests.java @@ -9,19 +9,19 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.fileplancomponents; +package org.alfresco.rest.rm.fileplancomponents; import static java.util.Arrays.asList; -import static org.alfresco.rest.base.AllowableOperations.CREATE; -import static org.alfresco.rest.base.AllowableOperations.DELETE; -import static org.alfresco.rest.base.AllowableOperations.UPDATE; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.NAME; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.NODE_TYPE; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.PROPERTIES; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_DESCRIPTION; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE; +import static org.alfresco.rest.rm.base.AllowableOperations.CREATE; +import static org.alfresco.rest.rm.base.AllowableOperations.DELETE; +import static org.alfresco.rest.rm.base.AllowableOperations.UPDATE; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.NAME; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.NODE_TYPE; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.PROPERTIES; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_DESCRIPTION; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE; import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric; import static org.jglue.fluentjson.JsonBuilderFactory.buildObject; import static org.springframework.http.HttpStatus.FORBIDDEN; @@ -33,13 +33,13 @@ import static org.testng.Assert.assertTrue; import com.google.gson.JsonObject; -import org.alfresco.rest.base.BaseRestTest; -import org.alfresco.rest.base.TestData; -import org.alfresco.rest.model.fileplancomponents.FilePlanComponent; -import org.alfresco.rest.model.fileplancomponents.FilePlanComponentAlias; -import org.alfresco.rest.model.fileplancomponents.FilePlanComponentType; -import org.alfresco.rest.requests.FilePlanComponentAPI; -import org.alfresco.rest.requests.RMSiteAPI; +import org.alfresco.rest.rm.base.BaseRestTest; +import org.alfresco.rest.rm.base.TestData; +import org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponent; +import org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentAlias; +import org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentType; +import org.alfresco.rest.rm.requests.FilePlanComponentAPI; +import org.alfresco.rest.rm.requests.RMSiteAPI; import org.alfresco.utility.data.DataUser; import org.alfresco.utility.model.UserModel; import org.alfresco.utility.report.Bug; diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/fileplancomponents/RecordCategoryTest.java similarity index 92% rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/fileplancomponents/RecordCategoryTest.java index 67d73d42c6..fea38b7668 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/fileplancomponents/RecordCategoryTest.java @@ -9,15 +9,15 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.fileplancomponents; +package org.alfresco.rest.rm.fileplancomponents; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.NAME; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.NODE_TYPE; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.PROPERTIES; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentType.RECORD_CATEGORY_TYPE; -import static org.alfresco.rest.model.fileplancomponents.FilePlanComponentType.RECORD_FOLDER_TYPE; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.NAME; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.NODE_TYPE; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.PROPERTIES; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentType.RECORD_CATEGORY_TYPE; +import static org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentType.RECORD_FOLDER_TYPE; import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric; import static org.jglue.fluentjson.JsonBuilderFactory.buildObject; import static org.springframework.http.HttpStatus.CREATED; @@ -35,13 +35,13 @@ import java.util.NoSuchElementException; import com.google.gson.JsonObject; -import org.alfresco.rest.base.BaseRestTest; import org.alfresco.rest.core.RestWrapper; -import org.alfresco.rest.model.fileplancomponents.FilePlanComponent; -import org.alfresco.rest.model.fileplancomponents.FilePlanComponentProperties; -import org.alfresco.rest.model.fileplancomponents.FilePlanComponentType; -import org.alfresco.rest.model.fileplancomponents.FilePlanComponentsCollection; -import org.alfresco.rest.requests.FilePlanComponentAPI; +import org.alfresco.rest.rm.base.BaseRestTest; +import org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponent; +import org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentProperties; +import org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentType; +import org.alfresco.rest.rm.model.fileplancomponents.FilePlanComponentsCollection; +import org.alfresco.rest.rm.requests.FilePlanComponentAPI; import org.alfresco.utility.data.DataUser; import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.Test; diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/site/RMSiteTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/site/RMSiteTests.java similarity index 93% rename from rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/site/RMSiteTests.java rename to rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/site/RMSiteTests.java index 14b480cd1e..00839dfa01 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/site/RMSiteTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/site/RMSiteTests.java @@ -9,16 +9,16 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.site; +package org.alfresco.rest.rm.site; -import static org.alfresco.rest.base.TestData.ANOTHER_ADMIN; -import static org.alfresco.rest.base.TestData.DEFAULT_EMAIL; -import static org.alfresco.rest.base.TestData.DEFAULT_PASSWORD; -import static org.alfresco.rest.model.site.RMSiteCompliance.DOD5015; -import static org.alfresco.rest.model.site.RMSiteCompliance.STANDARD; -import static org.alfresco.rest.model.site.RMSiteFields.COMPLIANCE; -import static org.alfresco.rest.model.site.RMSiteFields.DESCRIPTION; -import static org.alfresco.rest.model.site.RMSiteFields.TITLE; +import static org.alfresco.rest.rm.base.TestData.ANOTHER_ADMIN; +import static org.alfresco.rest.rm.base.TestData.DEFAULT_EMAIL; +import static org.alfresco.rest.rm.base.TestData.DEFAULT_PASSWORD; +import static org.alfresco.rest.rm.model.site.RMSiteCompliance.DOD5015; +import static org.alfresco.rest.rm.model.site.RMSiteCompliance.STANDARD; +import static org.alfresco.rest.rm.model.site.RMSiteFields.COMPLIANCE; +import static org.alfresco.rest.rm.model.site.RMSiteFields.DESCRIPTION; +import static org.alfresco.rest.rm.model.site.RMSiteFields.TITLE; import static org.jglue.fluentjson.JsonBuilderFactory.buildObject; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.CONFLICT; @@ -34,10 +34,10 @@ import static org.testng.Assert.assertNotNull; import com.google.gson.JsonObject; import org.alfresco.dataprep.UserService; -import org.alfresco.rest.base.BaseRestTest; import org.alfresco.rest.core.RestWrapper; -import org.alfresco.rest.model.site.RMSite; -import org.alfresco.rest.requests.RMSiteAPI; +import org.alfresco.rest.rm.base.BaseRestTest; +import org.alfresco.rest.rm.model.site.RMSite; +import org.alfresco.rest.rm.requests.RMSiteAPI; import org.alfresco.utility.constants.UserRole; import org.alfresco.utility.data.DataUser; import org.alfresco.utility.data.RandomData; diff --git a/rm-automation/rm-automation-community-rest-api/src/test/resources/testng.xml b/rm-automation/rm-automation-community-rest-api/src/test/resources/testng.xml new file mode 100644 index 0000000000..ed47d376d7 --- /dev/null +++ b/rm-automation/rm-automation-community-rest-api/src/test/resources/testng.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file