mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
133087 jkaabimofrad: APPSREPO-61: Minor clean up (removed the schedule interval, left from testing different scenarios) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1217,8 +1217,6 @@ public class QuickShareServiceImpl implements QuickShareService,
|
|||||||
// first set the scheduledAction so we can set the other information
|
// first set the scheduledAction so we can set the other information
|
||||||
expiryAction.setSchedule(schedule);
|
expiryAction.setSchedule(schedule);
|
||||||
expiryAction.setScheduleStart(expiryDate);
|
expiryAction.setScheduleStart(expiryDate);
|
||||||
expiryAction.setScheduleIntervalCount(2);
|
|
||||||
expiryAction.setScheduleIntervalPeriod(IntervalPeriod.Minute);
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@@ -620,8 +620,8 @@ public class QuickShareServiceIntegrationTest
|
|||||||
QuickShareLinkExpiryAction expiryAction = getExpiryActionAndAttachSchedule(quickShareDTO.getId());
|
QuickShareLinkExpiryAction expiryAction = getExpiryActionAndAttachSchedule(quickShareDTO.getId());
|
||||||
assertEquals(quickShareDTO.getId(), expiryAction.getSharedId());
|
assertEquals(quickShareDTO.getId(), expiryAction.getSharedId());
|
||||||
assertEquals(quickShareDTO.getExpiresAt(), expiryAction.getScheduleStart());
|
assertEquals(quickShareDTO.getExpiresAt(), expiryAction.getScheduleStart());
|
||||||
// assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount());
|
assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount());
|
||||||
//assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod());
|
assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod());
|
||||||
|
|
||||||
// Try to share the already shared node with a different expiry date.
|
// Try to share the already shared node with a different expiry date.
|
||||||
// This basically will update the expiry action start time
|
// This basically will update the expiry action start time
|
||||||
@@ -635,8 +635,8 @@ public class QuickShareServiceIntegrationTest
|
|||||||
expiryAction = getExpiryActionAndAttachSchedule(quickShareDTO.getId());
|
expiryAction = getExpiryActionAndAttachSchedule(quickShareDTO.getId());
|
||||||
assertEquals(quickShareDTO.getId(), expiryAction.getSharedId());
|
assertEquals(quickShareDTO.getId(), expiryAction.getSharedId());
|
||||||
assertEquals(quickShareDTO.getExpiresAt(), expiryAction.getScheduleStart());
|
assertEquals(quickShareDTO.getExpiresAt(), expiryAction.getScheduleStart());
|
||||||
//assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount());
|
assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount());
|
||||||
// assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod());
|
assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod());
|
||||||
|
|
||||||
// Delete the expiry action
|
// Delete the expiry action
|
||||||
deleteExpiryAction(expiryAction);
|
deleteExpiryAction(expiryAction);
|
||||||
|
Reference in New Issue
Block a user