From ed5585be0a84df6d1b70efd313ac02ccc49836a8 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 20:42:42 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57475: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 57285: MNT-9854 (ALF-17856) Ability to Easily Disable Certain Source and Target Media Types in ImageMagick Transformer - Added a unit test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../TransformerConfigSupportedTest.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/source/test-java/org/alfresco/repo/content/transform/TransformerConfigSupportedTest.java b/source/test-java/org/alfresco/repo/content/transform/TransformerConfigSupportedTest.java index 219cf65d1c..089bbff40d 100644 --- a/source/test-java/org/alfresco/repo/content/transform/TransformerConfigSupportedTest.java +++ b/source/test-java/org/alfresco/repo/content/transform/TransformerConfigSupportedTest.java @@ -223,4 +223,38 @@ public class TransformerConfigSupportedTest boolean supported = extractor.isSupportedTransformation((ContentTransformer) new DummyContentTransformer("transformer.abc"), "application/pdf", "image/png", options); assertEquals("supported", true, supported); } + + @Test + public void supportedWildcardMimetypeTest() + { + mockMimetypes(mimetypeService, + "application/pdf", "pdf", + "image/png", "png", + "image/x-raw-adobe", "dng", + "image/x-raw-hasselblad", "3fr", + "image/x-raw-fuji", "raf", + "image/x-raw-canon", "cr2", + "image/x-raw-kodak", "k25", + "text/xml", "xml"); + mockProperties(transformerProperties, "content.transformer.abc.mimetypes.image/x-raw*.application/pdf.supported", "true"); + + extractor = new TransformerConfigSupported(transformerProperties, mimetypeService); + ContentTransformer transformer = (ContentTransformer) new DummyContentTransformer("transformer.abc"); + boolean supported = extractor.isSupportedTransformation(transformer, "image/png", "application/pdf", options); + assertEquals("png supported", false, supported); + + supported = extractor.isSupportedTransformation(transformer, "image/x-raw-adobe", "application/pdf", options); + assertEquals("dng supported", true, supported); + supported = extractor.isSupportedTransformation(transformer, "image/x-raw-hasselblad", "application/pdf", options); + assertEquals("3fr supported", true, supported); + supported = extractor.isSupportedTransformation(transformer, "image/x-raw-fuji", "application/pdf", options); + assertEquals("raf supported", true, supported); + supported = extractor.isSupportedTransformation(transformer, "image/x-raw-canon", "application/pdf", options); + assertEquals("cr2 supported", true, supported); + supported = extractor.isSupportedTransformation(transformer, "image/x-raw-kodak", "application/pdf", options); + assertEquals("k25 supported", true, supported); + + supported = extractor.isSupportedTransformation(transformer, "text/xml", "application/pdf", options); + assertEquals("txt supported", false, supported); + } }