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

REPO-4284: MNT-20212: Download as Zip temp content never gets cleaned (#190)

Browse Source 
(cherry picked from commit 499c0c3b02)

Merging from master (ACS 6.2) to equivalent ACS 6.1
This commit is contained in:
Andrei Rebegea
2019-04-08 11:55:57 +03:00
committed by Andrei Rebegea
parent c1a2780360
commit 115bf9b8a6
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/test/java/org/alfresco/rest/api/tests/TestDownloads.java
View File

@@ -23,8 +23,8 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L% * #L%
*/ */
package org.alfresco.rest.api.tests; package org.alfresco.rest.api.tests;
import static java.lang.String.format; import static java.lang.String.format;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED;
@@ -61,6 +61,7 @@ import org.alfresco.rest.api.tests.util.RestApiUtil;
import org.alfresco.rest.framework.core.exceptions.ApiException; import org.alfresco.rest.framework.core.exceptions.ApiException;
import org.alfresco.service.cmr.download.DownloadStatus; import org.alfresco.service.cmr.download.DownloadStatus;
import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.cmr.site.SiteVisibility;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
@@ -76,8 +77,8 @@ import org.junit.runners.MethodSorters;
* @author cpopa * @author cpopa
* *
*/ */
@FixMethodOrder(MethodSorters.NAME_ASCENDING) @FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestDownloads extends AbstractBaseApiTest public class TestDownloads extends AbstractBaseApiTest
{ {
private static Log logger = LogFactory.getLog(TestDownloads.class); private static Log logger = LogFactory.getLog(TestDownloads.class);
@@ -147,9 +148,9 @@ public class TestDownloads extends AbstractBaseApiTest
* <p>POST:</p> * <p>POST:</p>
* {@literal <host>:<port>/alfresco/api/-default-/private/alfresco/versions/1/downloads} * {@literal <host>:<port>/alfresco/api/-default-/private/alfresco/versions/1/downloads}
* *
*/ */
@Test @Test
public void test001CreateDownload() throws Exception public void test001CreateDownload() throws Exception
{ {
//test creating a download with a single file //test creating a download with a single file
Download download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableDocId1); Download download = createDownload(HttpServletResponse.SC_ACCEPTED, zippableDocId1);
@@ -194,7 +195,7 @@ public class TestDownloads extends AbstractBaseApiTest
assertDoneDownload(download, 2, 26); assertDoneDownload(download, 2, 26);
//test creating an archive with two files, one of which user1 does not have permissions for //test creating an archive with two files, one of which user1 does not have permissions for
download = createDownload(HttpServletResponse.SC_FORBIDDEN, zippableDocId1, zippableDoc_user2); download = createDownload(HttpServletResponse.SC_FORBIDDEN, zippableDocId1, zippableDoc_user2);
} }
/** /**
@@ -368,8 +369,13 @@ public class TestDownloads extends AbstractBaseApiTest
setRequestContext(user2); setRequestContext(user2);
deleteNode(download.getId(), true, HttpServletResponse.SC_FORBIDDEN); deleteNode(download.getId(), true, HttpServletResponse.SC_FORBIDDEN);
setRequestContext(user1);
assertDoneDownload(download, 1, 13); assertDoneDownload(download, 1, 13);
// user2 should not be able to read information about downloads started by other users
setRequestContext(user2);
getDownload(download.getId(), HttpServletResponse.SC_FORBIDDEN);
} }
protected ZipInputStream getZipStreamFromResponse(HttpResponse response) protected ZipInputStream getZipStreamFromResponse(HttpResponse response)
@@ -569,5 +575,5 @@ public class TestDownloads extends AbstractBaseApiTest
private interface CancelAction{ private interface CancelAction{
void run() throws Exception; void run() throws Exception;
} }
} }