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

58467: Categorized some spring tests so they run in the same vm successfully


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:35:21 +00:00
parent 954920bf7d
commit 03b22967cc
46 changed files with 127 additions and 79 deletions

View File

@@ -51,6 +51,7 @@ import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.test_category.BaseSpringTestsCategory;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.GUID;
import org.junit.experimental.categories.Category;
@@ -61,7 +62,7 @@ import org.junit.experimental.categories.Category;
*
* @author Roy Wetherall
*/
@Category(OwnJVMTestsCategory.class)
@Category(BaseSpringTestsCategory.class)
public class RuleServiceImplTest extends BaseRuleTest
{
private String ASSOC_NAME_RULES_PREFIX = "rules";