From cbad8bc7898f818ba30a46b0fd19767d0b988659 Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Mon, 28 Mar 2016 08:00:08 +0000 Subject: [PATCH] Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 124488 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 124430 aleahu: 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/BRANCHES/DEV/5.2.N/root@124516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../publishing/PublishingRestApiTest.java | 16 +++++++++++++++- 1 file changed, 15 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 66248d9041..37b7482ac2 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005-2016 Alfresco Software Limited. * * This file is part of Alfresco * @@ -612,6 +612,20 @@ 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));