Author: dkuleshov Date: 2011-03-02 05:24:00 -0500 (Wed, 02 Mar 2011) New Revision: 4042 Modified: jcr/branches/1.12.x/patch/1.12.8-GA/JCR-1593/JCR-1593.patch Log: JCR-1593: patched test fixed Modified: jcr/branches/1.12.x/patch/1.12.8-GA/JCR-1593/JCR-1593.patch =================================================================== --- jcr/branches/1.12.x/patch/1.12.8-GA/JCR-1593/JCR-1593.patch 2011-03-02 10:18:05 UTC (rev 4041) +++ jcr/branches/1.12.x/patch/1.12.8-GA/JCR-1593/JCR-1593.patch 2011-03-02 10:24:00 UTC (rev 4042) @@ -22,17 +22,19 @@ assertEquals(HTTPStatus.CREATED, response.getStatus()); assertTrue(session.getRootNode().hasNode(TextUtil.relativizePath(destFilename))); Node nodeDest = session.getRootNode().getNode(TextUtil.relativizePath(destFilename)); -@@ -71,8 +73,8 @@ +@@ -71,9 +73,9 @@ TestUtils.addContent(session, filename, inputStream, defaultFileNodeType, ""); String destFilename = TestUtils.getFileName(); MultivaluedMap<String, String> headers = new MultivaluedMapImpl(); - headers.add(ExtHttpHeaders.DESTINATION, getPathDestWS() + destFilename); - ContainerResponse response = service(WebDAVMethods.MOVE, getPathWS() + filename, "", headers, null); +- assertEquals(HTTPStatus.NO_CONTENT, response.getStatus()); + headers.add(ExtHttpHeaders.DESTINATION, host + getPathDestWS() + destFilename); + ContainerResponse response = service(WebDAVMethods.MOVE, getPathWS() + filename, host, headers, null); - assertEquals(HTTPStatus.NO_CONTENT, response.getStatus()); ++ assertEquals(HTTPStatus.CREATED, response.getStatus()); assertTrue(destSession.getRootNode().hasNode(TextUtil.relativizePath(destFilename))); Node nodeDest = destSession.getRootNode().getNode(TextUtil.relativizePath(destFilename)); + assertTrue(nodeDest.hasNode("jcr:content")); @@ -85,6 +87,101 @@ assertFalse(session.getRootNode().hasNode(TextUtil.relativizePath(filename))); }