From e26e7a70eb521ddd4fd8a9a5180e2aa858ee1340 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 00:28:17 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 58887: BDE-195 Bring publishing tests back into their own JVM, hoping they are doing the mess with the Maven tests git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62055 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/publishing/ChannelServiceImplIntegratedTest.java | 2 +- .../org/alfresco/repo/publishing/PublishingQueueImplTest.java | 2 +- .../org/alfresco/repo/publishing/PublishingRootObjectTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/test-java/org/alfresco/repo/publishing/ChannelServiceImplIntegratedTest.java b/source/test-java/org/alfresco/repo/publishing/ChannelServiceImplIntegratedTest.java index 483dac2590..c236308223 100644 --- a/source/test-java/org/alfresco/repo/publishing/ChannelServiceImplIntegratedTest.java +++ b/source/test-java/org/alfresco/repo/publishing/ChannelServiceImplIntegratedTest.java @@ -50,7 +50,7 @@ import org.junit.experimental.categories.Category; * @author Nick Smith * @since 4.0 */ -@Category(BaseSpringTestsCategory.class) +@Category(OwnJVMTestsCategory.class) public class ChannelServiceImplIntegratedTest extends AbstractPublishingIntegrationTest { private static final String channelName = GUID.generate(); diff --git a/source/test-java/org/alfresco/repo/publishing/PublishingQueueImplTest.java b/source/test-java/org/alfresco/repo/publishing/PublishingQueueImplTest.java index e7dcb03670..951dcd0e78 100644 --- a/source/test-java/org/alfresco/repo/publishing/PublishingQueueImplTest.java +++ b/source/test-java/org/alfresco/repo/publishing/PublishingQueueImplTest.java @@ -58,7 +58,7 @@ import org.junit.experimental.categories.Category; * @author Nick Smith * @since 4.0 */ -@Category(BaseSpringTestsCategory.class) +@Category(OwnJVMTestsCategory.class) public class PublishingQueueImplTest extends AbstractPublishingIntegrationTest { private static final String channelId = "test://channel/node"; diff --git a/source/test-java/org/alfresco/repo/publishing/PublishingRootObjectTest.java b/source/test-java/org/alfresco/repo/publishing/PublishingRootObjectTest.java index 857d461636..eb39b45c8e 100644 --- a/source/test-java/org/alfresco/repo/publishing/PublishingRootObjectTest.java +++ b/source/test-java/org/alfresco/repo/publishing/PublishingRootObjectTest.java @@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category; * @author Nick Smith * @since 4.0 */ -@Category(BaseSpringTestsCategory.class) +@Category(OwnJVMTestsCategory.class) public class PublishingRootObjectTest extends AbstractPublishingIntegrationTest { @Resource(name="publishingRootObject")