From d65016321bb6fb280704c23dbfe38411f184c4d6 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 31 Mar 2015 23:22:08 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 100869: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 100839: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2) 100838: Merged DEV to V4.2-BUG-FIX (4.2.5) 100835: MNT-13752: LinksRestApiTest fails during Summer - Fix for the build failure. Use the same ISO8601DateFormat to compare values. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/web/scripts/links/LinksRestApiTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 82536d9505..a7c00ae690 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 @@ -456,7 +456,7 @@ public class LinksRestApiTest extends BaseWebScriptTest // Check the created date assertEquals( - ISO8601DateFormat.format((Date)nodeService.getProperty(nodeRef, ContentModel.PROP_CREATED)), + org.springframework.extensions.surf.util.ISO8601DateFormat.format((Date)nodeService.getProperty(nodeRef, ContentModel.PROP_CREATED)), link.getJSONObject("createdOnDate").getString("iso8601")); // Edit