inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from SEAMIST3

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 11:22:17 +00:00
parent 57c7de2df6
commit d2619d5ea9
208 changed files with 11651 additions and 7705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java
View File

@@ -138,12 +138,8 @@ public abstract class BaseWebScriptTest extends TestCase
protected Response sendRequest(Request req, int expectedStatus, String asUser)
throws IOException
{
if (logger.isDebugEnabled())
{
logger.debug("Request");
logger.debug(req.getMethod() + " " + req.getFullUri());
logger.debug(req.getBody() == null ? null : new String(req.getBody()));
}
if (logger.isInfoEnabled())
logger.info("Request: " + req.getMethod() + " " + req.getFullUri() + (req.getBody() == null ? "" : "\n" + new String(req.getBody())));
Response res = null;
if (remoteServer == null)
@@ -155,11 +151,8 @@ public abstract class BaseWebScriptTest extends TestCase
res = sendRemoteRequest(req, expectedStatus);
}
if (logger.isDebugEnabled())
{
logger.debug("Response:");
logger.debug(res.getContentAsString());
}
if (logger.isInfoEnabled())
logger.info("Response: " + res.getStatus() + " " + req.getMethod() + " " + req.getFullUri() + "\n" + res.getContentAsString());
if (expectedStatus > 0 && expectedStatus != res.getStatus())
{
@@ -167,7 +160,7 @@ public abstract class BaseWebScriptTest extends TestCase
// {
// System.out.println(res.getContentAsString());
// }
fail("Status code " + res.getStatus() + " returned, but expected " + expectedStatus + " for " + req.getFullUri() + " (" + req.getMethod() + ")");
fail("Status code " + res.getStatus() + " returned, but expected " + expectedStatus + " for " + req.getFullUri() + " (" + req.getMethod() + ")\n" + res.getContentAsString());
}
return res;