diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java b/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java index e65aad03..9340cd3b 100644 --- a/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java +++ b/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java @@ -35,6 +35,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.SpyBean; +import org.springframework.http.MediaType; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; @@ -102,5 +103,7 @@ public class AlfrescoPdfRendererControllerTest extends AbstractTransformerContro { transformRequest.setSourceExtension("pdf"); transformRequest.setTargetExtension("png"); + transformRequest.setSourceMediaType(MediaType.APPLICATION_PDF_VALUE); + transformRequest.setTargetMediaType(MediaType.IMAGE_PNG_VALUE); } } diff --git a/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java b/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java index 2b69ff71..71e61fd2 100644 --- a/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java +++ b/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java @@ -37,6 +37,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.SpyBean; +import org.springframework.http.MediaType; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; @@ -176,5 +177,7 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest { transformRequest.setSourceExtension("png"); transformRequest.setTargetExtension("png"); + transformRequest.setSourceMediaType(MediaType.IMAGE_PNG_VALUE); + transformRequest.setTargetMediaType(MediaType.IMAGE_PNG_VALUE); } } diff --git a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java b/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java index 08c67b72..cab9ebea 100644 --- a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java +++ b/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java @@ -48,6 +48,7 @@ import org.junit.runner.RunWith; import org.mockito.stubbing.Answer; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.SpyBean; +import org.springframework.http.MediaType; import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; @@ -133,5 +134,7 @@ public class LibreOfficeControllerTest extends AbstractTransformerControllerTest { transformRequest.setSourceExtension("doc"); transformRequest.setTargetExtension("pdf"); + transformRequest.setSourceMediaType("application/msword"); + transformRequest.setTargetMediaType(MediaType.IMAGE_PNG_VALUE); } } diff --git a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaControllerTest.java b/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaControllerTest.java index 27d0e572..3e37ebb7 100644 --- a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaControllerTest.java +++ b/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaControllerTest.java @@ -67,6 +67,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.boot.test.mock.mockito.SpyBean; +import org.springframework.http.MediaType; import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MvcResult; @@ -398,6 +399,8 @@ public class TikaControllerTest extends AbstractTransformerControllerTest { transformRequest.setSourceExtension(sourceExtension); transformRequest.setTargetExtension(targetExtension); + transformRequest.setSourceMediaType(MediaType.APPLICATION_PDF_VALUE); + transformRequest.setTargetMediaType(MediaType.TEXT_PLAIN_VALUE); transformRequest.getTransformationRequestOptions().put("transform", "PdfBox"); transformRequest.getTransformationRequestOptions().put("targetMimetype", "text/plain"); transformRequest.getTransformationRequestOptions().put("targetEncoding", "UTF-8"); 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 ee67c2ae..bf12a790 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 @@ -408,15 +408,10 @@ public abstract class AbstractTransformerControllerTest transformRequest.setSchema(1); transformRequest.setClientData("Alfresco Digital Business Platform"); transformRequest.setTransformationRequestOptions(new HashMap<>()); - transformRequest.setSourceReference(sourceFileRef); transformRequest.setSourceExtension(sourceExtension); - // TODO: ATS-53 - transformRequest.setSourceMediaType("TODO"); transformRequest.setSourceSize(sourceFile.length()); - transformRequest.setTargetExtension(targetExtension); - transformRequest.setTargetMediaType("TODO"); // HTTP Request HttpHeaders headers = new HttpHeaders(); @@ -447,5 +442,25 @@ public abstract class AbstractTransformerControllerTest assertEquals(transformRequest.getSchema(), transformReply.getSchema()); } + @Test + public void testEmptyPojoTransform() throws Exception + { + // Transformation Request POJO + TransformRequest transformRequest = new TransformRequest(); + + // Serialize and call the transformer + String tr = objectMapper.writeValueAsString(transformRequest); + String transformationReplyAsString = mockMvc.perform(MockMvcRequestBuilders.post("/transform") + .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE) + .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).content(tr)) + .andExpect(status().is(HttpStatus.BAD_REQUEST.value())) + .andReturn().getResponse().getContentAsString(); + + TransformReply transformReply = objectMapper.readValue(transformationReplyAsString, TransformReply.class); + + // Assert the reply + assertEquals(HttpStatus.BAD_REQUEST.value(), transformReply.getStatus()); + } + protected abstract void updateTransformRequestWithSpecificOptions(TransformRequest transformRequest); }