diff --git a/source/java/org/alfresco/repo/webdav/PutMethod.java b/source/java/org/alfresco/repo/webdav/PutMethod.java index 3c585cd3b3..878133bbf6 100644 --- a/source/java/org/alfresco/repo/webdav/PutMethod.java +++ b/source/java/org/alfresco/repo/webdav/PutMethod.java @@ -300,7 +300,7 @@ public class PutMethod extends WebDAVMethod implements ActivityPostProducer } return null; } - }, false, false); + }, false, true); } throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e); } diff --git a/source/test-java/org/alfresco/repo/webdav/PutMethodTest.java b/source/test-java/org/alfresco/repo/webdav/PutMethodTest.java deleted file mode 100644 index c63f03fad3..0000000000 --- a/source/test-java/org/alfresco/repo/webdav/PutMethodTest.java +++ /dev/null @@ -1,656 +0,0 @@ -/* - * Copyright (C) 2005-2014 Alfresco Software Limited. - * - * This file is part of Alfresco - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - */ -package org.alfresco.repo.webdav; - -import org.alfresco.model.ContentModel; -import org.alfresco.repo.security.authentication.AuthenticationUtil; -import org.alfresco.repo.transaction.RetryingTransactionHelper; -import org.alfresco.service.cmr.lock.LockService; -import org.alfresco.service.cmr.lock.LockStatus; -import org.alfresco.service.cmr.lock.LockType; -import org.alfresco.service.cmr.model.FileFolderService; -import org.alfresco.service.cmr.model.FileInfo; -import org.alfresco.service.cmr.repository.ContentService; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.service.cmr.search.ResultSet; -import org.alfresco.service.cmr.search.SearchService; -import org.alfresco.service.cmr.security.MutableAuthenticationService; -import org.alfresco.service.cmr.security.PersonService; -import org.alfresco.service.namespace.QName; -import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.GUID; -import org.alfresco.util.PropertyMap; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.ArrayUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.mock.web.MockHttpServletResponse; - -import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; - -import java.io.InputStream; -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -/** - * Unit tests for the {@link PutMethod} class. - * - * @author alex.mukha - */ -public class PutMethodTest -{ - private static ApplicationContext ctx; - - private static final String USER_NAME = "user-" + GUID.generate(); - private static final String TEST_DATA_FILE_NAME = "filewithdata.txt"; - private static final String DAV_LOCK_INFO_XML = "davLockInfo.xml"; - private byte[] testDataFile; - private byte[] davLockInfoFile; - - private MockHttpServletRequest request; - private MockHttpServletResponse response; - private WebDAVMethod method; - private UserTransaction txn = null; - - private SearchService searchService; - private FileFolderService fileFolderService; - private NodeService nodeService; - private TransactionService transactionService; - private WebDAVHelper webDAVHelper; - private MutableAuthenticationService authenticationService; - private PersonService personService; - private LockService lockService; - private ContentService contentService; - - private NodeRef companyHomeNodeRef; - private NodeRef versionableDoc; - private String versionableDocName; - private StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"); - - @BeforeClass - public static void setUpBeforeClass() throws Exception - { - ctx = ApplicationContextHelper.getApplicationContext(new String[] - { - "classpath:alfresco/application-context.xml", - "classpath:alfresco/web-scripts-application-context.xml", - "classpath:alfresco/remote-api-context.xml" - }); - } - - @Before - public void setUp() throws Exception - { - searchService = ctx.getBean("SearchService", SearchService.class); - fileFolderService = ctx.getBean("FileFolderService", FileFolderService.class); - nodeService = ctx.getBean("NodeService", NodeService.class); - transactionService = ctx.getBean("transactionService", TransactionService.class); - webDAVHelper = ctx.getBean("webDAVHelper", WebDAVHelper.class); - authenticationService = ctx.getBean("authenticationService", MutableAuthenticationService.class); - personService = ctx.getBean("PersonService", PersonService.class); - lockService = ctx.getBean("LockService", LockService.class); - contentService = ctx.getBean("contentService", ContentService.class); - - AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); - - companyHomeNodeRef = transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback() - { - @Override - public NodeRef execute() throws Throwable - { - // find "Company Home" - ResultSet resultSet = searchService.query(storeRef, SearchService.LANGUAGE_LUCENE, "PATH:\"/app:company_home\""); - NodeRef result = resultSet.getNodeRef(0); - resultSet.close(); - - return result; - } - }); - txn = transactionService.getUserTransaction(); - txn.begin(); - if (!authenticationService.authenticationExists(USER_NAME)) - { - authenticationService.createAuthentication(USER_NAME, "PWD".toCharArray()); - } - - if (!personService.personExists(USER_NAME)) - { - PropertyMap ppOne = new PropertyMap(); - ppOne.put(ContentModel.PROP_USERNAME, USER_NAME); - ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName"); - ppOne.put(ContentModel.PROP_LASTNAME, "lastName"); - ppOne.put(ContentModel.PROP_EMAIL, "email@email.com"); - ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle"); - - personService.createPerson(ppOne); - } - - InputStream testDataIS = getClass().getClassLoader().getResourceAsStream(TEST_DATA_FILE_NAME); - InputStream davLockInfoIS = getClass().getClassLoader().getResourceAsStream(DAV_LOCK_INFO_XML); - testDataFile = IOUtils.toByteArray(testDataIS); - davLockInfoFile = IOUtils.toByteArray(davLockInfoIS); - - testDataIS.close(); - davLockInfoIS.close(); - - // Create a test file with versionable aspect and content - Map properties = new HashMap(); - versionableDocName = "doc-" + GUID.generate(); - properties.put(ContentModel.PROP_NAME, versionableDocName); - - versionableDoc = nodeService.createNode(companyHomeNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName(ContentModel.USER_MODEL_URI, versionableDocName), - ContentModel.TYPE_CONTENT, properties).getChildRef(); - contentService.getWriter(versionableDoc, ContentModel.PROP_CONTENT, true).putContent("WebDAVTestContent"); - nodeService.addAspect(versionableDoc, ContentModel.ASPECT_VERSIONABLE, null); - - txn.commit(); - - txn = transactionService.getUserTransaction(); - txn.begin(); - } - - @After - public void tearDown() throws Exception - { - method = null; - request = null; - response = null; - testDataFile = null; - davLockInfoFile = null; - - // Delete the user, as admin - AuthenticationUtil.setAdminUserAsFullyAuthenticatedUser(); - if (this.personService.personExists(USER_NAME)) - { - this.personService.deletePerson(USER_NAME); - } - if (this.authenticationService.authenticationExists(USER_NAME)) - { - this.authenticationService.deleteAuthentication(USER_NAME); - } - - nodeService.deleteNode(versionableDoc); - - txn.commit(); - - // As per MNT-10037 try to create a node and delete it in the next txn - txn = transactionService.getUserTransaction(); - txn.begin(); - - Map properties = new HashMap(); - String nodeName = "leak-session-doc-" + GUID.generate(); - properties.put(ContentModel.PROP_NAME, nodeName); - - NodeRef nodeRef = nodeService.createNode(companyHomeNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName(ContentModel.USER_MODEL_URI, nodeName), - ContentModel.TYPE_CONTENT, properties).getChildRef(); - contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true).putContent("WebDAVTestContent"); - - txn.commit(); - - txn = transactionService.getUserTransaction(); - txn.begin(); - - nodeService.deleteNode(nodeRef); - - txn.commit(); - - AuthenticationUtil.clearCurrentSecurityContext(); - } - - @Test - public void testPutContentToNonExistingFile() throws Exception - { - String fileName = "file-" + GUID.generate(); - NodeRef fileNoderef = null; - try - { - executeMethod(WebDAV.METHOD_PUT, fileName, testDataFile, null); - - ResultSet resultSet = searchService.query(storeRef, SearchService.LANGUAGE_LUCENE, "PATH:\"/app:company_home//cm:" + fileName + "\""); - fileNoderef = resultSet.getNodeRef(0); - resultSet.close(); - - assertTrue("File does not exist.", nodeService.exists(fileNoderef)); - assertEquals("Filename is not correct", fileName, nodeService.getProperty(fileNoderef, ContentModel.PROP_NAME)); - assertTrue("Expected return status is " + HttpServletResponse.SC_CREATED + ", but returned is " + response.getStatus(), - HttpServletResponse.SC_CREATED == response.getStatus()); - InputStream updatedFileIS = fileFolderService.getReader(fileNoderef).getContentInputStream(); - byte[] updatedFile = IOUtils.toByteArray(updatedFileIS); - updatedFileIS.close(); - assertTrue("The content has to be equal", ArrayUtils.isEquals(testDataFile, updatedFile)); - } - catch (Exception e) - { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - finally - { - if (fileNoderef != null) - { - nodeService.deleteNode(fileNoderef); - } - } - } - - @Test - public void testPutContentToAnExistingFile() throws Exception - { - FileInfo testFileInfo = fileFolderService.create(companyHomeNodeRef, "file-" + GUID.generate(), ContentModel.TYPE_CONTENT); - try - { - executeMethod(WebDAV.METHOD_PUT, testFileInfo.getName(), testDataFile, null); - - assertTrue("File does not exist.", nodeService.exists(testFileInfo.getNodeRef())); - assertEquals("Filename is not correct.", testFileInfo.getName(), nodeService.getProperty(testFileInfo.getNodeRef(), ContentModel.PROP_NAME)); - assertTrue("Expected return status is " + HttpServletResponse.SC_NO_CONTENT + ", but returned is " + response.getStatus(), - HttpServletResponse.SC_NO_CONTENT == response.getStatus()); - InputStream updatedFileIS = fileFolderService.getReader(testFileInfo.getNodeRef()).getContentInputStream(); - byte[] updatedFile = IOUtils.toByteArray(updatedFileIS); - updatedFileIS.close(); - assertTrue("The content has to be equal", ArrayUtils.isEquals(testDataFile, updatedFile)); - } - catch (Exception e) - { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - finally - { - nodeService.deleteNode(testFileInfo.getNodeRef()); - } - } - - /** - * Updating a file in an non-existent path - */ - @Test - public void testPutContentBadPath() throws Exception - { - String fileName = "file-" + GUID.generate(); - NodeRef fileNoderef = null; - try - { - // Add non-existent path - executeMethod(WebDAV.METHOD_PUT, "non/existent/path" + fileName, testDataFile, null); - - fail("The PUT execution should fail with a 400 error"); - } - catch (WebDAVServerException wse) - { - // The execution failed and it is expected - assertTrue(wse.getHttpStatusCode() == HttpServletResponse.SC_BAD_REQUEST); - } - catch (Exception e) - { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - finally - { - if (fileNoderef != null) - { - nodeService.deleteNode(fileNoderef); - } - } - } - - /** - * Creating a folder and trying to update it with a file - */ - @Test - public void testPutContentToFolder() throws Exception - { - FileInfo testFileInfo = fileFolderService.create(companyHomeNodeRef, "folder-" + GUID.generate(), ContentModel.TYPE_FOLDER); - try - { - executeMethod(WebDAV.METHOD_PUT, testFileInfo.getName(), testDataFile, null); - - fail("The PUT execution should fail with a 400 error"); - } - catch (WebDAVServerException wse) - { - // The execution failed and it is expected - assertTrue(wse.getHttpStatusCode() == HttpServletResponse.SC_BAD_REQUEST); - } - catch (Exception e) - { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - finally - { - nodeService.deleteNode(testFileInfo.getNodeRef()); - } - } - - /** - * Putting a content to a locked file - *

