mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged 5.2.N (5.2.1) to HEAD (5.2)
129135 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
128208 jvonka: V1 REST API: Node Version History - test update
- test to show that optionally can create new file as a minor version (0.1)
REPO-156, REPO-159
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
@@ -258,7 +258,6 @@ public interface Nodes
|
||||
String OP_UPDATE = "update";
|
||||
|
||||
String PARAM_RELATIVE_PATH = "relativePath";
|
||||
String PARAM_AUTO_RENAME = "autoRename";
|
||||
String PARAM_PERMANENT = "permanent";
|
||||
|
||||
String PARAM_INCLUDE_PROPERTIES = "properties";
|
||||
@@ -286,6 +285,9 @@ public interface Nodes
|
||||
String PARAM_VERSION_MAJOR = "majorVersion"; // true if major, false if minor
|
||||
String PARAM_VERSION_COMMENT = "comment";
|
||||
|
||||
String PARAM_OVERWRITE = "overwrite";
|
||||
String PARAM_AUTO_RENAME = "autoRename";
|
||||
|
||||
String PARAM_ISPRIMARY = "isPrimary";
|
||||
String PARAM_ASSOC_TYPE = "assocType";
|
||||
}
|
||||
|
||||
@@ -143,119 +143,59 @@ public class NodeVersionsApiTest extends AbstractBaseApiTest
|
||||
@Test
|
||||
public void testUploadFileVersionCreateWithOverwrite() throws Exception
|
||||
{
|
||||
String myNodeId = getMyNodeId(user1);
|
||||
String myFolderNodeId = getMyNodeId(user1);
|
||||
|
||||
int cnt = 1;
|
||||
// create folder
|
||||
String f1Id = createFolder(user1, myFolderNodeId, "f1").getId();
|
||||
|
||||
int majorVersion = 1;
|
||||
int minorVersion = 0;
|
||||
try
|
||||
{
|
||||
int verCnt = 1;
|
||||
|
||||
// Upload text file - versioning is currently auto enabled on upload (create file via multi-part/form-data)
|
||||
String versionLabel = "1.0";
|
||||
|
||||
String contentName = "content " + System.currentTimeMillis();
|
||||
String content = "The quick brown fox jumps over the lazy dog "+cnt;
|
||||
// upload text file - versioning is currently auto enabled on upload (create file via multi-part/form-data)
|
||||
|
||||
Document documentResp = createTextFile(user1, myNodeId, contentName, content, "UTF-8", null);
|
||||
String textContentSuffix = "The quick brown fox jumps over the lazy dog ";
|
||||
String contentName = "content-1-" + System.currentTimeMillis();
|
||||
String content = textContentSuffix + verCnt;
|
||||
|
||||
Document documentResp = createTextFile(user1, f1Id, contentName, content, "UTF-8", null);
|
||||
String docId = documentResp.getId();
|
||||
assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
|
||||
assertNotNull(documentResp.getProperties());
|
||||
assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
|
||||
assertEquals(versionLabel, documentResp.getProperties().get("cm:versionLabel"));
|
||||
|
||||
Map<String, String> params = null;
|
||||
|
||||
// Upload text file with same name - with overwrite=true
|
||||
for (int i = 1; i <= 3; i++)
|
||||
// create some minor versions (note: majorVersion=null)
|
||||
int cnt = 3;
|
||||
versionLabel = uploadTextFileVersions(user1, f1Id, contentName, cnt, textContentSuffix, verCnt, null, versionLabel);
|
||||
verCnt = verCnt+cnt;
|
||||
|
||||
// create some major versions
|
||||
cnt = 2;
|
||||
versionLabel = uploadTextFileVersions(user1, f1Id, contentName, cnt, textContentSuffix, verCnt, true, versionLabel);
|
||||
verCnt = verCnt+cnt;
|
||||
|
||||
// create some more minor versions
|
||||
cnt = 3;
|
||||
versionLabel = uploadTextFileVersions(user1, f1Id, contentName, cnt, textContentSuffix, verCnt, false, versionLabel);
|
||||
verCnt = verCnt+cnt;
|
||||
|
||||
assertEquals("3.3", versionLabel);
|
||||
assertEquals(9, verCnt);
|
||||
|
||||
{
|
||||
cnt++;
|
||||
minorVersion++;
|
||||
|
||||
content = "The quick brown fox jumps over the lazy dog " + cnt;
|
||||
|
||||
params = new HashMap<>();
|
||||
params.put("overwrite", "true");
|
||||
|
||||
documentResp = createTextFile(user1, myNodeId, contentName, content, "UTF-8", params);
|
||||
assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
|
||||
assertNotNull(documentResp.getProperties());
|
||||
assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
|
||||
}
|
||||
|
||||
minorVersion = 0;
|
||||
|
||||
// Updates - major versions
|
||||
for (int i = 1; i <= 3; i++)
|
||||
{
|
||||
cnt++;
|
||||
majorVersion++;
|
||||
|
||||
content = "The quick brown fox jumps over the lazy dog "+cnt;
|
||||
|
||||
params = new HashMap<>();
|
||||
params.put("overwrite", "true");
|
||||
params.put("comment", "my version "+cnt);
|
||||
params.put("majorVersion", "true");
|
||||
|
||||
documentResp = createTextFile(user1, myNodeId, contentName, content, "UTF-8", params);
|
||||
assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
|
||||
assertNotNull(documentResp.getProperties());
|
||||
assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
|
||||
}
|
||||
|
||||
// Updates - minor versions
|
||||
for (int i = 1; i <= 3; i++)
|
||||
{
|
||||
cnt++;
|
||||
minorVersion++;
|
||||
|
||||
content = "The quick brown fox jumps over the lazy dog "+cnt;
|
||||
|
||||
params = new HashMap<>();
|
||||
params.put("overwrite", "true");
|
||||
params.put("comment", "my version "+cnt);
|
||||
params.put("majorVersion", "false");
|
||||
|
||||
documentResp = createTextFile(user1, myNodeId, contentName, content, "UTF-8", params);
|
||||
assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
|
||||
assertNotNull(documentResp.getProperties());
|
||||
assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
|
||||
}
|
||||
|
||||
// Update again - as another major version
|
||||
cnt++;
|
||||
majorVersion++;
|
||||
minorVersion = 0;
|
||||
|
||||
content = "The quick brown fox jumps over the lazy dog "+cnt;
|
||||
|
||||
params = new HashMap<>();
|
||||
params.put("overwrite", "true");
|
||||
params.put("majorVersion", "true");
|
||||
|
||||
documentResp = createTextFile(user1, myNodeId, contentName, content, "UTF-8", params);
|
||||
assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
|
||||
|
||||
// Update again - as another (minor) version
|
||||
cnt++;
|
||||
minorVersion++;
|
||||
|
||||
content = "The quick brown fox jumps over the lazy dog "+cnt;
|
||||
|
||||
params = new HashMap<>();
|
||||
params.put("overwrite", "true");
|
||||
|
||||
documentResp = createTextFile(user1, myNodeId, contentName, content, "UTF-8", params);
|
||||
assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
|
||||
|
||||
|
||||
// -ve test
|
||||
params = new HashMap<>();
|
||||
params.put("overwrite", "true");
|
||||
params.put("autorename", "true");
|
||||
params.put(Nodes.PARAM_OVERWRITE, "true");
|
||||
params.put(Nodes.PARAM_AUTO_RENAME, "true");
|
||||
|
||||
createTextFile(user1, myNodeId, contentName, content, "UTF-8", params, 400);
|
||||
createTextFile(user1, myFolderNodeId, contentName, content, "UTF-8", params, 400);
|
||||
}
|
||||
|
||||
|
||||
// Remove versionable aspect
|
||||
// remove versionable aspect
|
||||
List<String> aspectNames = documentResp.getAspectNames();
|
||||
aspectNames.remove("cm:versionable");
|
||||
Document dUpdate = new Document();
|
||||
@@ -266,18 +206,233 @@ public class NodeVersionsApiTest extends AbstractBaseApiTest
|
||||
assertFalse(documentResp.getAspectNames().contains("cm:versionable"));
|
||||
assertNull(documentResp.getProperties()); // no properties (ie. no "cm:versionLabel")
|
||||
|
||||
// TODO review consistency - for example, we do allow update binary content (after removing versionable)
|
||||
// check no version history
|
||||
response = getAll(getNodeVersionsUrl(docId), user1, null, null, 200);
|
||||
List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
|
||||
assertEquals(0, nodes.size());
|
||||
|
||||
{
|
||||
// -ve test - do not allow overwrite (using POST upload) if the file is not versionable
|
||||
cnt++;
|
||||
content = "The quick brown fox jumps over the lazy dog "+cnt;
|
||||
content = textContentSuffix + cnt;
|
||||
|
||||
params = new HashMap<>();
|
||||
params.put("overwrite", "true");
|
||||
params.put(Nodes.PARAM_OVERWRITE, "true");
|
||||
|
||||
createTextFile(user1, myNodeId, contentName, content, "UTF-8", params, 409);
|
||||
createTextFile(user1, f1Id, contentName, content, "UTF-8", params, 409);
|
||||
}
|
||||
|
||||
// TODO add checks for version comment (eg. when we can list version history)
|
||||
// we do allow update of binary content with no versioning (after removing versionable)
|
||||
textContentSuffix = "Amazingly few discotheques provide jukeboxes ";
|
||||
|
||||
for (int i = 1; i <= 4; i++)
|
||||
{
|
||||
content = textContentSuffix + i;
|
||||
ByteArrayInputStream inputStream = new ByteArrayInputStream(content.getBytes());
|
||||
File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
|
||||
PublicApiHttpClient.BinaryPayload payload = new PublicApiHttpClient.BinaryPayload(txtFile);
|
||||
|
||||
putBinary(getNodeContentUrl(docId), user1, payload, null, null, 200);
|
||||
}
|
||||
|
||||
// check no version history
|
||||
response = getAll(getNodeVersionsUrl(docId), user1, null, null, 200);
|
||||
nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
|
||||
assertEquals(0, nodes.size());
|
||||
}
|
||||
finally
|
||||
{
|
||||
// some cleanup
|
||||
Map<String, String> params = Collections.singletonMap("permanent", "true");
|
||||
delete(URL_NODES, user1, f1Id, params, 204);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateFileVersionStartWithMinor() throws Exception
|
||||
{
|
||||
String myFolderNodeId = getMyNodeId(user1);
|
||||
|
||||
// create folder
|
||||
String f1Id = createFolder(user1, myFolderNodeId, "f1").getId();
|
||||
|
||||
try
|
||||
{
|
||||
int verCnt = 1;
|
||||
int cnt = 1;
|
||||
String versionLabel = "0.1";
|
||||
|
||||
String textContentSuffix = "Amazingly few discotheques provide jukeboxes ";
|
||||
String contentName = "content-2-" + System.currentTimeMillis();
|
||||
String content = textContentSuffix + cnt;
|
||||
|
||||
Map<String, String> params = new HashMap<>();
|
||||
params.put("majorVersion", "false");
|
||||
|
||||
// create a new file with a minor version (ie. 0.1)
|
||||
Document documentResp = createTextFile(user1, f1Id, contentName, content, "UTF-8", params);
|
||||
String docId = documentResp.getId();
|
||||
assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
|
||||
assertNotNull(documentResp.getProperties());
|
||||
assertEquals(versionLabel, documentResp.getProperties().get("cm:versionLabel"));
|
||||
|
||||
// also show that we continue with minor versions
|
||||
cnt = 2;
|
||||
versionLabel = updateFileVersions(user1, docId, cnt, textContentSuffix, verCnt, null, versionLabel);
|
||||
verCnt = verCnt+cnt;
|
||||
|
||||
// now create some major versions
|
||||
cnt = 3;
|
||||
versionLabel = updateFileVersions(user1, docId, cnt, textContentSuffix, verCnt, true, versionLabel);
|
||||
verCnt = verCnt+cnt;
|
||||
|
||||
assertEquals("3.0", versionLabel);
|
||||
assertEquals(6, verCnt);
|
||||
|
||||
// check version history count
|
||||
HttpResponse response = getAll(getNodeVersionsUrl(docId), user1, null, null, 200);
|
||||
List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
|
||||
assertEquals(verCnt, nodes.size());
|
||||
}
|
||||
finally
|
||||
{
|
||||
// some cleanup
|
||||
Map<String, String> params = Collections.singletonMap("permanent", "true");
|
||||
delete(URL_NODES, user1, f1Id, params, 204);
|
||||
}
|
||||
}
|
||||
|
||||
// create new versions - using upload by name (with overwrite)
|
||||
private String uploadTextFileVersions(String userId, String parentFolderNodeId, String fileName, int cnt,
|
||||
String textContentPrefix, int verCnt,
|
||||
Boolean majorVersion, String currentVersionLabel) throws Exception
|
||||
{
|
||||
String[] parts = currentVersionLabel.split("\\.");
|
||||
|
||||
int majorVer = new Integer(parts[0]).intValue();
|
||||
int minorVer = new Integer(parts[1]).intValue();
|
||||
Map<String, String> params = new HashMap<>();
|
||||
params.put(Nodes.PARAM_OVERWRITE, "true");
|
||||
|
||||
if (majorVersion != null)
|
||||
{
|
||||
params.put(Nodes.PARAM_VERSION_MAJOR, majorVersion.toString());
|
||||
}
|
||||
else
|
||||
{
|
||||
majorVersion = false;
|
||||
}
|
||||
|
||||
|
||||
if (majorVersion)
|
||||
{
|
||||
minorVer = 0;
|
||||
}
|
||||
|
||||
for (int i = 1; i <= cnt; i++)
|
||||
{
|
||||
if (majorVersion)
|
||||
{
|
||||
majorVer++;
|
||||
}
|
||||
else
|
||||
{
|
||||
minorVer++;
|
||||
}
|
||||
|
||||
verCnt++;
|
||||
|
||||
params.put("comment", "my version " + verCnt);
|
||||
|
||||
String textContent = textContentPrefix + verCnt;
|
||||
|
||||
String versionId = majorVer + "." + minorVer;
|
||||
|
||||
// uses upload with overwrite here ...
|
||||
Document documentResp = createTextFile(userId, parentFolderNodeId, fileName, textContent, "UTF-8", params);
|
||||
String docId = documentResp.getId();
|
||||
assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
|
||||
assertNotNull(documentResp.getProperties());
|
||||
assertEquals(versionId, documentResp.getProperties().get("cm:versionLabel"));
|
||||
|
||||
// double-check - get version node info
|
||||
HttpResponse response = getSingle(getNodeVersionsUrl(docId), userId, versionId, null, 200);
|
||||
Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
|
||||
assertEquals(versionId, nodeResp.getProperties().get("cm:versionLabel"));
|
||||
assertEquals((majorVersion ? "MAJOR" : "MINOR"), nodeResp.getProperties().get("cm:versionType"));
|
||||
}
|
||||
|
||||
return majorVer + "." + minorVer;
|
||||
}
|
||||
|
||||
// create new versions - using update binary content
|
||||
private String updateFileVersions(String userId, String contentNodeId, int cnt,
|
||||
String textContentPrefix, int verCnt,
|
||||
Boolean majorVersion, String currentVersionLabel) throws Exception
|
||||
{
|
||||
String[] parts = currentVersionLabel.split("\\.");
|
||||
|
||||
int majorVer = new Integer(parts[0]).intValue();
|
||||
int minorVer = new Integer(parts[1]).intValue();
|
||||
|
||||
Map<String, String> params = new HashMap<>();
|
||||
params.put(Nodes.PARAM_OVERWRITE, "true");
|
||||
|
||||
if (majorVersion != null)
|
||||
{
|
||||
params.put(Nodes.PARAM_VERSION_MAJOR, majorVersion.toString());
|
||||
}
|
||||
else
|
||||
{
|
||||
majorVersion = false;
|
||||
}
|
||||
|
||||
|
||||
if (majorVersion)
|
||||
{
|
||||
minorVer = 0;
|
||||
}
|
||||
|
||||
for (int i = 1; i <= cnt; i++)
|
||||
{
|
||||
if (majorVersion)
|
||||
{
|
||||
majorVer++;
|
||||
}
|
||||
else
|
||||
{
|
||||
minorVer++;
|
||||
}
|
||||
|
||||
verCnt++;
|
||||
|
||||
params.put("comment", "my version " + verCnt);
|
||||
|
||||
String textContent = textContentPrefix + verCnt;
|
||||
|
||||
String versionId = majorVer + "." + minorVer;
|
||||
|
||||
// Update
|
||||
ByteArrayInputStream inputStream = new ByteArrayInputStream(textContent.getBytes());
|
||||
File txtFile = TempFileProvider.createTempFile(inputStream, getClass().getSimpleName(), ".txt");
|
||||
PublicApiHttpClient.BinaryPayload payload = new PublicApiHttpClient.BinaryPayload(txtFile);
|
||||
|
||||
HttpResponse response = putBinary(getNodeContentUrl(contentNodeId), userId, payload, null, params, 200);
|
||||
Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
|
||||
|
||||
assertTrue(nodeResp.getAspectNames().contains("cm:versionable"));
|
||||
assertNotNull(nodeResp.getProperties());
|
||||
assertEquals(versionId, nodeResp.getProperties().get("cm:versionLabel"));
|
||||
assertEquals((majorVersion ? "MAJOR" : "MINOR"), nodeResp.getProperties().get("cm:versionType"));
|
||||
|
||||
// double-check - get version node info
|
||||
response = getSingle(getNodeVersionsUrl(contentNodeId), userId, versionId, null, 200);
|
||||
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
|
||||
assertEquals(versionId, nodeResp.getProperties().get("cm:versionLabel"));
|
||||
assertEquals((majorVersion ? "MAJOR" : "MINOR"), nodeResp.getProperties().get("cm:versionType"));
|
||||
}
|
||||
|
||||
return majorVer + "." + minorVer;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user