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

Build/test fix (follow-on from r8262)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-02-13 09:28:15 +00:00
parent cdd9e51a75
commit d141885e6d
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/repo/module/ModuleComponentHelperTest.java
View File

@@ -31,6 +31,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.alfresco.repo.admin.registry.RegistryService; import org.alfresco.repo.admin.registry.RegistryService;
import org.alfresco.repo.tenant.TenantDeployerService;
import org.alfresco.service.cmr.module.ModuleDetails; import org.alfresco.service.cmr.module.ModuleDetails;
import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.service.cmr.module.ModuleService;
import org.alfresco.service.descriptor.DescriptorService; import org.alfresco.service.descriptor.DescriptorService;
@@ -84,6 +85,7 @@ public class ModuleComponentHelperTest extends BaseAlfrescoTestCase
}; };
private RegistryService registryService; private RegistryService registryService;
private TenantDeployerService tenantDeployerService;
private DescriptorService descriptorService; private DescriptorService descriptorService;
private DummyModuleService moduleService; private DummyModuleService moduleService;
private ModuleComponentHelper helper; private ModuleComponentHelper helper;
@@ -95,6 +97,8 @@ public class ModuleComponentHelperTest extends BaseAlfrescoTestCase
super.setUp(); super.setUp();
registryService = (RegistryService) ctx.getBean("RegistryService"); registryService = (RegistryService) ctx.getBean("RegistryService");
tenantDeployerService = (TenantDeployerService) ctx.getBean("tenantAdminService");
descriptorService = serviceRegistry.getDescriptorService(); descriptorService = serviceRegistry.getDescriptorService();
moduleService = new DummyModuleService(); moduleService = new DummyModuleService();
@@ -104,6 +108,7 @@ public class ModuleComponentHelperTest extends BaseAlfrescoTestCase
helper.setRegistryService(registryService); helper.setRegistryService(registryService);
helper.setServiceRegistry(serviceRegistry); helper.setServiceRegistry(serviceRegistry);
helper.setDescriptorService(descriptorService); helper.setDescriptorService(descriptorService);
helper.setTenantDeployerService(tenantDeployerService);
// Register the components // Register the components
components = new DummyModuleComponent[3][3]; // i,j components = new DummyModuleComponent[3][3]; // i,j
@@ -119,6 +124,7 @@ public class ModuleComponentHelperTest extends BaseAlfrescoTestCase
component.setServiceRegistry(serviceRegistry); component.setServiceRegistry(serviceRegistry);
component.setAuthenticationComponent(authenticationComponent); component.setAuthenticationComponent(authenticationComponent);
component.setModuleService(moduleService); component.setModuleService(moduleService);
component.setTenantDeployerService(tenantDeployerService);
// Don't initialize the component as that will do the registration. We do it manually. // Don't initialize the component as that will do the registration. We do it manually.
helper.registerComponent(component); helper.registerComponent(component);
// Add to array // Add to array
@@ -141,8 +147,14 @@ public class ModuleComponentHelperTest extends BaseAlfrescoTestCase
moduleService.setCurrentVersion(moduleVersion); moduleService.setCurrentVersion(moduleVersion);
// Start them // Start them
helper.startModules(); helper.startModules();
int tenantCount = 0;
if (tenantDeployerService.isEnabled())
{
tenantCount = tenantDeployerService.getAllTenants().size();
}
// Check // Check
assertEquals("Incorrent number of executions (version " + moduleVersion + ")", expectedCount, executed); assertEquals("Incorrent number of executions (version " + moduleVersion + ")", expectedCount+(expectedCount*tenantCount), executed);
} }
public void testStartComponentsV00() public void testStartComponentsV00()
@@ -254,6 +266,7 @@ public class ModuleComponentHelperTest extends BaseAlfrescoTestCase
super.setServiceRegistry(serviceRegistry); super.setServiceRegistry(serviceRegistry);
super.setAuthenticationComponent(authenticationComponent); super.setAuthenticationComponent(authenticationComponent);
super.setModuleService(moduleService); super.setModuleService(moduleService);
super.setTenantDeployerService(tenantDeployerService);
super.setModuleId(moduleId); super.setModuleId(moduleId);
super.setName(name); super.setName(name);