Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

74316: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74270: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         73963: Merged DEV to V4.1-BUG-FIX (4.1.10)
            71918: MNT-10156: In Share show appropriate HTTP status codes (such as 403) rather than the default 500
               - Throw WebScriptException with 403 status code on ContentGet layer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 16:34:46 +00:00
parent ecad173150
commit db9e0932fa
2 changed files with 26 additions and 16 deletions

View File

@@ -210,6 +210,7 @@ public class QuickShareRestApiTest extends BaseWebScriptTest
final int expectedStatusOK = 200;
final int expectedStatusNotFound = 404;
final int expectedStatusServerError = 500; // currently mapped from AccessDenied (should it be 403, 404 or does it depend on use-case)
final int expectedStatusForbidden = 403;
String testNodeRef_3 = testNode.toString().replace("://", "/");
@@ -236,7 +237,7 @@ public class QuickShareRestApiTest extends BaseWebScriptTest
// As user two ...
rsp = sendRequest(new GetRequest(AUTH_METADATA_URL.replace("{node_ref_3}", testNodeRef_3)), expectedStatusServerError, USER_TWO);
rsp = sendRequest(new GetRequest(AUTH_CONTENT_URL.replace("{node_ref_3}", testNodeRef_3)), expectedStatusServerError, USER_TWO);
rsp = sendRequest(new GetRequest(AUTH_CONTENT_URL.replace("{node_ref_3}", testNodeRef_3)), expectedStatusForbidden, USER_TWO);
rsp = sendRequest(new GetRequest(AUTH_CONTENT_THUMBNAIL_URL.replace("{node_ref_3}", testNodeRef_3).replace("{thumbnailname}", "doclib")), expectedStatusServerError, USER_TWO);
// As user one ...