Merged HEAD (5.1) to 5.1.N (5.1.1)

117531 bhorje: CM-690 virtualization is disabled by default - virtualization integration tests and the integration tests suite  run with vf enabled 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117577 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-11-14 13:38:20 +00:00
parent 1ec4f05efc
commit 9e202dcd66
8 changed files with 76 additions and 95 deletions

View File

@@ -42,8 +42,6 @@ import org.alfresco.util.ApplicationContextHelper;
import org.springframework.context.ApplicationContext;
/**
*
*
* @author Bogdan Horje
*/
public class VirtualizationIntegrationTestSuite extends TestSuite implements VirtualizationTest
@@ -52,32 +50,23 @@ public class VirtualizationIntegrationTestSuite extends TestSuite implements Vir
public static Test suite()
{
VirtualizationConfigTestBootstrap virtualizationConfigTestBootstrap = ctx
.getBean(VIRTUALIZATION_CONFIG_TEST_BOOTSTRAP_BEAN_ID,
VirtualizationConfigTestBootstrap.class);
TestSuite suite = new TestSuite();
suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.virtual.VirtualizationConfigurationTest.class));
if (virtualizationConfigTestBootstrap.areVirtualFoldersEnabled())
{
suite.addTest(new JUnit4TestAdapter(VirtualLockableAspectInterceptorExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualVersionServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualRatingServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualCheckOutCheckInServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualPermissionServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualNodeServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualFileFolderServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(ApplyTemplateMethodTest.class));
suite.addTest(new JUnit4TestAdapter(SystemTemplateLocationsConstraintTest.class));
suite.addTest(new JUnit4TestAdapter(SystemVirtualizationMethodTest.class));
suite.addTest(new JUnit4TestAdapter(TypeVirtualizationMethodTest.class));
suite.addTest(new JUnit4TestAdapter(TemplateResourceProcessorTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualStoreImplTest.class));
suite.addTest(new JUnit4TestAdapter(NodeRefPathExpressionTest.class));
suite.addTest(new JUnit4TestAdapter(TemplateFilingRuleTest.class));
}
suite.addTest(new JUnit4TestAdapter(VirtualLockableAspectInterceptorExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualVersionServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualRatingServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualCheckOutCheckInServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualPermissionServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualNodeServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualFileFolderServiceExtensionTest.class));
suite.addTest(new JUnit4TestAdapter(ApplyTemplateMethodTest.class));
suite.addTest(new JUnit4TestAdapter(SystemTemplateLocationsConstraintTest.class));
suite.addTest(new JUnit4TestAdapter(SystemVirtualizationMethodTest.class));
suite.addTest(new JUnit4TestAdapter(TypeVirtualizationMethodTest.class));
suite.addTest(new JUnit4TestAdapter(TemplateResourceProcessorTest.class));
suite.addTest(new JUnit4TestAdapter(VirtualStoreImplTest.class));
suite.addTest(new JUnit4TestAdapter(NodeRefPathExpressionTest.class));
suite.addTest(new JUnit4TestAdapter(TemplateFilingRuleTest.class));
return suite;