svn commit: r1330858 - in /chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud: CreateBigDocument.java UpdateSmokeTest.java

[fm...@apache.org]

Author: fmui
Date: Thu Apr 26 14:00:32 2012
New Revision: 1330858

URL: http://svn.apache.org/viewvc?rev=1330858&view=rev
Log:
TCK fixes

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateBigDocument.java
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/UpdateSmokeTest.java

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateBigDocument.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateBigDocument.java?rev=1330858&r1=1330857&r2=1330858&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateBigDocument.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/CreateBigDocument.java Thu Apr 26 14:00:32 2012
@@ -96,7 +96,7 @@ public class CreateBigDocument extends A
 
             // create and fetch the document
             ObjectId id = session.createDocument(properties, testFolder, contentStream, versioningState);
-            Document doc = (Document) session.getObject(id);
+            Document doc = (Document) session.getObject(id, SELECT_ALL_NO_CACHE_OC);
 
             // check the new document
             addResult(checkObject(session, doc, getAllProperties(doc), "New document object spec compliance"));

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/UpdateSmokeTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/UpdateSmokeTest.java?rev=1330858&r1=1330857&r2=1330858&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/UpdateSmokeTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/UpdateSmokeTest.java Thu Apr 26 14:00:32 2012
@@ -31,6 +31,7 @@ import org.apache.chemistry.opencmis.cli
 import org.apache.chemistry.opencmis.commons.PropertyIds;
 import org.apache.chemistry.opencmis.commons.definitions.DocumentTypeDefinition;
 import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition;
+import org.apache.chemistry.opencmis.commons.enums.Action;
 import org.apache.chemistry.opencmis.commons.enums.Updatability;
 import org.apache.chemistry.opencmis.tck.CmisTestResult;
 import org.apache.chemistry.opencmis.tck.impl.AbstractSessionTest;
@@ -69,7 +70,9 @@ public class UpdateSmokeTest extends Abs
             boolean checkedout = false;
             DocumentTypeDefinition type = (DocumentTypeDefinition) doc1.getType();
             PropertyDefinition<?> namePropDef = type.getPropertyDefinitions().get(PropertyIds.NAME);
-            if (namePropDef.getUpdatability() == Updatability.WHENCHECKEDOUT) {
+            if (namePropDef.getUpdatability() == Updatability.WHENCHECKEDOUT
+                    || (!doc1.getAllowableActions().getAllowableActions().contains(Action.CAN_UPDATE_PROPERTIES) && Boolean.TRUE
+                            .equals(type.isVersionable()))) {
                 workDoc = (Document) session.getObject(doc1.checkOut(), SELECT_ALL_NO_CACHE_OC);
                 checkedout = true;
             }
@@ -95,13 +98,16 @@ public class UpdateSmokeTest extends Abs
                         "updateProperties without property changes returned an error: " + e.getMessage(), e, false));
             }
 
+            // delete
+            if (!workDoc.getId().equals(doc2.getId())) {
+                deleteObject(doc2);
+            }
+
             // cancel a possible check out
             if (checkedout) {
                 workDoc.cancelCheckOut();
             }
 
-            // delete
-            deleteObject(doc2);
             if (!doc1.getId().equals(doc2.getId())) {
                 if (exists(doc1)) {
                     deleteObject(doc1);