diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java index d589d31f..c63139c1 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java @@ -53,11 +53,16 @@ import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_WORD; import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_WORDPERFECT; import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_XML; import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE_MACRO; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_SPREADSHEET_ADDIN_MACRO; import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW; import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW_MACRO; import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OUTLOOK_MSG; import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_DITA; +import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_SXI; +import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_SXC; +import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_STW; +import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_STI; +import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_STC; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.springframework.http.HttpStatus.OK; @@ -118,6 +123,10 @@ public class LibreOfficeTransformationIT testFile(MIMETYPE_PDF,"pdf",null) ); + private static final Set txtTarget = ImmutableSet.of( + testFile(MIMETYPE_TEXT_PLAIN,"txt",null) + ); + private final String sourceFile; private final String targetExtension; private final String sourceMimetype; @@ -146,6 +155,12 @@ public class LibreOfficeTransformationIT testFile(MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW_MACRO ,"ppsm" ,"quick.ppsm"), testFile(MIMETYPE_OUTLOOK_MSG ,"msg" ,"quick.msg"), testFile(MIMETYPE_DITA ,"dita" ,"quick.dita"), + testFile(MIMETYPE_TEXT_PLAIN ,"txt" ,"quick.txt"), + testFile(MIMETYPE_STC ,"stc" ,"quick.stc"), + testFile(MIMETYPE_STI ,"sti" ,"quick.sti"), + testFile(MIMETYPE_STW ,"stw" ,"quick.stw"), + testFile(MIMETYPE_SXC ,"sxc" ,"quick.sxc"), + testFile(MIMETYPE_SXI ,"sxi" ,"quick.sxi"), testFile(MIMETYPE_TSV ,"tsv" ,"sample.tsv") ).collect(toMap(TestFileInfo::getPath, identity())); @@ -167,6 +182,7 @@ public class LibreOfficeTransformationIT allTargets("quick.html", documentsTargets), allTargets("quick.odt", documentsTargets), allTargets("quick.wpd", documentsTargets), + allTargets("quick.txt", documentsTargets), allTargets("sample.rtf", documentsTargets), allTargets("quick.odp", presentationTargets), @@ -188,7 +204,14 @@ public class LibreOfficeTransformationIT allTargets("quick.dita", pdfTarget), allTargets("quick.msg", pdfTarget), allTargets("quick.ppsm", pdfTarget), - allTargets("quick.ppsx", pdfTarget) + allTargets("quick.ppsx", pdfTarget), + allTargets("quick.stc", pdfTarget), + allTargets("quick.sti", pdfTarget), + allTargets("quick.stw", pdfTarget), + allTargets("quick.sxc", pdfTarget), + allTargets("quick.sxi", pdfTarget), + + allTargets("quick.msg", txtTarget) ) .flatMap(identity()) .collect(toSet()); diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.stc b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.stc new file mode 100644 index 00000000..310b6f25 Binary files /dev/null and b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.stc differ diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.sti b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.sti new file mode 100644 index 00000000..33537f28 Binary files /dev/null and b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.sti differ diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.stw b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.stw new file mode 100644 index 00000000..082b7344 Binary files /dev/null and b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.stw differ diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.sxc b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.sxc new file mode 100644 index 00000000..f2bcabc0 Binary files /dev/null and b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.sxc differ diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.sxi b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.sxi new file mode 100644 index 00000000..daae7d5b Binary files /dev/null and b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.sxi differ diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.txt b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.txt new file mode 100644 index 00000000..43a5841a --- /dev/null +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/resources/quick.txt @@ -0,0 +1,8 @@ + +The quick brown fox jumps over the lazy dog + + + + + Blank Page + diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaTransformationIT.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaTransformationIT.java index 860a0b60..5744c701 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaTransformationIT.java +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaTransformationIT.java @@ -72,7 +72,15 @@ public class TikaTransformationIT { sourceFile = entry.getLeft(); targetExtension = entry.getMiddle(); - targetMimetype = extensionMimetype.get(entry.getMiddle()); + //Single test to cover pdf-->csv + if (sourceFile.contains("pdf") && targetExtension.contains("csv")) + { + targetMimetype = "text/csv"; + } + else + { + targetMimetype = extensionMimetype.get(entry.getMiddle()); + } sourceMimetype = entry.getRight(); } @@ -108,6 +116,9 @@ public class TikaTransformationIT Triple.of("quick.numbers", "xhtml", "application/vnd.apple.numbers"), Triple.of("quick.numbers", "xml", "application/vnd.apple.numbers") ), + Stream.of( + Triple.of("quick.pdf", "csv", "application/pdf") + ), allTargets("quick.odp", "application/vnd.oasis.opendocument.presentation"), allTargets("quick.ods", "application/vnd.oasis.opendocument.spreadsheet"), allTargets("quick.odt", "application/vnd.oasis.opendocument.text"), diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/MimetypeMap.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/MimetypeMap.java index 612ae8fe..b897e960 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/MimetypeMap.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/MimetypeMap.java @@ -181,4 +181,10 @@ public interface MimetypeMap String MIMETYPE_VORBIS = "audio/vorbis"; String MIMETYPE_FLAC = "audio/x-flac"; String MIMETYPE_ACP = "application/acp"; + String MIMETYPE_STC = "application/vnd.sun.xml.calc.template"; + String MIMETYPE_STI = "application/vnd.sun.xml.impress.template"; + String MIMETYPE_STW = "application/vnd.sun.xml.writer.template"; + String MIMETYPE_SXC = "application/vnd.sun.xml.calc"; + String MIMETYPE_SXI = "application/vnd.sun.xml.impress"; + }