From a3d4f5c0d12039699352507f6137cfe4ea3a068d Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 27 Jun 2016 09:04:59 +0000 Subject: [PATCH] Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) - fix merge for: 128341 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 128260 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) 128213 arebegea: MNT-16437 : CLONE - 4.2.N - 4.2.3 CMIS Bulk Update Properties only updates the properties of one document when more than one document is in the objectIdAndChangeTokens list Merged V4.2.3 (4.2.3.25) to V4.2-BUG-FIX (4.2.7) 128177 arebegea: MNT-16376 : 4.2.3 CMIS Bulk Update Properties only updates the properties of one document when more than one document is in the objectIdAndChangeTokens list - The batch worker threads did not have the thread context to know that they were dealing with CMIS version 1.1 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../AbstractEnterpriseOpenCMIS11TCKTest.java | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java b/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java index 9c7b2f2086..13e12464ad 100644 --- a/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java @@ -34,22 +34,23 @@ import org.apache.chemistry.opencmis.tck.impl.AbstractSessionTestGroup; import org.apache.chemistry.opencmis.tck.impl.JUnitHelper; import org.apache.chemistry.opencmis.tck.tests.basics.BasicsTestGroup; import org.apache.chemistry.opencmis.tck.tests.control.ControlTestGroup; -import org.apache.chemistry.opencmis.tck.tests.crud.BulkUpdatePropertiesTest; -import org.apache.chemistry.opencmis.tck.tests.crud.ChangeTokenTest; -import org.apache.chemistry.opencmis.tck.tests.crud.ContentRangesTest; -import org.apache.chemistry.opencmis.tck.tests.crud.CopyTest; -import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteDocumentTest; -import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteFolderTest; -import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteItemTest; -import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteRelationshipTest; -import org.apache.chemistry.opencmis.tck.tests.crud.CreateBigDocument; -import org.apache.chemistry.opencmis.tck.tests.crud.CreateDocumentWithoutContent; -import org.apache.chemistry.opencmis.tck.tests.crud.DeleteTreeTest; -import org.apache.chemistry.opencmis.tck.tests.crud.MoveTest; -import org.apache.chemistry.opencmis.tck.tests.crud.NameCharsetTest; -import org.apache.chemistry.opencmis.tck.tests.crud.OperationContextTest; -import org.apache.chemistry.opencmis.tck.tests.crud.SetAndDeleteContentTest; -import org.apache.chemistry.opencmis.tck.tests.crud.UpdateSmokeTest; +import org.apache.chemistry.opencmis.tck.tests.crud.BulkUpdatePropertiesTest; +import org.apache.chemistry.opencmis.tck.tests.crud.CRUDTestGroup; +import org.apache.chemistry.opencmis.tck.tests.crud.ChangeTokenTest; +import org.apache.chemistry.opencmis.tck.tests.crud.ContentRangesTest; +import org.apache.chemistry.opencmis.tck.tests.crud.CopyTest; +import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteDocumentTest; +import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteFolderTest; +import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteItemTest; +import org.apache.chemistry.opencmis.tck.tests.crud.CreateAndDeleteRelationshipTest; +import org.apache.chemistry.opencmis.tck.tests.crud.CreateBigDocument; +import org.apache.chemistry.opencmis.tck.tests.crud.CreateDocumentWithoutContent; +import org.apache.chemistry.opencmis.tck.tests.crud.DeleteTreeTest; +import org.apache.chemistry.opencmis.tck.tests.crud.MoveTest; +import org.apache.chemistry.opencmis.tck.tests.crud.NameCharsetTest; +import org.apache.chemistry.opencmis.tck.tests.crud.OperationContextTest; +import org.apache.chemistry.opencmis.tck.tests.crud.SetAndDeleteContentTest; +import org.apache.chemistry.opencmis.tck.tests.crud.UpdateSmokeTest; import org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup; import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest; import org.apache.chemistry.opencmis.tck.tests.query.QuerySmokeTest;