From 2837b567a9105cb3aa5af3f85a3546d5939919c1 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 10 Jul 2013 08:34:53 +0000 Subject: [PATCH] Merged HEAD-QA (4.2) to HEAD (4.2) 52339: Started diagnostic playing with ALF-19225: Intermittent test failures in SubscriptionServiceActivitiesTest - Use unique user names ... there are enough "bob" users doing things in tests already git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../subscriptions/SubscriptionServiceActivitiesTest.java | 5 +++-- .../repo/subscriptions/SubscriptionServiceImplTest.java | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java b/source/java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java index c3e1509044..af962e8c65 100644 --- a/source/java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java +++ b/source/java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java @@ -48,6 +48,7 @@ import org.alfresco.service.cmr.subscriptions.SubscriptionService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.util.ApplicationContextHelper; +import org.alfresco.util.GUID; import org.alfresco.util.PropertyMap; import org.quartz.Scheduler; import org.springframework.context.ApplicationContext; @@ -182,8 +183,8 @@ public class SubscriptionServiceActivitiesTest extends TestCase public void testFollowingActivity() throws Exception { - final String userId1 = "bob"; - final String userId2 = "tom"; + final String userId1 = "bob" + GUID.generate(); + final String userId2 = "tom" + GUID.generate(); AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() { diff --git a/source/java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java b/source/java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java index 53234765ac..ccafa28ca8 100644 --- a/source/java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java +++ b/source/java/org/alfresco/repo/subscriptions/SubscriptionServiceImplTest.java @@ -41,6 +41,7 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; +import org.alfresco.util.GUID; import org.alfresco.util.PropertyMap; import org.springframework.context.ApplicationContext; @@ -48,9 +49,9 @@ public class SubscriptionServiceImplTest extends TestCase { public static final String[] CONTEXTS = new String[] { "classpath:alfresco/application-context.xml", "classpath:test/alfresco/test-subscriptions-context.xml" }; - public static final String USER_BOB = "bob"; - public static final String USER_TOM = "tom"; - public static final String USER_LISA = "lisa"; + public static final String USER_BOB = "bob" + GUID.generate(); + public static final String USER_TOM = "tom" + GUID.generate(); + public static final String USER_LISA = "lisa" + GUID.generate(); public static final String FOLLOWED_NODE_NAME = "Followed.txt";