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 
105374: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105132: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         104888: Merged DEV to V4.2-BUG-FIX (4.2.5)
            104492: MNT-10962: Versioning for cmis:document not working initially
               - Use default values in the content model for autoVersion.
               - Test to ensure that version properties for node created via CMIS are set wrt contentModel.
               - TCK is now run with autoVersion=false.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-06-03 09:00:06 +00:00
parent e20f71ed3e
commit b98c2dc6b0
6 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/test-java/org/alfresco/rest/api/tests/TestCMIS.java
View File

@@ -570,7 +570,7 @@ public class TestCMIS extends EnterpriseTestApi
return autoVersion;
}
}, personId, network1.getId());
assertEquals(Boolean.FALSE, autoVersion);
assertEquals(Boolean.TRUE, autoVersion);
}
// https://issues.alfresco.com/jira/browse/PUBLICAPI-92
@@ -1462,9 +1462,10 @@ public class TestCMIS extends EnterpriseTestApi
properties.put(PropertyIds.DESCRIPTION, GUID.generate());
}
AlfrescoDocument doc1 = (AlfrescoDocument)doc.updateProperties(properties);
doc1 = (AlfrescoDocument)doc1.getObjectOfLatestVersion(false);
String versionLabel1 = doc1.getVersionLabel();
assertEquals(versionLabel, versionLabel1);
assertTrue(Float.parseFloat(versionLabel) < Float.parseFloat(versionLabel1));
// ...and check that updating its content creates a new version
fileContent = new ContentStreamImpl();
@@ -1481,7 +1482,7 @@ public class TestCMIS extends EnterpriseTestApi
@SuppressWarnings("unused")
String versionLabel2 = doc2.getVersionLabel();
assertEquals("Set content stream shouldn't create a new version automatically", versionLabel1, versionLabel2);
assertTrue("Set content stream should create a new version automatically", Float.parseFloat(versionLabel1) < Float.parseFloat(versionLabel2));
}
/**