From 5eccebc6eda51e6e01f716ad3cfa6498b42634e8 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Wed, 20 Jul 2016 12:43:58 +0000 Subject: [PATCH] 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 --- .../repo/content/transform/EMLTransformerTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/source/test-java/org/alfresco/repo/content/transform/EMLTransformerTest.java b/source/test-java/org/alfresco/repo/content/transform/EMLTransformerTest.java index b927ace1ed..0ded9bb429 100644 --- a/source/test-java/org/alfresco/repo/content/transform/EMLTransformerTest.java +++ b/source/test-java/org/alfresco/repo/content/transform/EMLTransformerTest.java @@ -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;