Merge remote-tracking branch 'origin/master' into feature/RM-4023_UnfiledRecordFolderAPITests

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/AllowableOperations.java

@@ -15,7 +15,7 @@ package org.alfresco.rest.rm.base;
  * List of allowable operations
  *
  * @author Tuna Aksoy
- * @since 1.0
+ * @since 2.6
  */
 public class AllowableOperations
 {

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/BaseRestTest.java

@@ -51,7 +51,7 @@ import org.testng.annotations.BeforeClass;
  *
  * @author Kristijan Conkas
  * @author Tuna Aksoy
- * @since 1.0
+ * @since 2.6
  */
 @Configuration
 @PropertySource("classpath:default.properties")

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/TestData.java

@@ -27,7 +27,7 @@ import org.testng.annotations.DataProvider;
  * Test data used in tests
  *
  * @author Rodica Sutu
- * @since 1.0
+ * @since 2.6
  */
 public interface TestData
 {

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/fileplancomponents/FilePlanTests.java

@@ -52,7 +52,7 @@ import org.testng.annotations.Test;
  * the File Plan CRUD API
  *
  * @author Rodica Sutu
- * @since 1.0
+ * @since 2.6
  */
 public class FilePlanTests extends BaseRestTest
 {
@@ -198,7 +198,7 @@ public class FilePlanTests extends BaseRestTest
     /**
      * Given that a file plan exists
      * When I ask the API to delete the file plan
-     * Then the 403 response code is returned.
+     * Then the 422 response code is returned.
      */
     @Test
     (
@@ -217,6 +217,40 @@ public class FilePlanTests extends BaseRestTest
         // Delete the file plan component
         filePlanComponentAPI.deleteFilePlanComponent(filePlanAlias.toString());
 
+        // Check the DELETE response status code
+        filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(UNPROCESSABLE_ENTITY);
+    }
+
+    /**
+     * Given that a file plan exists and I am a non RM user
+     * When I ask the API to delete the file plan
+     * Then the 403 response code is returned.
+     */
+    @Test
+    (
+                description = "Check the response code when deleting the special file plan components with non RM user",
+                dataProviderClass = TestData.class,
+                dataProvider = "getContainers"
+                )
+    public void deleteFilePlanSpecialComponentsNonRMUser(String filePlanAlias) throws Exception
+    {
+        // Create RM Site if doesn't exist
+        createRMSiteIfNotExists();
+
+        // Disconnect the current user from the API session
+        rmSiteAPI.usingRestWrapper().disconnect();
+        // Authenticate admin user to Alfresco REST API
+        restClient.authenticateUser(dataUser.getAdminUser());
+
+        // Create a random user
+        UserModel nonRMuser = dataUser.createRandomTestUser("testUser");
+
+        // Authenticate using the random user
+        filePlanComponentAPI.usingRestWrapper().authenticateUser(nonRMuser);
+
+        // Delete the file plan component
+        filePlanComponentAPI.deleteFilePlanComponent(filePlanAlias.toString());
+
         // Check the DELETE response status code
         filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(FORBIDDEN);
     }

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/fileplancomponents/RecordCategoryTest.java

@@ -51,7 +51,7 @@ import org.testng.annotations.Test;
  *
  * @author Kristijan Conkas
  * @author Tuna Aksoy
- * @since 1.0
+ * @since 2.6
  */
 public class RecordCategoryTest extends BaseRestTest
 {

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/fileplancomponents/RecordFolderTests.java

@@ -61,7 +61,7 @@ import org.testng.annotations.Test;
  * the Record Folder CRUD API
  *
  * @author Rodica Sutu
- * @since 1.0
+ * @since 2.6
  */
 public class RecordFolderTests extends BaseRestTest
 {

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/site/RMSiteTests.java

@@ -51,7 +51,7 @@ import org.testng.annotations.Test;
  * the RM site CRUD API
  *
  * @author Rodica Sutu
- * @since 1.0
+ * @since 2.6
  */
 public class RMSiteTests extends BaseRestTest
 {