inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Alan Davis
2015-02-12 09:59:36 +00:00
parent 65514834c1
commit 05ad9c59e4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/test-java/org/alfresco/repo/web/scripts/publishing/PublishingRestApiTest.java
View File

@@ -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<Status> expectedPubEventStatuses = Arrays.asList(Status.SCHEDULED, Status.IN_PROGRESS, Status.COMPLETED);
assertTrue(expectedPubEventStatuses.contains(event.getStatus()));
// Check Package
PublishingPackage pckg = event.getPackage();