From f5f40192faac30fd8b17d8117db7f1d8b609e87f Mon Sep 17 00:00:00 2001 From: Tatyana Valkevych Date: Wed, 8 Apr 2015 16:26:06 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 101335: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1) 100788: Fix LinksRestApiTest so that it is comapring two time-zone independent Date objects instead of strings with (potentially) different timezones. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/web/scripts/links/LinksRestApiTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/test-java/org/alfresco/repo/web/scripts/links/LinksRestApiTest.java b/source/test-java/org/alfresco/repo/web/scripts/links/LinksRestApiTest.java index a7c00ae690..8143d6e0c5 100644 --- a/source/test-java/org/alfresco/repo/web/scripts/links/LinksRestApiTest.java +++ b/source/test-java/org/alfresco/repo/web/scripts/links/LinksRestApiTest.java @@ -454,10 +454,10 @@ public class LinksRestApiTest extends BaseWebScriptTest "/node/workspace/" + nodeRef.getStoreRef().getIdentifier() + "/" + nodeRef.getId() + "/comments", link.getString("commentsUrl")); - // Check the created date + // Check the created date: compare two java.util.Date objects. assertEquals( - org.springframework.extensions.surf.util.ISO8601DateFormat.format((Date)nodeService.getProperty(nodeRef, ContentModel.PROP_CREATED)), - link.getJSONObject("createdOnDate").getString("iso8601")); + nodeService.getProperty(nodeRef, ContentModel.PROP_CREATED), + ISO8601DateFormat.parse(link.getJSONObject("createdOnDate").getString("iso8601"))); // Edit // We should get a simple message @@ -760,4 +760,4 @@ public class LinksRestApiTest extends BaseWebScriptTest assertTrue("The user sould have permission to create a new link.", Boolean.parseBoolean(result.getJSONObject("metadata").getJSONObject("linkPermissions").getString("create"))); } -} \ No newline at end of file +}