mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
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
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user