From 05ad9c59e443353fc7078936c305f961c33ed801 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 12 Feb 2015 09:59:36 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 96863: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 96770: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2) 96760: Merged DEV to 5.0.1 (5.0.1) 96635: MNT-13310 : Failing test: PublishingRestApiTest testPublishingQueuePost - IN_PROGRESS and COMPLETED statuses are added to expected list to take into account slow environments git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/publishing/PublishingRestApiTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/test-java/org/alfresco/repo/web/scripts/publishing/PublishingRestApiTest.java b/source/test-java/org/alfresco/repo/web/scripts/publishing/PublishingRestApiTest.java index 9640c213b9..66248d9041 100644 --- a/source/test-java/org/alfresco/repo/web/scripts/publishing/PublishingRestApiTest.java +++ b/source/test-java/org/alfresco/repo/web/scripts/publishing/PublishingRestApiTest.java @@ -61,6 +61,7 @@ import static org.mockito.Mockito.when; import java.io.File; import java.io.UnsupportedEncodingException; import java.text.MessageFormat; +import java.util.Arrays; import java.util.Calendar; import java.util.Collection; import java.util.Collections; @@ -310,7 +311,8 @@ public class PublishingRestApiTest extends BaseWebScriptTest PublishingEvent event = publishedEvents.get(0); assertEquals(publishChannel.getId(), event.getChannelId()); assertEquals(comment, event.getComment()); - assertEquals(Status.SCHEDULED, event.getStatus()); + Collection expectedPubEventStatuses = Arrays.asList(Status.SCHEDULED, Status.IN_PROGRESS, Status.COMPLETED); + assertTrue(expectedPubEventStatuses.contains(event.getStatus())); // Check Package PublishingPackage pckg = event.getPackage();