Fix the AVM test suite so that all AVM tests can be run from it, and enable that instead of individual tests in build.xml

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2010-03-09 19:06:08 +00:00
parent ad5e708830
commit 47837f9286
2 changed files with 18 additions and 4 deletions

View File

@@ -63,19 +63,19 @@ public class AVMServiceLocalTest extends TestCase
/** /**
* The AVMRemote - can be local (AVMRemoteLocal) or remote (AVMRemote) * The AVMRemote - can be local (AVMRemoteLocal) or remote (AVMRemote)
*/ */
protected static AVMRemote fService; protected AVMRemote fService;
/** /**
* The AVMSyncService - can be local (AVMSyncService) or remote (AVMSyncServiceRemote) * The AVMSyncService - can be local (AVMSyncService) or remote (AVMSyncServiceRemote)
*/ */
protected static AVMSyncService fSyncService; protected AVMSyncService fSyncService;
/** /**
* The application context. * The application context.
*/ */
protected static ApplicationContext fContext; protected ApplicationContext fContext;
protected static NameMatcher excluder; protected NameMatcher excluder;
protected void setUp() throws Exception protected void setUp() throws Exception

View File

@@ -22,6 +22,8 @@ import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.alfresco.repo.avm.locking.AVMLockingServiceTest; import org.alfresco.repo.avm.locking.AVMLockingServiceTest;
import org.alfresco.repo.avm.util.VersionPathTest;
import org.alfresco.util.ApplicationContextHelper;
/** /**
* AVM test suite * AVM test suite
@@ -37,6 +39,11 @@ public class AVMTestSuite extends TestSuite
{ {
TestSuite suite = new TestSuite(); TestSuite suite = new TestSuite();
// Ensure that the default context is available
ApplicationContextHelper.getApplicationContext();
// Add the tests to be run
suite.addTestSuite(AVMNodeConverterTest.class); suite.addTestSuite(AVMNodeConverterTest.class);
suite.addTestSuite(AVMExpiredContentTest.class); suite.addTestSuite(AVMExpiredContentTest.class);
suite.addTestSuite(AVMDeploymentAttemptCleanerTest.class); suite.addTestSuite(AVMDeploymentAttemptCleanerTest.class);
@@ -59,6 +66,13 @@ public class AVMTestSuite extends TestSuite
suite.addTestSuite(AVMDiffPerformanceTest.class); suite.addTestSuite(AVMDiffPerformanceTest.class);
suite.addTestSuite(AVMChildNamePatternMatchPerformanceTest.class); suite.addTestSuite(AVMChildNamePatternMatchPerformanceTest.class);
suite.addTestSuite(VersionPathTest.class);
suite.addTestSuite(WCMInheritPermissionsTest.class);
// This should go last, as its uses a different
// context to the other tests
suite.addTestSuite(AVMServiceRemoteSystemTest.class);
return suite; return suite;
} }
} }