From 80c6a0127d302584d0508087ae94eedf7b25dff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Thu, 24 Nov 2022 14:40:13 +0100 Subject: [PATCH] MNT-22686 Load template from the classpath (#1576) --- .../rest/actions/email/EmailTemplateTest.java | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/email/EmailTemplateTest.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/email/EmailTemplateTest.java index d7cb695d36..cb4546cb86 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/email/EmailTemplateTest.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/email/EmailTemplateTest.java @@ -1,8 +1,11 @@ package org.alfresco.rest.actions.email; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; +import static java.util.Objects.requireNonNull; +import static org.hamcrest.Matchers.notNullValue; + +import java.io.IOException; +import java.io.InputStream; import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -10,13 +13,11 @@ import javax.json.JsonObject; import org.alfresco.rest.RestTest; import org.alfresco.rest.core.JsonBodyGenerator; -import org.alfresco.rest.core.RestWrapper; -import org.alfresco.rest.model.RestNodeModel; +import org.alfresco.utility.model.FileModel; +import org.alfresco.utility.model.FileType; import org.alfresco.utility.model.FolderModel; import org.alfresco.utility.model.UserModel; -import org.alfresco.utility.Utility; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -29,9 +30,6 @@ public class EmailTemplateTest extends RestTest { private UserModel testUser; private FolderModel testFolder; - @Autowired - protected RestWrapper restClient; - @BeforeClass(alwaysRun = true) public void dataPreparation() throws Exception { adminUser = dataUser.getAdminUser(); @@ -68,16 +66,26 @@ public class EmailTemplateTest extends RestTest { .assertThat().body("entry.id", notNullValue()); } - private String uploadEmailTemplate(String templateName) + private String uploadEmailTemplate(String templateName) throws IOException { - restClient.authenticateUser(adminUser) - .configureRequestSpec() - .addMultiPart("filedata", Utility.getResourceTestDataFile(templateName)); + final String templateContent = getTemplateContent(templateName); + final FileModel templateToCreate = new FileModel(templateName, FileType.TEXT_PLAIN, templateContent); - RestNodeModel template = restClient.authenticateUser(adminUser).withCoreAPI().usingResource(testFolder).createNode(); - restClient.assertStatusCodeIs(HttpStatus.CREATED); + final FileModel createdTemplate = dataContent.usingAdmin() + .usingResource(testFolder) + .createContent(templateToCreate); - return template.getId(); + return createdTemplate.getNodeRef(); + } + + private String getTemplateContent(String templateName) throws IOException + { + final String templateClasspathLocation = "/shared-resources/testdata/" + templateName; + try (InputStream templateStream = getClass().getResourceAsStream(templateClasspathLocation)) + { + requireNonNull(templateStream, "Couldn't locate `" + templateClasspathLocation + "`"); + return new String(templateStream.readAllBytes()); + } } private static Map createMailWithTemplateParameters(UserModel sender, UserModel recipient, String templateId, Serializable model)