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

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

Browse Source 
98074: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97985: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97827: Merged DEV to V4.2-BUG-FIX
          97818: MNT-13183 : Folder accessed through WebDAV is empty when a document is locked through CIFS access
           Corrected junit tests. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-02-26 07:47:08 +00:00
parent 7802d4d1dc
commit 7aacfc700c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/test-java/org/alfresco/repo/webdav/LockInfoImplTest.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2012 Alfresco Software Limited. * Copyright (C) 2005-2015 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -142,6 +142,8 @@ public class LockInfoImplTest
String json = lockInfo.toJSON(); String json = lockInfo.toJSON();
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
assertTrue("ADDINFO_WEBDAV_MARKER", json.startsWith(LockInfoImpl.ADDINFO_WEBDAV_MARKER));
json = json.substring(LockInfoImpl.ADDINFO_WEBDAV_MARKER.length() + 1);
LockInfoImpl parsed = objectMapper.readValue(json, LockInfoImpl.class); LockInfoImpl parsed = objectMapper.readValue(json, LockInfoImpl.class);
assertEquals("opaque-lock-token", parsed.getExclusiveLockToken()); assertEquals("opaque-lock-token", parsed.getExclusiveLockToken());
assertEquals(WebDAV.INFINITY, parsed.getDepth()); assertEquals(WebDAV.INFINITY, parsed.getDepth());
@@ -156,6 +158,8 @@ public class LockInfoImplTest
lockInfo.setScope(WebDAV.XML_SHARED); lockInfo.setScope(WebDAV.XML_SHARED);
json = lockInfo.toJSON(); json = lockInfo.toJSON();
assertTrue("ADDINFO_WEBDAV_MARKER", json.startsWith(LockInfoImpl.ADDINFO_WEBDAV_MARKER));
json = json.substring(LockInfoImpl.ADDINFO_WEBDAV_MARKER.length() + 1);
parsed = objectMapper.readValue(json, LockInfoImpl.class); parsed = objectMapper.readValue(json, LockInfoImpl.class);
Set<String> sortedTokens = new TreeSet<String>(parsed.getSharedLockTokens()); Set<String> sortedTokens = new TreeSet<String>(parsed.getSharedLockTokens());
Iterator<String> tokenIt = sortedTokens.iterator(); Iterator<String> tokenIt = sortedTokens.iterator();
@@ -175,8 +179,7 @@ public class LockInfoImplTest
lockInfo.setDepth(WebDAV.INFINITY); lockInfo.setDepth(WebDAV.INFINITY);
lockInfo.setScope(WebDAV.XML_EXCLUSIVE); lockInfo.setScope(WebDAV.XML_EXCLUSIVE);
ObjectMapper objectMapper = new ObjectMapper(); String json = lockInfo.toJSON();
String json = objectMapper.writeValueAsString(lockInfo);
// Execute the factory method we're testing // Execute the factory method we're testing
LockInfo parsed = LockInfoImpl.fromJSON(json); LockInfo parsed = LockInfoImpl.fromJSON(json);
assertEquals("opaque-lock-token", parsed.getExclusiveLockToken()); assertEquals("opaque-lock-token", parsed.getExclusiveLockToken());
@@ -191,7 +194,7 @@ public class LockInfoImplTest
lockInfo.setDepth(WebDAV.ZERO); lockInfo.setDepth(WebDAV.ZERO);
lockInfo.setScope(WebDAV.XML_SHARED); lockInfo.setScope(WebDAV.XML_SHARED);
json = objectMapper.writeValueAsString(lockInfo); json = lockInfo.toJSON();
// Execute the factory method we're testing // Execute the factory method we're testing
parsed = LockInfoImpl.fromJSON(json); parsed = LockInfoImpl.fromJSON(json);
Set<String> sortedTokens = new TreeSet<String>(parsed.getSharedLockTokens()); Set<String> sortedTokens = new TreeSet<String>(parsed.getSharedLockTokens());