mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged DEV/SWIFT to HEAD (FTP Tests, Tika and Poi)
26059: ALF-5900 - IMAP creates winmail.dat in attachment folder (Add support for Microsoft Transport Neutral Encapsulation Format.) - added attachment extraction for TNEF documents - goodbye winmail.dat ! 26063: javadoc for imap. 26088: ALF-7408 - addition of commons-net for ftp client library. First test of end to end ftp. Just a simple test of connection now, will be followed by more detailed tests. 26176: ALF-7408 - FTP tests + disabled failing test case for ALF-7618 26180: ALF-7618 - correction of unit test error. 26188: ALF-7618 - added a test of paths 26229: Added back simple '\~.*' pattern 26288: ALF-7676 - Test to stress different user rights. - FTPServerTest.testTwoUserUpdate added for the FTP server. 26304: Corrected spelling name in private class. 26408: addming minimal package infos. 26416: ALF-5082 / ALF-2183 / ALF-4448 - When guessing the mimetype for a file, add the option to supply a ContentReader to enhance the accuracy. Enable this for a few key places that do mimetype guessing, which should avoid issues for files with the wrong extension (either renamed accidently, or for .TMP) 26433: Re-order the mimetype guess step to ensure that the Content Reader is always valid 26440: Added another test for word 2003 save as. 26441: Test resource for ContentDiskDriver 26446: ALF-5082 - Back out a FileFolderService change to mimetype guessing, which had broken things, pending a better way to do it with ContentWriter 26490: Small change for ContentDiskDriverTes.fileExists. Leaky transaction causing problems in automated build. 26497: ContentDiskDriver - commented out two of the problematic leaky transaction tests. 26503: Add new interface methods + documentation for asking a ContentWriter to guess the mimetype and encoding for you. (Code will be migrated from places that currently do this themselves later) 26504: Add an extension interface in the DataModel project for some of the extra ContentReader methods that FileContentReader provides 26505: When ContentWriter.putContent(String) is called with no encoding specified, record what the system default encoding was that was used. (Prevents issues if the system default is ever changed) 26509: When calling Tika to do file detection, if we have a file based reader then give Tika the File rather than an InputStream 26522: More debug logging while debugging ALF-5260 26546: Have one copy of the Tika Config in spring, rather than several places fetching their own copy of the default one (either explicitly or implicitly). 26522: More debug logging while diagnosing ALF-5260 26548: Add another mimetype check - ensures that truncated/corrup container files which can't be fully processed can still get the container type without failure 26549: Implement the mimetype and encoding guessers on ContentWriter (either immediately or as a listener, as required), and update FileFolderServer to make use of this (+test this) 26553: Replace explicit mimetype and encoding guess calls with ContentWriter requests to have the work done 26554: Replace explicit mimetype and encoding guess calls with ContentWriter requests to have the work done 26579: Switch the transformer to use Tika git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -18,13 +18,18 @@
|
||||
*/
|
||||
package org.alfresco.repo.imap;
|
||||
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.Serializable;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
|
||||
import javax.mail.Flags;
|
||||
import javax.mail.Session;
|
||||
import javax.mail.internet.MimeMessage;
|
||||
import javax.transaction.UserTransaction;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
@@ -37,10 +42,12 @@ import org.alfresco.repo.importer.ACPImportPackageHandler;
|
||||
import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
|
||||
import org.alfresco.repo.model.filefolder.FileFolderServiceImpl;
|
||||
import org.alfresco.repo.node.integrity.IntegrityChecker;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.repo.security.permissions.AccessDeniedException;
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.model.FileFolderService;
|
||||
import org.alfresco.service.cmr.model.FileInfo;
|
||||
import org.alfresco.service.cmr.repository.ContentWriter;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.repository.StoreRef;
|
||||
@@ -55,7 +62,6 @@ import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.alfresco.util.ApplicationContextHelper;
|
||||
import org.alfresco.util.PropertyMap;
|
||||
import org.alfresco.util.Utf7;
|
||||
import org.alfresco.util.config.RepositoryFolderConfigBean;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
@@ -285,18 +291,24 @@ public class ImapServiceImplTest extends TestCase
|
||||
assertTrue("folder A found", foundA);
|
||||
assertTrue("folder B found", foundB);
|
||||
|
||||
mf = imapService.listMailboxes(user, MAILBOX_PATTERN);
|
||||
assertEquals("can't repeat the listing of folders", 2, mf.size());
|
||||
|
||||
mf = imapService.listMailboxes(user, MAILBOX_PATTERN);
|
||||
assertEquals("can't repeat the listing of folders", 2, mf.size());
|
||||
|
||||
/**
|
||||
* The new mailboxes should be subscribed?
|
||||
*/
|
||||
List<AlfrescoImapFolder> aif = imapService.listSubscribedMailboxes(user, MAILBOX_PATTERN);
|
||||
assertEquals(2, aif.size());
|
||||
assertEquals("not subscribed to two mailboxes", 2, aif.size());
|
||||
|
||||
/**
|
||||
* Unsubscribe to one of the mailboxes.
|
||||
*/
|
||||
imapService.unsubscribe(user, MAILBOX_NAME_B);
|
||||
List<AlfrescoImapFolder> aif2 = imapService.listSubscribedMailboxes(user, MAILBOX_PATTERN);
|
||||
assertEquals(1, aif2.size());
|
||||
assertEquals("not subscribed to one mailbox", 1, aif2.size());
|
||||
}
|
||||
|
||||
public void testListSubscribedMailbox() throws Exception
|
||||
@@ -514,8 +526,8 @@ public class ImapServiceImplTest extends TestCase
|
||||
|
||||
public void testRenameAccentedMailbox() throws Exception
|
||||
{
|
||||
String MAILBOX_ACCENTED_NAME_A = "H<EFBFBD>tel";
|
||||
String MAILBOX_ACCENTED_NAME_B = "H<EFBFBD>telXX";
|
||||
String MAILBOX_ACCENTED_NAME_A = "H<EFBFBD>tel";
|
||||
String MAILBOX_ACCENTED_NAME_B = "H<EFBFBD>telXX";
|
||||
|
||||
imapService.createMailbox(user, MAILBOX_ACCENTED_NAME_A);
|
||||
imapService.deleteMailbox(user, MAILBOX_ACCENTED_NAME_A);
|
||||
@@ -526,4 +538,45 @@ public class ImapServiceImplTest extends TestCase
|
||||
assertTrue("Can't rename mailbox", checkMailbox(user, MAILBOX_ACCENTED_NAME_B));
|
||||
imapService.deleteMailbox(user, MAILBOX_ACCENTED_NAME_B);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test attachment extraction with a TNEF message
|
||||
* @throws Exception
|
||||
*/
|
||||
public void testAttachmentExtraction() throws Exception
|
||||
{
|
||||
AuthenticationUtil.setRunAsUserSystem();
|
||||
/**
|
||||
* Load a TNEF message
|
||||
*/
|
||||
ClassPathResource fileResource = new ClassPathResource("imap/test-tnef-message.eml");
|
||||
assertNotNull("unable to find test resource test-tnef-message.eml", fileResource);
|
||||
InputStream is = new FileInputStream(fileResource.getFile());
|
||||
MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()), is);
|
||||
|
||||
/**
|
||||
* Create a test node containing the message
|
||||
*/
|
||||
String storePath = "workspace://SpacesStore";
|
||||
String companyHomePathInStore = "/app:company_home";
|
||||
StoreRef storeRef = new StoreRef(storePath);
|
||||
NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef);
|
||||
|
||||
List<NodeRef> nodeRefs = searchService.selectNodes(storeRootNodeRef, companyHomePathInStore, null, namespaceService, false);
|
||||
NodeRef companyHomeNodeRef = nodeRefs.get(0);
|
||||
|
||||
FileInfo f1 = fileFolderService.create(companyHomeNodeRef, "ImapServiceImplTest", ContentModel.TYPE_FOLDER);
|
||||
FileInfo d2 = fileFolderService.create(f1.getNodeRef(), "ImapServiceImplTest", ContentModel.TYPE_FOLDER);
|
||||
FileInfo f2 = fileFolderService.create(f1.getNodeRef(), "test-tnef-message.eml", ContentModel.TYPE_CONTENT);
|
||||
|
||||
ContentWriter writer = fileFolderService.getWriter(f2.getNodeRef());
|
||||
writer.putContent(new FileInputStream(fileResource.getFile()));
|
||||
|
||||
NodeRef folder = imapService.extractAttachments(f1.getNodeRef(), f2.getNodeRef(), message);
|
||||
assertNotNull(folder);
|
||||
|
||||
List<FileInfo> files = fileFolderService.listFiles(folder);
|
||||
assertTrue("three files not found", files.size() == 3);
|
||||
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user