From 58d58b2479b847968ae64697ac0fca9f385fcff3 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 7 Mar 2015 08:08:06 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 98968: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 98792: Merged NESS/5.0.N-2015_03_04 (5.0.2) to 5.0.N (5.0.2) 98764: MNT-13364: Failing tests on DB2: QuickShareRestApiTest, SiteServiceTest, GetMethodRegressionTest - fixed tests in QuickShareRestApiTest, SiteServiceTest git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/quickshare/QuickShareRestApiTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/test-java/org/alfresco/repo/web/scripts/quickshare/QuickShareRestApiTest.java b/source/test-java/org/alfresco/repo/web/scripts/quickshare/QuickShareRestApiTest.java index 7b43bc3d41..59aab50425 100644 --- a/source/test-java/org/alfresco/repo/web/scripts/quickshare/QuickShareRestApiTest.java +++ b/source/test-java/org/alfresco/repo/web/scripts/quickshare/QuickShareRestApiTest.java @@ -302,7 +302,7 @@ public class QuickShareRestApiTest extends BaseWebScriptTest // unshare authenticationComponent.setCurrentUser(USER_TWO); - rsp = sendRequest(new DeleteRequest(UNSHARE_URL.replace("{shared_id}", sharedId)), expectedStatusForbidden, USER_ONE); + rsp = sendRequest(new DeleteRequest(UNSHARE_URL.replace("{shared_id}", sharedId)), expectedStatusForbidden, USER_TWO); authenticationComponent.setCurrentUser(USER_ONE); rsp = sendRequest(new DeleteRequest(UNSHARE_URL.replace("{shared_id}", sharedId)), expectedStatusOK, USER_ONE); @@ -415,7 +415,7 @@ public class QuickShareRestApiTest extends BaseWebScriptTest } // Do the create - SiteInfo site = siteService.createSite("Testing", shortName, shortName, null, SiteVisibility.PUBLIC); + SiteInfo site = siteService.createSite("Testing", shortName, shortName, "myDescription", SiteVisibility.PUBLIC); // Ensure we have a doclib siteService.createContainer(shortName, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);