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 HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
119945 jphuynh: Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
      119558 gcornwell: Merged code coverage improvements to 5.1-MC1 (5.1.0)
         r117774 gjames: RA-567: Increase /workflow/processes API code coverage
         r117773 gjames: RA-567: /workflow/processes coverage, removed unused ActivitiTypeConverter
         r116883 gjames: RA-531: reapplied change after merge, for MultiTServiceImpl test coverage
         r116629 gjames: RA-568 Increase /workflow/process-definitions API code coverage
         r116574 gjames: RA-569 Increase /workflow/tasks API code coverage
         r116286 gjames: RA-567: Increase /workflow/processes API code coverage
         r115853 gjames: RA-566: Increasing /people api coverage (description field)
         r115811 gjames: RA-566: Increasing /people api coverage
         r113007 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DynamicNamespacePrefixResolver RA-521
         r113006 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DictionaryComponent RA-514
         r112969 gjames: Adding additional test coverage for TemplateServiceImpl RA-530
         r112960 gjames: Alternative test approach for ModuleServiceImpl RA-520
         r112703 gjames: Adding additional test coverage for NodeLocatorService RA-522
         r112702 gjames: Adding additional test coverage for JobLockServiceImpl RA-516
         r112699 gjames: Adding additional test coverage for ModuleServiceImpl RA-520
         r112508 gjames: Adding additional test coverage for RenditionServiceImpl RA-526
         r112476 gjames: Adding additional test coverage for ContentServiceImpl RA-513
         r112475 gjames: Adding additional test coverage for MimetypeMap RA-519
         r112238 gjames: Adding additional test coverage for MimetypeMap RA-519
         r112237 gjames: Adding additional test coverage for TaggingService RA-529
         r112236 gjames: Adding additional test coverage for MultiTServiceImpl RA-531
         r112206 gjames: Adding additional test coverage for ContentServiceImpl RA-513
         r112167 gcornwell: RA-523: Increase NodeService code coverage (removed redundant code that was testing a version store we no longer use)
         r112102 gjames: Reverted changes to PermissionServiceImpl for RA-524
         r112048 gjames: Temporarily removed some PermissionServiceImpl code. I need to put it back.
         r111620 gjames: Adding additional test coverage for PermissionService RA-524
         r111619 gjames: Added some @Override to make Sonar happier
         r111456 gjames: Adding additional test coverage for AuthenticationService RA-509
         r111427 gjames: Adding additional test coverage for AttributeService RA-509
         r111317 gjames: Adding additional test coverage for WorkflowService RA-533


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andreea Dragoi
2015-12-15 13:26:39 +00:00
parent db6475fae6
commit 2c82c256cb
19 changed files with 780 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
source/test-java/org/alfresco/repo/template/TemplateServiceImplTest.java
View File

@@ -19,6 +19,7 @@
package org.alfresco.repo.template;
import java.io.InputStream;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
@@ -34,12 +35,14 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.TemplateException;
import org.alfresco.service.cmr.repository.TemplateService;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.ApplicationContextHelper;
import org.junit.experimental.categories.Category;
import org.springframework.context.ApplicationContext;
import org.springframework.extensions.surf.util.I18NUtil;
/**
* @author Kevin Roast
@@ -49,7 +52,8 @@ public class TemplateServiceImplTest extends TestCase
{
private static final String TEMPLATE_1 = "org/alfresco/repo/template/test_template1.ftl";
private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
private NodeRef root_node;
private TemplateService templateService;
private NodeService nodeService;
private TransactionService transactionService;
@@ -89,6 +93,19 @@ public class TemplateServiceImplTest extends TestCase
DictionaryComponent dictionary = new DictionaryComponent();
dictionary.setDictionaryDAO(dictionaryDao);
BaseNodeServiceTest.loadModel(ctx);
transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<Object>()
{
@SuppressWarnings("unchecked")
public Object execute() throws Exception
{
StoreRef store = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "template_" + System.currentTimeMillis());
root_node = nodeService.getRootNode(store);
BaseNodeServiceTest.buildNodeGraph(nodeService, root_node);
return null;
}
});
}
@Override
@@ -106,29 +123,68 @@ public class TemplateServiceImplTest extends TestCase
@SuppressWarnings("unchecked")
public Object execute() throws Exception
{
StoreRef store = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "template_" + System.currentTimeMillis());
NodeRef root = nodeService.getRootNode(store);
BaseNodeServiceTest.buildNodeGraph(nodeService, root);
// check the default template engine exists
assertNotNull(templateService.getTemplateProcessor("freemarker"));
// create test model
Map model = new HashMap(7, 1.0f);
model.put("root", new TemplateNode(root, serviceRegistry, null));
Map model = createTemplateModel(root_node);
// execute on test template
String output = templateService.processTemplate("freemarker", TEMPLATE_1, model);
// check template contains the expected output
assertTrue( (output.indexOf(root.getId()) != -1) );
System.out.print(output);
assertTrue( (output.indexOf(root_node.getId()) != -1) );
return null;
}
});
}
private Map createTemplateModel(NodeRef root)
{
// create test model
Map model = new HashMap(7, 1.0f);
model.put("root", new TemplateNode(root, serviceRegistry, null));
return model;
}
public void testGetTemplateProcessor()
{
assertNotNull(templateService.getTemplateProcessor(null));
}
public void testProcessTemplate()
{
Map model = createTemplateModel(root_node);
StringWriter writer = new StringWriter();
templateService.processTemplate(TEMPLATE_1, model, writer);
assertTrue( (writer.toString().indexOf(root_node.getId()) != -1) );
try
{
templateService.processTemplate("NOT_REAL", TEMPLATE_1, model, new StringWriter());
fail("The engine name is nonsense");
} catch (TemplateException expected)
{
//
}
try
{
templateService.processTemplate("NOT_REAL", TEMPLATE_1, model, I18NUtil.getLocale());
fail("The engine name is nonsense");
} catch (TemplateException expected)
{
//
}
try
{
templateService.processTemplateString("NOT_REAL", TEMPLATE_1, model, new StringWriter());
fail("The engine name is nonsense");
} catch (TemplateException expected)
{
//
}
}
}