inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis
2015-03-07 08:08:06 +00:00
parent 021c0d71d9
commit 58d58b2479
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/test-java/org/alfresco/repo/web/scripts/quickshare/QuickShareRestApiTest.java
View File

@@ -302,7 +302,7 @@ public class QuickShareRestApiTest extends BaseWebScriptTest
// unshare // unshare
authenticationComponent.setCurrentUser(USER_TWO); 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); authenticationComponent.setCurrentUser(USER_ONE);
rsp = sendRequest(new DeleteRequest(UNSHARE_URL.replace("{shared_id}", sharedId)), expectedStatusOK, 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 // 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 // Ensure we have a doclib
siteService.createContainer(shortName, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null); siteService.createContainer(shortName, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);