Author: fmui
Date: Fri Oct 8 08:57:01 2010
New Revision: 1005735
URL: http://svn.apache.org/viewvc?rev=1005735&view=rev
Log:
- fixed CMIS-258: testSetAndDeleteContent must use the PWC id, not the doc id
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java
URL:
http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java?rev=1005735&r1=1005734&r2=1005735&view=diff
==============================================================================
---
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java
(original)
+++
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java
Fri Oct 8 08:57:01 2010
@@ -38,8 +38,6 @@ import org.apache.chemistry.opencmis.com
/**
* Simple read-write test.
- *
- * @author <a href="mailto:[email protected]";>Florian Müller</a>
*/
public abstract class AbstractSimpleReadWriteTests extends
AbstractCmisTestCase {
@@ -172,7 +170,7 @@ public abstract class AbstractSimpleRead
}
/**
- * Tests property updates.
+ * Tests setting and deleting content stream.
*/
public void testSetAndDeleteContent() throws Exception {
if (!isEnabled(TEST_SET_AND_DELETE_CONTENT)) {
@@ -186,10 +184,10 @@ public abstract class AbstractSimpleRead
String docId = createDefaultDocument(getTestRootFolder(),
"testcontent.txt", CONTENT_TYPE, CONTENT);
// if a check out is required, do it
+ Holder<String> docIdHolder = new Holder<String>(docId);
if (requiresCheckOut) {
if (isVersionable) {
-
getBinding().getVersioningService().checkOut(getTestRepositoryId(), new
Holder<String>(docId), null,
- null);
+
getBinding().getVersioningService().checkOut(getTestRepositoryId(),
docIdHolder, null, null);
} else {
warning("Default document type is not versionable!");
delete(docId, true);
@@ -197,8 +195,9 @@ public abstract class AbstractSimpleRead
}
}
+ String docIdWorkingCopy = docIdHolder.getValue();
+
// delete content
- Holder<String> docIdHolder = new Holder<String>(docId);
try {
getBinding().getObjectService().deleteContentStream(getTestRepositoryId(),
docIdHolder, null, null);
} catch (CmisNotSupportedException e) {
@@ -208,15 +207,13 @@ public abstract class AbstractSimpleRead
// set content
ContentStream contentStream2 = createContentStreamData(CONTENT_TYPE,
CONTENT2);
- docIdHolder = new Holder<String>(docId);
+ docIdHolder = new Holder<String>(docIdWorkingCopy);
getBinding().getObjectService().setContentStream(getTestRepositoryId(),
docIdHolder, true, null,
contentStream2, null);
// read and assert content
- if (docIdHolder.getValue() != null) {
- docId = docIdHolder.getValue();
- }
- ContentStream contentStream3 = getContent(docId, null);
+ String newVersionDocId = (docIdHolder.getValue() == null ?
docIdWorkingCopy : docIdHolder.getValue());
+ ContentStream contentStream3 = getContent(newVersionDocId, null);
assertMimeType(CONTENT_TYPE, contentStream3.getMimeType());
if (contentStream3.getBigLength() != null) {
assertEquals(CONTENT2.length,
contentStream3.getBigLength().intValue());
@@ -227,7 +224,7 @@ public abstract class AbstractSimpleRead
// if it has been checked out, cancel that
if (requiresCheckOut) {
-
getBinding().getVersioningService().cancelCheckOut(getTestRepositoryId(),
docId, null);
+
getBinding().getVersioningService().cancelCheckOut(getTestRepositoryId(),
docIdWorkingCopy, null);
}
// delete document
@@ -343,25 +340,21 @@ public abstract class AbstractSimpleRead
String folder2 = createDefaultFolder(getTestRootFolder(), "folder2");
// create document
- String docId = createDefaultDocument(folder1, "testdoc.txt",
- CONTENT_TYPE, CONTENT);
+ String docId = createDefaultDocument(folder1, "testdoc.txt",
CONTENT_TYPE, CONTENT);
// copy it with new properties
List<PropertyData<?>> updatePropList = new
ArrayList<PropertyData<?>>();
- updatePropList.add(getObjectFactory().createPropertyStringData(
- PropertyIds.NAME, "newdocname"));
- Properties updateProperties = getObjectFactory().createPropertiesData(
- updatePropList);
-
- String copyId =
getBinding().getObjectService().createDocumentFromSource(
- getTestRepositoryId(), docId, updateProperties, folder2, null,
- null, null, null, null);
+
updatePropList.add(getObjectFactory().createPropertyStringData(PropertyIds.NAME,
"newdocname"));
+ Properties updateProperties =
getObjectFactory().createPropertiesData(updatePropList);
+
+ String copyId =
getBinding().getObjectService().createDocumentFromSource(getTestRepositoryId(),
docId,
+ updateProperties, folder2, null, null, null, null, null);
assertNotNull(copyId);
assertTrue(existsObject(copyId));
ObjectInFolderData copy = getChild(folder2, copyId);
- String updatedName = (String)
copy.getObject().getProperties().getProperties().get(
- PropertyIds.NAME).getFirstValue();
+ String updatedName = (String)
copy.getObject().getProperties().getProperties().get(PropertyIds.NAME)
+ .getFirstValue();
assertEquals("newdocname", updatedName);
deleteTree(folder1);
@@ -434,8 +427,8 @@ public abstract class AbstractSimpleRead
private boolean isCheckedOut(String docId) {
ObjectData object = getObject(docId);
- PropertyData<?> isCheckedOut =
object.getProperties().getProperties().get(
- PropertyIds.IS_VERSION_SERIES_CHECKED_OUT);
+ PropertyData<?> isCheckedOut = object.getProperties().getProperties()
+ .get(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT);
assertNotNull(isCheckedOut);
assertTrue(isCheckedOut.getFirstValue() instanceof Boolean);
