inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)

Browse Source 
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
This commit is contained in:
Jamal Kaabi-Mofrad
2017-03-03 11:42:04 +00:00
parent 44fadd0888
commit 9a4e44dc98
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/test-java/org/alfresco/util/EmailHelperTest.java
View File

@@ -42,7 +42,6 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.Mock; import org.mockito.Mock;
@@ -123,12 +122,6 @@ public class EmailHelperTest
emailHelper.setTemplateLoader(templateLoaderMock); emailHelper.setTemplateLoader(templateLoaderMock);
} }
@After
public void tearDown() throws Exception
{
}
@Test @Test
public void testGetEmailTemplate() throws Exception public void testGetEmailTemplate() throws Exception
{ {
@@ -165,7 +158,7 @@ public class EmailHelperTest
assertEquals(result, dummyTemplateNodeRef.toString()); assertEquals(result, dummyTemplateNodeRef.toString());
} }
//NodeRed // NodeRef
{ {
when(nodeServiceMock.exists(dummyTemplateNodeRef)).thenReturn(false); when(nodeServiceMock.exists(dummyTemplateNodeRef)).thenReturn(false);
result = emailHelper.getEmailTemplate(CLIENT_NAME, dummyTemplateNodeRef.toString(), FALLBACK_TEMPLATE_PATH); result = emailHelper.getEmailTemplate(CLIENT_NAME, dummyTemplateNodeRef.toString(), FALLBACK_TEMPLATE_PATH);
@@ -178,7 +171,7 @@ public class EmailHelperTest
assertEquals(result, dummyTemplateNodeRef.toString()); assertEquals(result, dummyTemplateNodeRef.toString());
} }
//class path // Class path
{ {
String classPathTemplate = "alfresco/templates/email-templates/new-template.html"; String classPathTemplate = "alfresco/templates/email-templates/new-template.html";
when(templateLoaderMock.findTemplateSource(classPathTemplate)).thenReturn(null); when(templateLoaderMock.findTemplateSource(classPathTemplate)).thenReturn(null);