From 7e67a400242bf912455f4bd905baef66e7483340 Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Mon, 28 Nov 2016 16:53:58 +0000 Subject: [PATCH] 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 --- .../alfresco/repo/quickshare/QuickShareServiceImpl.java | 2 -- .../repo/quickshare/QuickShareServiceIntegrationTest.java | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java b/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java index 14ad841f06..7e3e324d6d 100644 --- a/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java +++ b/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java @@ -1217,8 +1217,6 @@ public class QuickShareServiceImpl implements QuickShareService, // first set the scheduledAction so we can set the other information expiryAction.setSchedule(schedule); expiryAction.setScheduleStart(expiryDate); - expiryAction.setScheduleIntervalCount(2); - expiryAction.setScheduleIntervalPeriod(IntervalPeriod.Minute); try { diff --git a/source/test-java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java b/source/test-java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java index 61463b0016..cf35990064 100644 --- a/source/test-java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java +++ b/source/test-java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java @@ -620,8 +620,8 @@ public class QuickShareServiceIntegrationTest QuickShareLinkExpiryAction expiryAction = getExpiryActionAndAttachSchedule(quickShareDTO.getId()); assertEquals(quickShareDTO.getId(), expiryAction.getSharedId()); assertEquals(quickShareDTO.getExpiresAt(), expiryAction.getScheduleStart()); - // assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount()); - //assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod()); + assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount()); + assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod()); // Try to share the already shared node with a different expiry date. // This basically will update the expiry action start time @@ -635,8 +635,8 @@ public class QuickShareServiceIntegrationTest expiryAction = getExpiryActionAndAttachSchedule(quickShareDTO.getId()); assertEquals(quickShareDTO.getId(), expiryAction.getSharedId()); assertEquals(quickShareDTO.getExpiresAt(), expiryAction.getScheduleStart()); - //assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount()); - // assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod()); + assertNull("We haven't set interval count.", expiryAction.getScheduleIntervalCount()); + assertNull("We haven't set interval period.", expiryAction.getScheduleIntervalPeriod()); // Delete the expiry action deleteExpiryAction(expiryAction);