From eff61b28231466874572dc55a019c808e187b6e3 Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Wed, 11 May 2016 11:14:42 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 126418 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 121794 gcornwell: Minor fix to a couple of tests found during verification. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java index 80d1d143db..7bb7118010 100644 --- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java @@ -1650,7 +1650,7 @@ public class NodeApiTest extends AbstractBaseApiTest docResp = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class); assertEquals(docName, docResp.getName()); assertNotNull(docResp.getContent()); - assertNotNull("ISO-8859-1", docResp.getContent()); + assertEquals("ISO-8859-1", docResp.getContent().getEncoding()); assertTrue(docResp.getContent().getSizeInBytes().intValue() > 0); assertEquals(MimetypeMap.MIMETYPE_PDF, docResp.getContent().getMimeType()); PathInfo pathInfo = docResp.getPath(); @@ -1668,7 +1668,7 @@ public class NodeApiTest extends AbstractBaseApiTest docResp = jacksonUtil.parseEntry(response.getJsonResponse(), Document.class); assertEquals(docName, docResp.getName()); assertNotNull(docResp.getContent()); - assertNotNull("ISO-8859-15", docResp.getContent()); + assertEquals("ISO-8859-15", docResp.getContent().getEncoding()); assertTrue(docResp.getContent().getSizeInBytes().intValue() > 0); assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, docResp.getContent().getMimeType());