Merged 5.2.N (5.2.1) to 5.1.N (5.1.2)

128826 jvonka: MNT-16448 / REPO-928: Fix "Alfresco OOTB install doesn't show preview for .EML files"
   - add back Rfc822ToPdf to replace removal of Rfc822ToSwf (removed for BDE-443)
   - follow-on attempt to workaround build machine #fail (is this a wider issue for transform testing ... ?)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@128831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2016-07-20 12:43:58 +00:00
parent 1fd9e6a4e4
commit 5eccebc6ed

View File

@@ -60,6 +60,7 @@ public class EMLTransformerTest extends AbstractContentTransformerTest
private EMLTransformer transformer;
private ContentTransformerRegistry registry;
private ContentTransformerWorker ooWorker;
@Override
public void setUp() throws Exception
@@ -72,6 +73,8 @@ public class EMLTransformerTest extends AbstractContentTransformerTest
transformer.setTransformerConfig(transformerConfig);
registry = (ContentTransformerRegistry) ctx.getBean("contentTransformerRegistry");
ooWorker = (ContentTransformerWorker) ctx.getBean("transformer.worker.OpenOffice");
}
@Override
@@ -112,6 +115,15 @@ public class EMLTransformerTest extends AbstractContentTransformerTest
*/
public void testRFC822ToPdf() throws Exception
{
assertNotNull(registry.getTransformer("transformer.complex.Rfc822ToPdf"));
// workaround for build machines (borrowed from OpenOfficeContentTransformerTest)
if (!ooWorker.isAvailable())
{
// no connection
return;
}
String sourceMimetype = MimetypeMap.MIMETYPE_RFC822;
String targetMimetype = MimetypeMap.MIMETYPE_PDF;