Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

58520: Upped the memory for the sameVM tests and categorised the AVM tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:46:49 +00:00
parent 6aac29b931
commit c0de7292bc
32 changed files with 120 additions and 2 deletions

View File

@@ -50,9 +50,11 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.test_category.LegacyCategory;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.wcm.sandbox.SandboxConstants;
import org.alfresco.wcm.util.WCMUtil;
import org.junit.experimental.categories.Category;
import org.springframework.context.ApplicationContext;
/**
@@ -60,6 +62,7 @@ import org.springframework.context.ApplicationContext;
*
* @author Derek Hulley, janv
*/
@Category(LegacyCategory.class)
public class AVMLockingServiceTest extends TestCase
{
private static String[] TESTUSERS = {"Buffy", "Willow", "Xander", "Tara", "Spike"};