From 0bf76c704d0749b264c45fd1b6c89786c2f52229 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 12 Feb 2014 09:53:19 +0000
Subject: [PATCH] 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
---
 source/test-java/org/alfresco/repo/webdav/PutMethodTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/test-java/org/alfresco/repo/webdav/PutMethodTest.java b/source/test-java/org/alfresco/repo/webdav/PutMethodTest.java
index c63f03fad3..3cd58f21ea 100644
--- a/source/test-java/org/alfresco/repo/webdav/PutMethodTest.java
+++ b/source/test-java/org/alfresco/repo/webdav/PutMethodTest.java
@@ -307,7 +307,7 @@ public class PutMethodTest
         catch (WebDAVServerException wse)
         {
             // The execution failed and it is expected
-            assertTrue(wse.getHttpStatusCode() == HttpServletResponse.SC_BAD_REQUEST);
+            assertTrue(wse.getHttpStatusCode() == HttpServletResponse.SC_CONFLICT);
         }
         catch (Exception e)
         {