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 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
124521 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124493 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124467 amorarasu:       Reverse merged 5.0.N (5.0.4)
                  124430 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
                     124322 adragoi: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
                        124254 amorarasu: MNT-15848: The PublishingRestApiTest.testPublishingQueuePost intermittently fails on SQL Server
                           - scheduled post publishing after 1500 milliseconds, to have time to test the SCHEDULED status.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127762 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:04:20 +00:00
parent 905856dd2d
commit 743f5426d1
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2016 Alfresco Software Limited.
* Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -612,20 +612,6 @@ public class PublishingRestApiTest extends BaseWebScriptTest
{
json.put(UNPUBLISH_NODES, publishNodes);
}
//schedule in the next second and 1/2
Calendar schedule = Calendar.getInstance();
schedule.add(Calendar.MILLISECOND, 1500);
Date scheduledTime = schedule.getTime();
String scheduledTimeZone = schedule.getTimeZone().getID();
JSONObject scheduleJson = new JSONObject();
scheduleJson.put(WebScriptUtil.DATE_TIME, ISO8601DateFormat.format(scheduledTime));
scheduleJson.put(WebScriptUtil.FORMAT, WebScriptUtil.ISO8601);
scheduleJson.put(WebScriptUtil.TIME_ZONE, scheduledTimeZone);
json.put(SCHEDULED_TIME, scheduleJson);
if (statusMessage != null)
{
json.put(STATUS_UPDATE, buildStatusUpdate(statusMessage, node, statusChannels));