From 2289696e0fe083281c3de04144a93d0a8f8da7d9 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Thu, 27 Oct 2016 17:04:11 +0300 Subject: [PATCH 1/5] fix the merge --- .../FilePlanComponentEntry.java | 2 +- .../FilePlanComponentsCollection.java | 2 +- .../rest/requests/FilePlanComponentApi.java | 4 ++-- .../RecordCategoryTest.java | 24 +++++++++---------- 4 files changed, 16 insertions(+), 16 deletions(-) rename src/main/java/org/alfresco/rest/model/{ => fileplancomponents}/FilePlanComponentEntry.java (93%) rename src/main/java/org/alfresco/rest/model/{ => fileplancomponents}/FilePlanComponentsCollection.java (91%) diff --git a/src/main/java/org/alfresco/rest/model/FilePlanComponentEntry.java b/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentEntry.java similarity index 93% rename from src/main/java/org/alfresco/rest/model/FilePlanComponentEntry.java rename to src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentEntry.java index c0c0d385f2..4669779447 100644 --- a/src/main/java/org/alfresco/rest/model/FilePlanComponentEntry.java +++ b/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentEntry.java @@ -9,7 +9,7 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model; +package org.alfresco.rest.model.fileplancomponents; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/alfresco/rest/model/FilePlanComponentsCollection.java b/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentsCollection.java similarity index 91% rename from src/main/java/org/alfresco/rest/model/FilePlanComponentsCollection.java rename to src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentsCollection.java index ca6bb84659..24d3f395f2 100644 --- a/src/main/java/org/alfresco/rest/model/FilePlanComponentsCollection.java +++ b/src/main/java/org/alfresco/rest/model/fileplancomponents/FilePlanComponentsCollection.java @@ -9,7 +9,7 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.model; +package org.alfresco.rest.model.fileplancomponents; import org.alfresco.rest.core.RestModels; diff --git a/src/main/java/org/alfresco/rest/requests/FilePlanComponentApi.java b/src/main/java/org/alfresco/rest/requests/FilePlanComponentApi.java index f2764539c6..d934382d74 100644 --- a/src/main/java/org/alfresco/rest/requests/FilePlanComponentApi.java +++ b/src/main/java/org/alfresco/rest/requests/FilePlanComponentApi.java @@ -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.FilePlanComponent; -import org.alfresco.rest.model.FilePlanComponentsCollection; +import org.alfresco.rest.model.fileplancomponents.FilePlanComponent; +import org.alfresco.rest.model.fileplancomponents.FilePlanComponentsCollection; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java b/src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java index 8b74076d36..1b01d55c78 100644 --- a/src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java +++ b/src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java @@ -13,13 +13,13 @@ package org.alfresco.rest.fileplancomponents; import static java.util.UUID.randomUUID; -import static org.alfresco.com.FilePlanComponentAlias.FILE_PLAN_ALIAS; -import static org.alfresco.com.FilePlanComponentFields.NAME; -import static org.alfresco.com.FilePlanComponentFields.NODE_TYPE; -import static org.alfresco.com.FilePlanComponentFields.PROPERTIES; -import static org.alfresco.com.FilePlanComponentFields.PROPERTIES_TITLE; -import static org.alfresco.com.FilePlanComponentType.RECORD_CATEGORY_TYPE; -import static org.alfresco.com.FilePlanComponentType.RECORD_FOLDER_TYPE; +import static org.alfresco.com.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS; +import static org.alfresco.com.fileplancomponents.FilePlanComponentFields.NAME; +import static org.alfresco.com.fileplancomponents.FilePlanComponentFields.NODE_TYPE; +import static org.alfresco.com.fileplancomponents.FilePlanComponentFields.PROPERTIES; +import static org.alfresco.com.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE; +import static org.alfresco.com.fileplancomponents.FilePlanComponentType.RECORD_CATEGORY_TYPE; +import static org.alfresco.com.fileplancomponents.FilePlanComponentType.RECORD_FOLDER_TYPE; import static org.jglue.fluentjson.JsonBuilderFactory.buildObject; import static org.springframework.http.HttpStatus.CREATED; import static org.springframework.http.HttpStatus.NO_CONTENT; @@ -35,13 +35,13 @@ import java.util.NoSuchElementException; import com.google.gson.JsonObject; -import org.alfresco.com.FilePlanComponentType; +import org.alfresco.com.fileplancomponents.FilePlanComponentType; import org.alfresco.rest.BaseRestTest; import org.alfresco.rest.core.RestWrapper; -import org.alfresco.rest.model.FilePlanComponentEntry; -import org.alfresco.rest.model.FilePlanComponent; -import org.alfresco.rest.model.FilePlanComponentProperties; -import org.alfresco.rest.model.FilePlanComponentsCollection; +import org.alfresco.rest.model.fileplancomponents.FilePlanComponent; +import org.alfresco.rest.model.fileplancomponents.FilePlanComponentEntry; +import org.alfresco.rest.model.fileplancomponents.FilePlanComponentProperties; +import org.alfresco.rest.model.fileplancomponents.FilePlanComponentsCollection; import org.alfresco.rest.requests.FilePlanComponentApi; import org.alfresco.utility.data.DataUser; import org.alfresco.utility.data.RandomData; From f896963188692b8b7718abcb35d6f8e6a1993cdc Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Thu, 27 Oct 2016 19:03:33 +0300 Subject: [PATCH 2/5] new tests for RM Site --- src/test/java/org/alfresco/rest/TestData.java | 21 +++++ .../rest/fileplancomponents/RMSiteTests.java | 86 +++++++++++++++---- 2 files changed, 89 insertions(+), 18 deletions(-) create mode 100644 src/test/java/org/alfresco/rest/TestData.java diff --git a/src/test/java/org/alfresco/rest/TestData.java b/src/test/java/org/alfresco/rest/TestData.java new file mode 100644 index 0000000000..df52bdce2d --- /dev/null +++ b/src/test/java/org/alfresco/rest/TestData.java @@ -0,0 +1,21 @@ +package org.alfresco.rest; + +/** + * Test data used in tests + * + * @author Rodica Sutu + */ +public interface TestData +{ + /** + * A user with ALFRESCO_ADMINISTRATORS role. + *

"GROUP_ANOTHER_ADMIN_EXISTS" The ANOTHER_ADMIN user has been created. + */ + public static final String ANOTHER_ADMIN = "another_admin"; + + /** + * The default password used when creating test users. + */ + public static final String DEFAULT_PASSWORD = "password"; + public static final String DEFAULT_EMAIL = "default@alfresco.com"; +} diff --git a/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java b/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java index 8b22ace9ef..98fd5dcb1f 100644 --- a/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java +++ b/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java @@ -11,10 +11,14 @@ */ package org.alfresco.rest.fileplancomponents; +import static org.alfresco.com.site.RMSiteCompliance.DOD5015; import static org.alfresco.com.site.RMSiteCompliance.STANDARD; import static org.alfresco.com.site.RMSiteFields.COMPLIANCE; import static org.alfresco.com.site.RMSiteFields.DESCRIPTION; import static org.alfresco.com.site.RMSiteFields.TITLE; +import static org.alfresco.rest.TestData.ANOTHER_ADMIN; +import static org.alfresco.rest.TestData.DEFAULT_EMAIL; +import static org.alfresco.rest.TestData.DEFAULT_PASSWORD; import static org.jglue.fluentjson.JsonBuilderFactory.buildObject; import static org.springframework.http.HttpStatus.CONFLICT; import static org.springframework.http.HttpStatus.CREATED; @@ -26,9 +30,12 @@ import static org.testng.Assert.assertEquals; import com.google.gson.JsonObject; +import org.alfresco.dataprep.UserService; import org.alfresco.rest.BaseRestTest; import org.alfresco.rest.core.RestWrapper; import org.alfresco.rest.model.site.RMSite; +import org.alfresco.utility.model.UserModel; +import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.Test; /** @@ -48,25 +55,27 @@ public class RMSiteTests extends BaseRestTest private static final String RM_ID = "rm"; private static final String RM_TITLE = "Records Management"; private static final String RM_DESCRIPTION = "Records Management Site"; + @Autowired + private UserService userService; @Test ( - description = "Create RM site as admin user with standard Compliance" + description = "Create RM site as admin user with Standard Compliance" ) public void createRMSiteAsAdminUser() throws Exception { - RestWrapper restWrapper = rmSiteAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); + rmSiteAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); if (siteRMExist()) { //Delete the RM site rmSiteAPI.deleteRMSite(); } // Build the RM site properties - JsonObject rmSiteProperties = buildObject(). - add(TITLE, RM_TITLE). - add(DESCRIPTION, RM_DESCRIPTION). - add(COMPLIANCE, STANDARD.toString()). - getJson(); + JsonObject rmSiteProperties = buildObject() + .add(TITLE, RM_TITLE) + .add(DESCRIPTION, RM_DESCRIPTION) + .add(COMPLIANCE, STANDARD.toString()) + .getJson(); // Create the RM site RMSite rmSite = rmSiteAPI.createRMSite(rmSiteProperties); @@ -97,11 +106,11 @@ public class RMSiteTests extends BaseRestTest String newDescription = RM_DESCRIPTION + "createRMSiteWhenSiteExists"; // Build the RM site properties - JsonObject rmSiteProperties = buildObject(). - add(TITLE, newTitle). - add(DESCRIPTION, newDescription). - add(COMPLIANCE, STANDARD.toString()). - getJson(); + JsonObject rmSiteProperties = buildObject() + .add(TITLE, newTitle) + .add(DESCRIPTION, newDescription) + .add(COMPLIANCE, STANDARD.toString()) + .getJson(); // Create the RM site rmSiteAPI.createRMSite(rmSiteProperties); @@ -126,16 +135,15 @@ public class RMSiteTests extends BaseRestTest } @Test - ( - description = "GET RM site as admin user" - ) + ( + description = "GET RM site as admin user" + ) public void getRMSite() throws Exception { RestWrapper restWrapper = rmSiteAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); // Get the RM site RMSite rmSite=rmSiteAPI.getSite(); - if (!siteRMExist()) { // Verify the status code @@ -150,6 +158,48 @@ public class RMSiteTests extends BaseRestTest assertEquals(rmSite.getCompliance(), STANDARD); assertEquals(rmSite.getVisibility(), PUBLIC); } - } -} + + @Test + ( + description = "Create RM site as an admin user created with DOD compliance" + ) + public void createRMSiteAsAnotherAdminUser() throws Exception + { + rmSiteAPI.usingRestWrapper().authenticateUser(dataUser.getAdminUser()); + if (siteRMExist()) + { + //Delete the RM site + rmSiteAPI.deleteRMSite(); + } + rmSiteAPI.usingRestWrapper().disconnect(); + userService.create(dataUser.getAdminUser().getUsername(), + dataUser.getAdminUser().getPassword(), + ANOTHER_ADMIN, + DEFAULT_PASSWORD, + DEFAULT_EMAIL, + ANOTHER_ADMIN, + ANOTHER_ADMIN); + UserModel userModel=new UserModel(ANOTHER_ADMIN,DEFAULT_PASSWORD); + rmSiteAPI.usingRestWrapper().authenticateUser(userModel); + // Build the RM site properties + JsonObject rmSiteProperties = buildObject() + .add(TITLE, RM_TITLE) + .add(DESCRIPTION, RM_DESCRIPTION) + .add(COMPLIANCE, DOD5015.toString()) + .getJson(); + + // Create the RM site + RMSite rmSite = rmSiteAPI.createRMSite(rmSiteProperties); + + // Verify the status code + rmSiteAPI.usingRestWrapper().assertStatusCodeIs(CREATED); + + // Verify the returned file plan component + assertEquals(rmSite.getId(), RM_ID); + assertEquals(rmSite.getTitle(), RM_TITLE); + assertEquals(rmSite.getDescription(), RM_DESCRIPTION); + assertEquals(rmSite.getCompliance(), DOD5015); + assertEquals(rmSite.getVisibility(), PUBLIC); + } + } From dc0a6ed1a59bdb4eb2a0474832fb3410e663715c Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Thu, 27 Oct 2016 19:13:11 +0300 Subject: [PATCH 3/5] fix compilation error --- .../java/org/alfresco/rest/fileplancomponents/RMSiteTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java b/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java index b4378dcca9..858e82efab 100644 --- a/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java +++ b/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java @@ -50,6 +50,8 @@ import org.testng.annotations.Test; */ public class RMSiteTests extends BaseRestTest { + @Autowired + private UserService userService; @Test ( description = "Create RM site as admin user with Standard Compliance" From ca65f0a5a9cf864d2ef9566d6f8a321e4ce190b9 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Thu, 27 Oct 2016 19:22:11 +0300 Subject: [PATCH 4/5] fix compilation errors --- .../java/org/alfresco/rest/requests/FilePlanComponentApi.java | 2 +- .../alfresco/rest/fileplancomponents/RecordCategoryTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/alfresco/rest/requests/FilePlanComponentApi.java b/src/main/java/org/alfresco/rest/requests/FilePlanComponentApi.java index bb3d82329d..6c4c7463dc 100644 --- a/src/main/java/org/alfresco/rest/requests/FilePlanComponentApi.java +++ b/src/main/java/org/alfresco/rest/requests/FilePlanComponentApi.java @@ -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.FilePlanComponentsCollection; import org.alfresco.rest.model.fileplancomponents.FilePlanComponent; +import org.alfresco.rest.model.fileplancomponents.FilePlanComponentsCollection; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java b/src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java index db380ab373..4741b32c63 100644 --- a/src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java +++ b/src/test/java/org/alfresco/rest/fileplancomponents/RecordCategoryTest.java @@ -38,10 +38,10 @@ import com.google.gson.JsonObject; import org.alfresco.com.fileplancomponents.FilePlanComponentType; import org.alfresco.rest.BaseRestTest; import org.alfresco.rest.core.RestWrapper; -import org.alfresco.rest.model.FilePlanComponentEntry; -import org.alfresco.rest.model.FilePlanComponentsCollection; import org.alfresco.rest.model.fileplancomponents.FilePlanComponent; +import org.alfresco.rest.model.fileplancomponents.FilePlanComponentEntry; import org.alfresco.rest.model.fileplancomponents.FilePlanComponentProperties; +import org.alfresco.rest.model.fileplancomponents.FilePlanComponentsCollection; import org.alfresco.rest.requests.FilePlanComponentApi; import org.alfresco.utility.data.DataUser; import org.alfresco.utility.data.RandomData; From 65472ca6c1d3d7fe61cd7636396a347b1feb5f18 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Thu, 27 Oct 2016 21:06:55 +0100 Subject: [PATCH 5/5] Fixed dataprep issue --- .../java/org/alfresco/rest/BaseRestTest.java | 18 ++++++++--------- .../RMSiteTests.java | 3 ++- src/test/resources/config.properties | 4 ---- src/test/resources/default.properties | 20 +++++++++++++++++++ 4 files changed, 31 insertions(+), 14 deletions(-) rename src/test/java/org/alfresco/rest/{fileplancomponents => site}/RMSiteTests.java (98%) delete mode 100644 src/test/resources/config.properties create mode 100644 src/test/resources/default.properties diff --git a/src/test/java/org/alfresco/rest/BaseRestTest.java b/src/test/java/org/alfresco/rest/BaseRestTest.java index af6669d371..64fccd8a31 100644 --- a/src/test/java/org/alfresco/rest/BaseRestTest.java +++ b/src/test/java/org/alfresco/rest/BaseRestTest.java @@ -41,21 +41,21 @@ import org.testng.annotations.BeforeClass; * @since 1.0 */ @Configuration -@PropertySource("classpath:config.properties") +@PropertySource("classpath:default.properties") @PropertySource(value = "classpath:local.properties", ignoreResourceNotFound = true) public class BaseRestTest extends RestTest { - @Value ("${alfresco.rm.scheme}") + @Value ("${alfresco.scheme}") private String scheme; - @Value ("${alfresco.rm.host}") - private String host; + @Value ("${alfresco.server}") + private String server; - @Value ("${alfresco.rm.port}") + @Value ("${alfresco.port}") private String port; - @Value ("${alfresco.rm.basePath}") - private String basePath; + @Value ("${rest.rmPath}") + private String restRmPath; @Autowired public RMSiteAPI rmSiteAPI; @@ -75,9 +75,9 @@ public class BaseRestTest extends RestTest @BeforeClass(alwaysRun = true) public void checkServerHealth() throws Exception { - RestAssured.baseURI = scheme + "://" + host; + RestAssured.baseURI = scheme + "://" + server; RestAssured.port = parseInt(port); - RestAssured.basePath = basePath; + RestAssured.basePath = restRmPath; //create RM Site if not exist createRMSiteIfNotExists(); diff --git a/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java b/src/test/java/org/alfresco/rest/site/RMSiteTests.java similarity index 98% rename from src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java rename to src/test/java/org/alfresco/rest/site/RMSiteTests.java index 858e82efab..4ebd4a9589 100644 --- a/src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java +++ b/src/test/java/org/alfresco/rest/site/RMSiteTests.java @@ -9,7 +9,7 @@ * agreement is prohibited. * #L% */ -package org.alfresco.rest.fileplancomponents; +package org.alfresco.rest.site; import static org.alfresco.com.site.RMSiteCompliance.DOD5015; import static org.alfresco.com.site.RMSiteCompliance.STANDARD; @@ -33,6 +33,7 @@ import com.google.gson.JsonObject; import org.alfresco.dataprep.UserService; import org.alfresco.rest.BaseRestTest; import org.alfresco.rest.core.RestWrapper; +import org.alfresco.rest.fileplancomponents.RecordCategoryTest; import org.alfresco.rest.model.site.RMSite; import org.alfresco.utility.model.UserModel; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/resources/config.properties b/src/test/resources/config.properties deleted file mode 100644 index 899f737db2..0000000000 --- a/src/test/resources/config.properties +++ /dev/null @@ -1,4 +0,0 @@ -alfresco.rm.scheme=http -alfresco.rm.host=localhost -alfresco.rm.port=8080 -alfresco.rm.basePath=alfresco/api/-default-/public/ig/versions/1 \ No newline at end of file diff --git a/src/test/resources/default.properties b/src/test/resources/default.properties new file mode 100644 index 0000000000..47fa27dcf0 --- /dev/null +++ b/src/test/resources/default.properties @@ -0,0 +1,20 @@ +######################################################################### +# Original property values from default.properties # +######################################################################### + +# dataprep related +alfresco.scheme=http +alfresco.server=localhost +alfresco.port=8080 + +# credentials +admin.user=admin +admin.password=admin + +# rest related +rest.basePath=alfresco/api/-default-/public/alfresco/versions/1 +rest.workflowPath=alfresco/api/-default-/public/workflow/versions/1 + +######################################################################### + +rest.rmPath=alfresco/api/-default-/public/ig/versions/1 \ No newline at end of file