inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
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@128360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-27 07:05:21 +00:00
parent 080cfe1102
commit 8bd1b00193
2 changed files with 237 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java
View File

@@ -1,28 +1,28 @@
/*
* #%L
* Alfresco Remote API
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
/*
* #%L
* Alfresco Remote API
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.rest.api.tests;
import java.util.Map;
@@ -34,13 +34,28 @@ 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.CRUDTestGroup;
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.filing.FilingTestGroup;
import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QuerySmokeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersionDeleteTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningStateCreateTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersionDeleteTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningStateCreateTest;
import org.junit.Test;
public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterpriseOpenCMISTCKTest
@@ -55,14 +70,14 @@ public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterp
@Test
public void testCMISTCKCRUD() throws Exception
{
CRUDTestGroup crudTestGroup = new CRUDTestGroup();
CRUDTestGroup crudTestGroup = new CRUDTestGroup();
JUnitHelper.run(crudTestGroup);
}
@Test
public void testCMISTCKVersioning() throws Exception
{
OverrideVersioningTestGroup versioningTestGroup = new OverrideVersioningTestGroup();
OverrideVersioningTestGroup versioningTestGroup = new OverrideVersioningTestGroup();
JUnitHelper.run(versioningTestGroup);
}
@@ -87,54 +102,53 @@ public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterp
JUnitHelper.run(queryTestGroup);
}
class OverrideVersioningTestGroup extends AbstractSessionTestGroup
{
@Override
public void init(Map<String, String> parameters) throws Exception
{
super.init(parameters);
setName("Versioning Test Group");
setDescription("Versioning tests.");
addTest(new VersioningSmokeTest());
addTest(new VersionDeleteTest());
addTest(new VersioningStateCreateTest());
// relies on Solr being available
// addTest(new CheckedOutTest());
}
}
// class OverrideCRUDTestGroup extends AbstractSessionTestGroup
// {
// @Override
// public void init(Map<String, String> parameters) throws Exception
// {
// super.init(parameters);
//
// setName("CRUD Test Group");
// setDescription("Create, Read, Update, and Delete tests.");
//
// addTest(new CreateAndDeleteFolderTest());
// addTest(new CreateAndDeleteDocumentTest());
// addTest(new CreateBigDocument());
// addTest(new CreateDocumentWithoutContent());
// addTest(new NameCharsetTest());
// addTest(new CreateAndDeleteRelationshipTest());
// addTest(new CreateAndDeleteItemTest());
// addTest(new UpdateSmokeTest());
// // TCK fails because we support only 1 object in bulk update at present
// // See ACE-34
// //addTest(new BulkUpdatePropertiesTest());
// addTest(new SetAndDeleteContentTest());
// addTest(new ChangeTokenTest());
// addTest(new ContentRangesTest());
// addTest(new CopyTest());
// addTest(new MoveTest());
// addTest(new DeleteTreeTest());
// addTest(new OperationContextTest());
// }
// }
class OverrideVersioningTestGroup extends AbstractSessionTestGroup
{
@Override
public void init(Map<String, String> parameters) throws Exception
{
super.init(parameters);
setName("Versioning Test Group");
setDescription("Versioning tests.");
addTest(new VersioningSmokeTest());
addTest(new VersionDeleteTest());
addTest(new VersioningStateCreateTest());
// relies on Solr being available
// addTest(new CheckedOutTest());
}
}
class OverrideCRUDTestGroup extends AbstractSessionTestGroup
{
@Override
public void init(Map<String, String> parameters) throws Exception
{
super.init(parameters);
setName("CRUD Test Group");
setDescription("Create, Read, Update, and Delete tests.");
addTest(new CreateAndDeleteFolderTest());
addTest(new CreateAndDeleteDocumentTest());
addTest(new CreateBigDocument());
addTest(new CreateDocumentWithoutContent());
addTest(new NameCharsetTest());
addTest(new CreateAndDeleteRelationshipTest());
addTest(new CreateAndDeleteItemTest());
addTest(new UpdateSmokeTest());
addTest(new BulkUpdatePropertiesTest());
addTest(new BulkUpdatePropertiesCustomTest());
addTest(new SetAndDeleteContentTest());
addTest(new ChangeTokenTest());
addTest(new ContentRangesTest());
addTest(new CopyTest());
addTest(new MoveTest());
addTest(new DeleteTreeTest());
addTest(new OperationContextTest());
}
}
public class OverrideQueryTestGroup extends AbstractSessionTestGroup
{