inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

IT test should include IT

Browse Source
This commit is contained in:
alandavis
2022-08-01 12:09:34 +01:00
parent 478c689902
commit fe740e6bb7
13 changed files with 46 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTest.java → engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueIT.java
View File

@@ -26,7 +26,7 @@
*/
package org.alfresco.transform.aio;
import org.alfresco.transform.base.AbstractQueueTest;
import org.alfresco.transform.base.AbstractQueueIT;
import org.alfresco.transform.client.model.TransformRequest;
import java.util.UUID;
@@ -38,7 +38,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN;
* @author David Edwards
* created on 21/04/2020
*/
public class AIOQueueTest extends AbstractQueueTest
public class AIOQueueIT extends AbstractQueueIT
{
@Override
protected TransformRequest buildRequest()

1
engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java
View File

@@ -33,6 +33,7 @@ import org.alfresco.transform.base.CustomTransformer;
import org.alfresco.transform.base.TransformManager;
import org.slf4j.Logger;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;

8
engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTest.java → engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueIT.java
View File

@@ -26,18 +26,12 @@
*/
package org.alfresco.transform.base;
import static org.alfresco.transform.messages.TransformStack.PIPELINE_FLAG;
import static org.alfresco.transform.messages.TransformStack.levelBuilder;
import static org.alfresco.transform.messages.TransformStack.setInitialTransformRequestOptions;
import static org.junit.jupiter.api.Assertions.assertEquals;
import javax.jms.Queue;
import org.alfresco.transform.client.model.InternalContext;
import org.alfresco.transform.client.model.TransformReply;
import org.alfresco.transform.client.model.TransformRequest;
import org.alfresco.transform.common.ExtensionService;
import org.alfresco.transform.messages.TransformStack;
import org.apache.activemq.command.ActiveMQQueue;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +49,7 @@ import org.springframework.jms.core.JmsTemplate;
@SpringBootTest(classes={org.alfresco.transform.base.Application.class},
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = {"activemq.url=nio://localhost:61616"})
public abstract class AbstractQueueTest
public abstract class AbstractQueueIT
{
@Autowired
private Queue engineRequestQueue;

4
engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTest.java → engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueIT.java
View File

@@ -32,13 +32,13 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNG;
import java.util.UUID;
import org.alfresco.transform.client.model.TransformRequest;
import org.alfresco.transform.base.AbstractQueueTest;
import org.alfresco.transform.base.AbstractQueueIT;
/**
* @author Lucian Tuca
* created on 15/01/2019
*/
public class ImageMagickQueueTest extends AbstractQueueTest
public class ImageMagickQueueIT extends AbstractQueueIT
{
@Override
protected TransformRequest buildRequest()

4
engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTest.java → engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueIT.java
View File

@@ -31,13 +31,13 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCES
import java.util.UUID;
import org.alfresco.transform.client.model.TransformRequest;
import org.alfresco.transform.base.AbstractQueueTest;
import org.alfresco.transform.base.AbstractQueueIT;
/**
* @author Lucian Tuca
* created on 15/01/2019
*/
public class LibreOfficeQueueTest extends AbstractQueueTest
public class LibreOfficeQueueIT extends AbstractQueueIT
{
@Override
protected TransformRequest buildRequest()

5
engines/misc/pom.xml
View File

@@ -33,11 +33,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
<!-- HtmlParserContentTransformer -->
<dependency>
<groupId>org.htmlparser</groupId>

14
engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java
View File

@@ -31,12 +31,15 @@ import org.alfresco.transform.base.TransformManager;
import org.alfresco.transform.base.metadata.AbstractMetadataExtractorEmbedder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import javax.swing.text.ChangedCharSetException;
import javax.swing.text.MutableAttributeSet;
import javax.swing.text.html.HTML;
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.parser.ParserDelegator;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
@@ -64,7 +67,8 @@ import static org.alfresco.transform.base.metadata.AbstractMetadataExtractorEmbe
* @author Derek Hulley
* @author adavis
*/
public class HtmlMetadataExtractor extends AbstractMetadataExtractorEmbedder implements CustomTransformer
@Component
public class HtmlMetadataExtractor extends AbstractMetadataExtractorEmbedder
{
private static final Logger logger = LoggerFactory.getLogger(HtmlMetadataExtractor.class);
@@ -98,6 +102,10 @@ public class HtmlMetadataExtractor extends AbstractMetadataExtractorEmbedder imp
{
final Map<String, Serializable> rawProperties = new HashMap<>();
// This Extractor retries if the encoding needs to be changed, so we need to reread the source,
// so cannot use the input stream provided, as it will get closed.
final File sourceFile = transformManager.createSourceFile();
HTMLEditorKit.ParserCallback callback = new HTMLEditorKit.ParserCallback()
{
StringBuffer title = null;
@@ -181,10 +189,10 @@ public class HtmlMetadataExtractor extends AbstractMetadataExtractorEmbedder imp
rawProperties.clear();
Reader r = null;
try
try (InputStream cis = new FileInputStream(sourceFile))
{
// TODO: for now, use default charset; we should attempt to map from html meta-data
r = new InputStreamReader(inputStream, charsetGuess);
r = new InputStreamReader(cis, charsetGuess);
HTMLEditorKit.Parser parser = new ParserDelegator();
parser.parse(r, callback, tries > 0);
break;

2
engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java
View File

@@ -71,7 +71,7 @@ import static org.alfresco.transform.base.metadata.AbstractMetadataExtractorEmbe
* @author adavis
*/
@Component
public class RFC822MetadataExtractor extends AbstractMetadataExtractorEmbedder implements CustomTransformer
public class RFC822MetadataExtractor extends AbstractMetadataExtractorEmbedder
{
private static final Logger logger = LoggerFactory.getLogger(RFC822MetadataExtractor.class);

16
engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java
View File

@@ -58,14 +58,14 @@ public class MiscMetadataExtractsIT extends AbstractMetadataExtractsIT
{
return Stream.of(
// HtmlMetadataExtractor
testFile(MIMETYPE_HTML, "html", "quick.html"), testFile(MIMETYPE_XHTML, "xhtml", "quick.xhtml.alf"), // avoid the license header check on xhtml
// RFC822MetadataExtractor
testFile(MIMETYPE_RFC822, "eml", "quick.eml"),
// Special test cases from the repo tests
// ======================================
testFile(MIMETYPE_RFC822, "eml", "quick.spanish.eml"),
// testFile(MIMETYPE_HTML, "html", "quick.html"), testFile(MIMETYPE_XHTML, "xhtml", "quick.xhtml.alf"), // avoid the license header check on xhtml
//
// // RFC822MetadataExtractor
// testFile(MIMETYPE_RFC822, "eml", "quick.eml"),
//
// // Special test cases from the repo tests
// // ======================================
// testFile(MIMETYPE_RFC822, "eml", "quick.spanish.eml"),
testFile(MIMETYPE_HTML, "html", "quick.japanese.html")
);
}

4
engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTest.java → engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueIT.java
View File

@@ -32,9 +32,9 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN;
import java.util.UUID;
import org.alfresco.transform.client.model.TransformRequest;
import org.alfresco.transform.base.AbstractQueueTest;
import org.alfresco.transform.base.AbstractQueueIT;
public class MiscQueueTest extends AbstractQueueTest
public class MiscQueueIT extends AbstractQueueIT
{
@Override
protected TransformRequest buildRequest()

27
engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java
View File

@@ -26,9 +26,21 @@
*/
package org.alfresco.transform.misc;
import org.alfresco.transform.base.FileInfo;
import org.alfresco.transform.base.SourceTarget;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.core.io.Resource;
import org.springframework.http.ResponseEntity;
import java.util.Map;
import java.util.stream.Stream;
import static java.text.MessageFormat.format;
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.toMap;
import static org.alfresco.transform.base.EngineClient.sendTRequest;
import static org.alfresco.transform.base.FileInfo.testFile;
import static org.alfresco.transform.common.Mimetype.MIMETYPE_DITA;
import static org.alfresco.transform.common.Mimetype.MIMETYPE_EXCEL;
import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML;
@@ -54,30 +66,15 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_MEDIAWIKI;
import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN;
import static org.alfresco.transform.common.Mimetype.MIMETYPE_WORD;
import static org.alfresco.transform.common.Mimetype.MIMETYPE_XML;
import static org.alfresco.transform.base.EngineClient.sendTRequest;
import static org.alfresco.transform.base.FileInfo.testFile;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import static org.springframework.http.HttpStatus.OK;
import java.util.Map;
import java.util.stream.Stream;
import org.alfresco.transform.base.FileInfo;
import org.alfresco.transform.base.SourceTarget;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
import org.springframework.http.ResponseEntity;
/**
* @author Cezar Leahu
*/
public class MiscTransformsIT
{
private static final Logger logger = LoggerFactory.getLogger(MiscTransformsIT.class);
private static final String ENGINE_URL = "http://localhost:8090";
private static final Map<String, FileInfo> TEST_FILES = Stream.of(

4
engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueTest.java → engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueIT.java
View File

@@ -32,13 +32,13 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF;
import java.util.UUID;
import org.alfresco.transform.client.model.TransformRequest;
import org.alfresco.transform.base.AbstractQueueTest;
import org.alfresco.transform.base.AbstractQueueIT;
/**
* @author Lucian Tuca
* created on 15/01/2019
*/
public class PdfRendererQueueTest extends AbstractQueueTest
public class PdfRendererQueueIT extends AbstractQueueIT
{
@Override
protected TransformRequest buildRequest()

4
engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTest.java → engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueIT.java
View File

@@ -32,13 +32,13 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN;
import java.util.UUID;
import org.alfresco.transform.client.model.TransformRequest;
import org.alfresco.transform.base.AbstractQueueTest;
import org.alfresco.transform.base.AbstractQueueIT;
/**
* @author Lucian Tuca
* created on 15/01/2019
*/
public class TikaQueueTest extends AbstractQueueTest
public class TikaQueueIT extends AbstractQueueIT
{
@Override
protected TransformRequest buildRequest()