Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

60009: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59939: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         59871: MNT-10037 : WebDAV PutMethod needs better test coverage
         Corrected the fix to correspond to WebDAV spec.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 09:53:19 +00:00
parent 3deba7f983
commit 0bf76c704d

View File

@@ -307,7 +307,7 @@ public class PutMethodTest
catch (WebDAVServerException wse) catch (WebDAVServerException wse)
{ {
// The execution failed and it is expected // The execution failed and it is expected
assertTrue(wse.getHttpStatusCode() == HttpServletResponse.SC_BAD_REQUEST); assertTrue(wse.getHttpStatusCode() == HttpServletResponse.SC_CONFLICT);
} }
catch (Exception e) catch (Exception e)
{ {