diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java index 83541ec8..5ee48b2f 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java @@ -153,6 +153,8 @@ public class TikaControllerTest extends AbstractTransformerControllerTest { sourceExtension = "pdf"; targetExtension = "txt"; + sourceMimetype = MIMETYPE_PDF; + targetMimetype = MIMETYPE_TEXT_PLAIN; } @Override @@ -649,9 +651,6 @@ public class TikaControllerTest extends AbstractTransformerControllerTest @Override public void httpTransformRequestUsingDirectAccessUrlTest() throws Exception { - this.sourceExtension = PDF; - this.targetExtension = TXT; - this.sourceMimetype = MIMETYPE_PDF; expectedTargetFileBytes = readTestFile(targetExtension); super.httpTransformRequestUsingDirectAccessUrlTest(); } diff --git a/alfresco-transformer-base/src/main/resources/templates/log.html b/alfresco-transformer-base/src/main/resources/templates/log.html index 856c5dd1..ee973306 100644 --- a/alfresco-transformer-base/src/main/resources/templates/log.html +++ b/alfresco-transformer-base/src/main/resources/templates/log.html @@ -36,6 +36,7 @@

Test Transformation + Transformer Config
diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java index 616119e2..297f19e0 100644 --- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java +++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java @@ -27,6 +27,7 @@ package org.alfresco.transformer; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; +import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL; import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM; import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG_LATEST; @@ -86,6 +87,7 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; @@ -655,9 +657,15 @@ public abstract class AbstractTransformerControllerTest File dauSourceFile = getTestFile("quick." + sourceExtension, true); String directUrl = "file://" + dauSourceFile.toPath(); - mockMvc.perform( - mockMvcRequest("/transform", null, "targetExtension", targetExtension, DIRECT_ACCESS_URL, directUrl)) - .andExpect(status().is(OK.value())) - .andExpect(content().bytes(expectedTargetFileBytes)); + ResultActions resultActions = mockMvc.perform( + mockMvcRequest(ENDPOINT_TRANSFORM, null) + .param("targetExtension", targetExtension) + .param(DIRECT_ACCESS_URL, directUrl)) + .andExpect(status().is(OK.value())); + + if (expectedTargetFileBytes != null) + { + resultActions.andExpect(content().bytes(expectedTargetFileBytes)); + } } }