From 9a4e44dc983fe32c95ae61c477c69fe35a8d176a Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Fri, 3 Mar 2017 11:42:04 +0000 Subject: [PATCH] Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1) 135561 jkaabimofrad: APPSREPO-137: Minor change based on peer review. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../test-java/org/alfresco/util/EmailHelperTest.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/source/test-java/org/alfresco/util/EmailHelperTest.java b/source/test-java/org/alfresco/util/EmailHelperTest.java index 10d7ee909a..72f4c22d09 100644 --- a/source/test-java/org/alfresco/util/EmailHelperTest.java +++ b/source/test-java/org/alfresco/util/EmailHelperTest.java @@ -42,7 +42,6 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.NamespaceService; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -123,12 +122,6 @@ public class EmailHelperTest emailHelper.setTemplateLoader(templateLoaderMock); } - @After - public void tearDown() throws Exception - { - - } - @Test public void testGetEmailTemplate() throws Exception { @@ -165,7 +158,7 @@ public class EmailHelperTest assertEquals(result, dummyTemplateNodeRef.toString()); } - //NodeRed + // NodeRef { when(nodeServiceMock.exists(dummyTemplateNodeRef)).thenReturn(false); result = emailHelper.getEmailTemplate(CLIENT_NAME, dummyTemplateNodeRef.toString(), FALLBACK_TEMPLATE_PATH); @@ -178,7 +171,7 @@ public class EmailHelperTest assertEquals(result, dummyTemplateNodeRef.toString()); } - //class path + // Class path { String classPathTemplate = "alfresco/templates/email-templates/new-template.html"; when(templateLoaderMock.findTemplateSource(classPathTemplate)).thenReturn(null);