Return-Path: X-Original-To: apmail-chemistry-commits-archive@www.apache.org Delivered-To: apmail-chemistry-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 431098F3B for ; Mon, 5 Sep 2011 13:21:08 +0000 (UTC) Received: (qmail 4515 invoked by uid 500); 5 Sep 2011 13:21:08 -0000 Delivered-To: apmail-chemistry-commits-archive@chemistry.apache.org Received: (qmail 4466 invoked by uid 500); 5 Sep 2011 13:21:07 -0000 Mailing-List: contact commits-help@chemistry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@chemistry.apache.org Delivered-To: mailing list commits@chemistry.apache.org Received: (qmail 4456 invoked by uid 99); 5 Sep 2011 13:21:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Sep 2011 13:21:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Sep 2011 13:21:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5ABD223888E7; Mon, 5 Sep 2011 13:20:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1165272 - /chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/tests/crud/UpdateSmokeTest.java Date: Mon, 05 Sep 2011 13:20:45 -0000 To: commits@chemistry.apache.org From: fmui@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110905132045.5ABD223888E7@eris.apache.org> Author: fmui Date: Mon Sep 5 13:20:44 2011 New Revision: 1165272 URL: http://svn.apache.org/viewvc?rev=1165272&view=rev Log: TCK: changed update properties test to checkout the document if necessary Modified: 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/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=1165272&r1=1165271&r2=1165272&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 Mon Sep 5 13:20:44 2011 @@ -28,6 +28,9 @@ import org.apache.chemistry.opencmis.cli import org.apache.chemistry.opencmis.client.api.ObjectId; import org.apache.chemistry.opencmis.client.api.Session; 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.Updatability; import org.apache.chemistry.opencmis.tck.CmisTestResult; import org.apache.chemistry.opencmis.tck.impl.AbstractSessionTest; @@ -56,15 +59,25 @@ public class UpdateSmokeTest extends Abs // create document Document doc1 = createDocument(session, testFolder, NAME1, "rename me!"); + Document workDoc = doc1; f = createResult(FAILURE, "Document name doesn't match with given name!"); addResult(assertEquals(NAME1, doc1.getName(), null, f)); + // test if check out is required + boolean checkedout = false; + DocumentTypeDefinition type = (DocumentTypeDefinition) doc1.getType(); + PropertyDefinition namePropDef = type.getPropertyDefinitions().get(PropertyIds.NAME); + if (namePropDef.getUpdatability() == Updatability.WHENCHECKEDOUT) { + workDoc = (Document) session.getObject(doc1.checkOut(), SELECT_ALL_NO_CACHE_OC); + checkedout = true; + } + // update Map properties = new HashMap(); properties.put(PropertyIds.NAME, NAME2); - ObjectId newId = doc1.updateProperties(properties, false); + ObjectId newId = workDoc.updateProperties(properties, false); Document doc2 = (Document) session.getObject(newId, SELECT_ALL_NO_CACHE_OC); addResult(checkObject(session, doc2, getAllProperties(doc2), "Updated document compliance")); @@ -72,8 +85,16 @@ public class UpdateSmokeTest extends Abs f = createResult(FAILURE, "Document name doesn't match updated value!"); addResult(assertEquals(NAME2, doc2.getName(), null, f)); + // cancel a possible check out + if (checkedout) { + workDoc.cancelCheckOut(); + } + // delete deleteObject(doc2); + if (!doc1.getId().equals(doc2.getId())) { + deleteObject(doc1); + } } finally { // clean up deleteTestFolder();