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

ALF-10374 Fixed failing MultiTDemoTest.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-09-27 11:43:52 +00:00
parent 2fd91d87c2
commit f4830cff15
2 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
source/java/org/alfresco/repo/tenant/MultiTDemoTest.java
View File

@@ -1109,55 +1109,55 @@ public class MultiTDemoTest extends TestCase
public void testCustomModels()
{
// logger.info("test custom models");
//
// final int defaultModelCnt = dictionaryService.getAllModels().size();
//
// for (final String tenantDomain : tenants)
// {
// final String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
//
// AuthenticationUtil.runAs(new RunAsWork<Object>()
// {
// public Object doWork() throws Exception
// {
// // no custom models should be deployed yet (note: will fail if re-run)
// assertEquals(0, repoAdminService.getModels().size());
// assertEquals(defaultModelCnt, dictionaryService.getAllModels().size());
// assertNull(dictionaryService.getClass(QName.createQName("{my.new.model}sop")));
//
// // deploy custom model
// InputStream modelStream = getClass().getClassLoader().getResourceAsStream("tenant/exampleModel.xml");
// repoAdminService.deployModel(modelStream, "exampleModel.xml");
//
// assertEquals(1, repoAdminService.getModels().size());
// assertEquals(defaultModelCnt+1, dictionaryService.getAllModels().size());
//
// ClassDefinition myType = dictionaryService.getClass(QName.createQName("{my.new.model}sop"));
// assertNotNull(myType);
// assertEquals(QName.createQName("{my.new.model}mynewmodel"),myType.getModel().getName());
//
// // deactivate model
// repoAdminService.deactivateModel("exampleModel.xml");
//
// assertEquals(1, repoAdminService.getModels().size()); // still deployed, although not active
// assertEquals(defaultModelCnt, dictionaryService.getAllModels().size());
// assertNull(dictionaryService.getClass(QName.createQName("{my.new.model}sop")));
//
// // re-activate model
// repoAdminService.activateModel("exampleModel.xml");
//
// assertEquals(1, repoAdminService.getModels().size());
// assertEquals(defaultModelCnt+1, dictionaryService.getAllModels().size());
//
// myType = dictionaryService.getClass(QName.createQName("{my.new.model}sop"));
// assertNotNull(myType);
// assertEquals(QName.createQName("{my.new.model}mynewmodel"),myType.getModel().getName());
//
// return null;
// }
// }, tenantAdminName);
// }
logger.info("test custom models");
final int defaultModelCnt = dictionaryService.getAllModels().size();
for (final String tenantDomain : tenants)
{
final String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
AuthenticationUtil.runAs(new RunAsWork<Object>()
{
public Object doWork() throws Exception
{
// no custom models should be deployed yet (note: will fail if re-run)
assertEquals(0, repoAdminService.getModels().size());
assertEquals(defaultModelCnt, dictionaryService.getAllModels().size());
assertNull(dictionaryService.getClass(QName.createQName("{my.new.model}sop")));
// deploy custom model
InputStream modelStream = getClass().getClassLoader().getResourceAsStream("tenant/exampleModel.xml");
repoAdminService.deployModel(modelStream, "exampleModel.xml");
assertEquals(1, repoAdminService.getModels().size());
assertEquals(defaultModelCnt+1, dictionaryService.getAllModels().size());
ClassDefinition myType = dictionaryService.getClass(QName.createQName("{my.new.model}sop"));
assertNotNull(myType);
assertEquals(QName.createQName("{my.new.model}mynewmodel"),myType.getModel().getName());
// deactivate model
repoAdminService.deactivateModel("exampleModel.xml");
assertEquals(1, repoAdminService.getModels().size()); // still deployed, although not active
assertEquals(defaultModelCnt, dictionaryService.getAllModels().size());
assertNull(dictionaryService.getClass(QName.createQName("{my.new.model}sop")));
// re-activate model
repoAdminService.activateModel("exampleModel.xml");
assertEquals(1, repoAdminService.getModels().size());
assertEquals(defaultModelCnt+1, dictionaryService.getAllModels().size());
myType = dictionaryService.getClass(QName.createQName("{my.new.model}sop"));
assertNotNull(myType);
assertEquals(QName.createQName("{my.new.model}mynewmodel"),myType.getModel().getName());
return null;
}
}, tenantAdminName);
}
}
public void testAddCustomWebClient()

2
source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
View File

@@ -573,7 +573,7 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
// This should return all task definitions, including the start-task
ReadOnlyProcessDefinition processDefinition =((RepositoryServiceImpl)repoService).getDeployedProcessDefinition(processDefinitionId);
String processName = processDefinition.getName();
String processName = ((ProcessDefinition)processDefinition).getKey();
factory.checkDomain(processName);
// Process start task definition