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 6c01e67b5d..9efc59d6a4 100644 --- a/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java @@ -34,27 +34,11 @@ 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.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.CRUDTestGroup; 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.VersioningTestGroup; import org.junit.Test; public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterpriseOpenCMISTCKTest @@ -69,14 +53,14 @@ public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterp @Test public void testCMISTCKCRUD() throws Exception { - OverrideCRUDTestGroup crudTestGroup = new OverrideCRUDTestGroup(); + CRUDTestGroup crudTestGroup = new CRUDTestGroup(); JUnitHelper.run(crudTestGroup); } @Test public void testCMISTCKVersioning() throws Exception { - OverrideVersioningTestGroup versioningTestGroup = new OverrideVersioningTestGroup(); + VersioningTestGroup versioningTestGroup = new VersioningTestGroup(); JUnitHelper.run(versioningTestGroup); } @@ -101,54 +85,54 @@ public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterp JUnitHelper.run(queryTestGroup); } - class OverrideVersioningTestGroup extends AbstractSessionTestGroup - { - @Override - public void init(Map 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 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 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 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()); +// } +// } public class OverrideQueryTestGroup extends AbstractSessionTestGroup { diff --git a/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java b/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java index 0b610494df..e5b8bc235a 100644 --- a/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java +++ b/source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java @@ -31,6 +31,7 @@ import java.util.Map; import org.alfresco.opencmis.OpenCMISClientContext; import org.alfresco.opencmis.tck.tests.query.QueryForObjectCustom; +import org.alfresco.opencmis.tck.tests.query.QueryInFolderTestCustom; import org.alfresco.opencmis.tck.tests.query.QueryLikeTestCustom; import org.alfresco.rest.api.tests.RepoService.TestNetwork; import org.apache.chemistry.opencmis.commons.enums.BindingType; @@ -42,10 +43,8 @@ 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.filing.FilingTestGroup; import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest; -import org.apache.chemistry.opencmis.tck.tests.versioning.CheckedOutTest; -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.query.QuerySmokeTest; +import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningTestGroup; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.AfterClass; @@ -98,7 +97,7 @@ public class TestPublicApiAtomPub10TCK extends AbstractEnterpriseOpenCMIS10TCKTe @Test public void testCMISTCKVersioning() throws Exception { - OverrideVersioningTestGroup versioningTestGroup = new OverrideVersioningTestGroup(); + VersioningTestGroup versioningTestGroup = new VersioningTestGroup(); JUnitHelper.run(versioningTestGroup); } @@ -123,23 +122,23 @@ public class TestPublicApiAtomPub10TCK extends AbstractEnterpriseOpenCMIS10TCKTe JUnitHelper.run(queryTestGroup); } - private class OverrideVersioningTestGroup extends AbstractSessionTestGroup - { - @Override - public void init(Map 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()); - } - } +// private class OverrideVersioningTestGroup extends AbstractSessionTestGroup +// { +// @Override +// public void init(Map 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()); +// } +// } private class OverrideQueryTestGroup extends AbstractSessionTestGroup { @@ -153,11 +152,12 @@ public class TestPublicApiAtomPub10TCK extends AbstractEnterpriseOpenCMIS10TCKTe // this is failing because of an MT issue (the thread is a specific tenant but the DB metadata query is searching // against the workspace://SpacesStore) -// addTest(new QuerySmokeTest()); + addTest(new QuerySmokeTest()); // The test fails on Lucene see MNT-11223 // addTest(new QueryRootFolderTest()); addTest(new QueryForObjectCustom()); addTest(new QueryLikeTestCustom()); + addTest(new QueryInFolderTestCustom()); addTest(new ContentChangesSmokeTest()); } }