- * Create and lock a file by admin - *

- * Try to put the content by user - */ - @SuppressWarnings("deprecation") - @Test - public void testPutContentToLockedFIle() throws Exception - { - FileInfo testFileInfo = fileFolderService.create(companyHomeNodeRef, "file-" + GUID.generate(), ContentModel.TYPE_CONTENT); - lockService.lock(testFileInfo.getNodeRef(), LockType.WRITE_LOCK); - try - { - AuthenticationUtil.setFullyAuthenticatedUser(USER_NAME); - executeMethod(WebDAV.METHOD_PUT, testFileInfo.getName(), testDataFile, null); - - fail("The PUT execution should fail with a 423 error"); - } - catch (WebDAVServerException wse) - { - // The execution failed and it is expected - assertTrue(wse.getHttpStatusCode() == WebDAV.WEBDAV_SC_LOCKED); - } - catch (Exception e) - { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - finally - { - AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); - nodeService.deleteNode(testFileInfo.getNodeRef()); - } - } - - /** - * Putting a content and check versioning - *

- * The node will be deleted in after test. - */ - @Test - public void testPutContentCheckVersions() throws Exception - { - assertEquals("The version should be 1.0 as no file modifications were done yet.", "1.0", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL)); - - // Lock the node - try - { - executeMethod(WebDAV.METHOD_LOCK, versionableDocName, davLockInfoFile, null); - - assertEquals("The version should not advance", "1.0", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL)); - } - catch (Exception e) - { - fail("Failed to lock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - - // Split to transactions to check the commit - txn.commit(); - txn = transactionService.getUserTransaction(); - txn.begin(); - assertEquals("The version should not advance", "1.0", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL)); - - // Put non-zero content - // Construct IF HEADER - String lockToken = versionableDoc.getId() + WebDAV.LOCK_TOKEN_SEPERATOR + AuthenticationUtil.getAdminUserName(); - String lockHeaderValue = "(<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">)"; - HashMap headers = new HashMap(); - headers.put(WebDAV.HEADER_IF, lockHeaderValue); - try - { - executeMethod(WebDAV.METHOD_PUT, versionableDocName, testDataFile, headers); - - assertEquals("The version should not advance", "1.0", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL)); - } - catch (Exception e) - { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - - // Split to transactions to check the commit - txn.commit(); - txn = transactionService.getUserTransaction(); - txn.begin(); - assertEquals("The version should advance", "1.1", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL)); - - // Unlock - headers = new HashMap(); - headers.put(WebDAV.HEADER_LOCK_TOKEN, "<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">"); - try - { - executeMethod(WebDAV.METHOD_UNLOCK, versionableDocName, null, headers); - - assertEquals("The version should not advance from 1.1", "1.1", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL)); - } - catch (Exception e) - { - fail("Failed to unlock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - - // Split to transactions to check the commit - txn.commit(); - txn = transactionService.getUserTransaction(); - txn.begin(); - assertEquals("The version should not advance from 1.1", "1.1", nodeService.getProperty(versionableDoc, ContentModel.PROP_VERSION_LABEL)); - } - - /** - * Putting a zero content file and update it - *

- * Put an empty file - *

- * Lock the file - *

- * Put the contents - *

- * Unlock the node - */ - @Test - public void testPutNoContentFileAndUpdate() throws Exception - { - String fileName = "file-" + GUID.generate(); - NodeRef fileNoderef = null; - try - { - executeMethod(WebDAV.METHOD_PUT, fileName, new byte[0], null); - - ResultSet resultSet = searchService.query(storeRef, SearchService.LANGUAGE_LUCENE, "PATH:\"/app:company_home//cm:" + fileName + "\""); - fileNoderef = resultSet.getNodeRef(0); - resultSet.close(); - - assertTrue("File should exist.", nodeService.exists(fileNoderef)); - assertEquals("Filename is not correct", fileName, nodeService.getProperty(fileNoderef, ContentModel.PROP_NAME)); - - assertTrue("Expected return status is " + HttpServletResponse.SC_CREATED + ", but returned is " + response.getStatus(), - HttpServletResponse.SC_CREATED == response.getStatus()); - byte[] updatedFile = IOUtils.toByteArray(fileFolderService.getReader(fileNoderef).getContentInputStream()); - assertTrue("The content should be empty", updatedFile.length == 0); - } - catch (Exception e) - { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - - try - { - executeMethod(WebDAV.METHOD_LOCK, fileName, davLockInfoFile, null); - - assertEquals("File should be locked", LockStatus.LOCK_OWNER, lockService.getLockStatus(fileNoderef)); - } - catch (Exception e) - { - fail("Failed to lock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - - // Construct IF HEADER - String lockToken = fileNoderef.getId() + WebDAV.LOCK_TOKEN_SEPERATOR + AuthenticationUtil.getAdminUserName(); - String lockHeaderValue = "(<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">)"; - HashMap headers = new HashMap(); - headers.put(WebDAV.HEADER_IF, lockHeaderValue); - try - { - executeMethod(WebDAV.METHOD_PUT, fileName, testDataFile, headers); - - assertTrue("File does not exist.", nodeService.exists(fileNoderef)); - assertEquals("Filename is not correct", fileName, nodeService.getProperty(fileNoderef, ContentModel.PROP_NAME)); - assertTrue("Expected return status is " + HttpServletResponse.SC_NO_CONTENT + ", but returned is " + response.getStatus(), - HttpServletResponse.SC_NO_CONTENT == response.getStatus()); - - assertTrue("File should have NO_CONTENT aspect", nodeService.hasAspect(fileNoderef, ContentModel.ASPECT_NO_CONTENT)); - InputStream updatedFileIS = fileFolderService.getReader(fileNoderef).getContentInputStream(); - byte[] updatedFile = IOUtils.toByteArray(updatedFileIS); - updatedFileIS.close(); - assertTrue("The content has to be equal", ArrayUtils.isEquals(testDataFile, updatedFile)); - } - catch (Exception e) - { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - - headers = new HashMap(); - headers.put(WebDAV.HEADER_LOCK_TOKEN, "<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">"); - try - { - executeMethod(WebDAV.METHOD_UNLOCK, fileName, null, headers); - - assertTrue("Expected return status is " + HttpServletResponse.SC_NO_CONTENT + ", but returned is " + response.getStatus(), - HttpServletResponse.SC_NO_CONTENT == response.getStatus()); - assertFalse("File should not have NO_CONTENT aspect", nodeService.hasAspect(fileNoderef, ContentModel.ASPECT_NO_CONTENT)); - assertEquals("File should be unlocked", LockStatus.NO_LOCK, lockService.getLockStatus(fileNoderef)); - } - catch (Exception e) - { - fail("Failed to unlock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - - if (fileNoderef != null) - { - nodeService.deleteNode(fileNoderef); - } - } - - /** - * Negative test to check that a temp file will be deleted from the repo if writing the content fails - */ - @Test - public void testPutNullContent() throws Exception - { - String fileName = "file-" + GUID.generate(); - NodeRef fileNoderef = null; - - // Lock the node - try - { - executeMethod(WebDAV.METHOD_LOCK, fileName, davLockInfoFile, null); - ResultSet resultSet = searchService.query(storeRef, SearchService.LANGUAGE_LUCENE, "PATH:\"/app:company_home//cm:" + fileName + "\""); - fileNoderef = resultSet.getNodeRef(0); - resultSet.close(); - } - catch (Exception e) - { - fail("Failed to lock a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - - txn.commit(); - txn = transactionService.getUserTransaction(); - txn.begin(); - - // Construct IF HEADER - String lockToken = fileNoderef.getId() + WebDAV.LOCK_TOKEN_SEPERATOR + AuthenticationUtil.getAdminUserName(); - String lockHeaderValue = "(<" + WebDAV.OPAQUE_LOCK_TOKEN + lockToken + ">)"; - HashMap headers = new HashMap(); - headers.put(WebDAV.HEADER_IF, lockHeaderValue); - try - { - // setting a null content - executeMethod(WebDAV.METHOD_PUT, fileName, null, headers); - - fail("The execution should fail."); - } - catch (WebDAVServerException wse) - { - if (nodeService.exists(fileNoderef)) - { - nodeService.deleteNode(fileNoderef); - fail("File exist, but should not."); - } - } - catch (Exception e) - { - fail("Failed to upload a file: " + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); - } - - if (fileNoderef != null && nodeService.exists(fileNoderef)) - { - nodeService.deleteNode(fileNoderef); - } - } - - /** - * Executes WebDAV method for testing - *

- * Sets content to request from a test file - * - * @param method Method to prepare, should be initialized (PUT, LOCK, UNLOCK are supported) - * @param fileName the name of the file set to the context, can be used with path, i.e. "path/to/file/fileName.txt" - * @param content If not null adds test content to the request - * @param headers to set to request, can be null - * @throws Exception - */ - private void executeMethod(String methodName, String fileName, byte[] content, Map headers) throws Exception - { - if (methodName == WebDAV.METHOD_PUT) - method = new PutMethod(); - else if (methodName == WebDAV.METHOD_LOCK) - method = new LockMethod(); - else if (methodName == WebDAV.METHOD_UNLOCK) - method = new UnlockMethod(); - if (method != null) - { - request = new MockHttpServletRequest(methodName, "/alfresco/webdav/" + fileName); - response = new MockHttpServletResponse(); - request.setServerPort(8080); - request.setServletPath("/webdav"); - if (content != null) - { - request.setContent(content); - } - - if (headers != null && !headers.isEmpty()) - { - for (String key : headers.keySet()) - { - request.addHeader(key, headers.get(key)); - } - } - - method.setDetails(request, response, webDAVHelper, companyHomeNodeRef); - - method.execute(); - } - } -} diff --git a/source/test-resources/davLockInfo.xml b/source/test-resources/davLockInfo.xml deleted file mode 100644 index d6693fdcc8..0000000000 --- a/source/test-resources/davLockInfo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - admin - - \ No newline at end of file diff --git a/source/test-resources/filewithdata.txt b/source/test-resources/filewithdata.txt deleted file mode 100644 index 204d17564c..0000000000 --- a/source/test-resources/filewithdata.txt +++ /dev/null @@ -1 +0,0 @@ -testData \ No newline at end of file