From 22bc716fccd736943e687f585c9e931efce98ddf Mon Sep 17 00:00:00 2001 From: David Caruana Date: Thu, 4 Sep 2008 11:29:25 +0000 Subject: [PATCH] Merge from SEAMIST3 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/BaseWebScriptTest.java | 14 +++++++++++++- .../scripts/preference/PreferenceServiceTest.java | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java b/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java index b0c938e0fb..bbd050cc91 100644 --- a/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java +++ b/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java @@ -443,6 +443,18 @@ public abstract class BaseWebScriptTest extends TestCase return getHeader("Content-Type"); } + public int getContentLength() + { + try + { + return method.getResponseBody().length; + } + catch (IOException e) + { + return 0; + } + } + public String getHeader(String name) { Header header = method.getResponseHeader(name); @@ -453,7 +465,7 @@ public abstract class BaseWebScriptTest extends TestCase { return method.getStatusCode(); } - + } } diff --git a/source/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java b/source/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java index 503aa784e3..18e771920d 100644 --- a/source/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java +++ b/source/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java @@ -110,7 +110,7 @@ public class PreferenceServiceTest extends BaseWebScriptTest jsonObject.put("comp1", getPreferenceObj()); resp = sendRequest(new PostRequest(URL, jsonObject.toString(), "application/json"), 200); - assertEquals(0, resp.getContentAsByteArray().length); + assertEquals(0, resp.getContentLength()); // Get the preferences @@ -128,7 +128,7 @@ public class PreferenceServiceTest extends BaseWebScriptTest jsonObject.put("comp2", getPreferenceObj()); resp = sendRequest(new PostRequest(URL, jsonObject.toString(), "application/json"), 200); - assertEquals(0, resp.getContentAsByteArray().length); + assertEquals(0, resp.getContentLength()); // Get the preferences