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

@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.publishing.channels.ChannelType;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.QName;
import org.alfresco.test_category.BaseSpringTestsCategory;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.GUID;
import org.junit.Before;
@@ -49,7 +50,7 @@ import org.junit.experimental.categories.Category;
* @author Nick Smith
* @since 4.0
*/
@Category(OwnJVMTestsCategory.class)
@Category(BaseSpringTestsCategory.class)
public class ChannelServiceImplIntegratedTest extends AbstractPublishingIntegrationTest
{
private static final String channelName = GUID.generate();