Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

121337 gcornwell: RA-758: Ensure all appropriate TCK tests are being run against all bindings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 10:45:14 +00:00
parent 88eef07069
commit 2d3deb2a66
2 changed files with 75 additions and 91 deletions

View File

@@ -9,27 +9,11 @@ import org.apache.chemistry.opencmis.tck.impl.AbstractSessionTestGroup;
import org.apache.chemistry.opencmis.tck.impl.JUnitHelper; import org.apache.chemistry.opencmis.tck.impl.JUnitHelper;
import org.apache.chemistry.opencmis.tck.tests.basics.BasicsTestGroup; 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.control.ControlTestGroup;
import org.apache.chemistry.opencmis.tck.tests.crud.ChangeTokenTest; import org.apache.chemistry.opencmis.tck.tests.crud.CRUDTestGroup;
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.filing.FilingTestGroup;
import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest; 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.query.QuerySmokeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersionDeleteTest; import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningTestGroup;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningStateCreateTest;
import org.junit.Test; import org.junit.Test;
public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterpriseOpenCMISTCKTest public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterpriseOpenCMISTCKTest
@@ -44,14 +28,14 @@ public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterp
@Test @Test
public void testCMISTCKCRUD() throws Exception public void testCMISTCKCRUD() throws Exception
{ {
OverrideCRUDTestGroup crudTestGroup = new OverrideCRUDTestGroup(); CRUDTestGroup crudTestGroup = new CRUDTestGroup();
JUnitHelper.run(crudTestGroup); JUnitHelper.run(crudTestGroup);
} }
@Test @Test
public void testCMISTCKVersioning() throws Exception public void testCMISTCKVersioning() throws Exception
{ {
OverrideVersioningTestGroup versioningTestGroup = new OverrideVersioningTestGroup(); VersioningTestGroup versioningTestGroup = new VersioningTestGroup();
JUnitHelper.run(versioningTestGroup); JUnitHelper.run(versioningTestGroup);
} }
@@ -76,54 +60,54 @@ public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterp
JUnitHelper.run(queryTestGroup); JUnitHelper.run(queryTestGroup);
} }
class OverrideVersioningTestGroup extends AbstractSessionTestGroup // class OverrideVersioningTestGroup extends AbstractSessionTestGroup
{ // {
@Override // @Override
public void init(Map<String, String> parameters) throws Exception // public void init(Map<String, String> parameters) throws Exception
{ // {
super.init(parameters); // super.init(parameters);
//
setName("Versioning Test Group"); // setName("Versioning Test Group");
setDescription("Versioning tests."); // setDescription("Versioning tests.");
//
addTest(new VersioningSmokeTest()); // addTest(new VersioningSmokeTest());
addTest(new VersionDeleteTest()); // addTest(new VersionDeleteTest());
addTest(new VersioningStateCreateTest()); // addTest(new VersioningStateCreateTest());
// relies on Solr being available // // relies on Solr being available
// addTest(new CheckedOutTest()); //// addTest(new CheckedOutTest());
} // }
} // }
//
class OverrideCRUDTestGroup extends AbstractSessionTestGroup // class OverrideCRUDTestGroup extends AbstractSessionTestGroup
{ // {
@Override // @Override
public void init(Map<String, String> parameters) throws Exception // public void init(Map<String, String> parameters) throws Exception
{ // {
super.init(parameters); // super.init(parameters);
//
setName("CRUD Test Group"); // setName("CRUD Test Group");
setDescription("Create, Read, Update, and Delete tests."); // setDescription("Create, Read, Update, and Delete tests.");
//
addTest(new CreateAndDeleteFolderTest()); // addTest(new CreateAndDeleteFolderTest());
addTest(new CreateAndDeleteDocumentTest()); // addTest(new CreateAndDeleteDocumentTest());
addTest(new CreateBigDocument()); // addTest(new CreateBigDocument());
addTest(new CreateDocumentWithoutContent()); // addTest(new CreateDocumentWithoutContent());
addTest(new NameCharsetTest()); // addTest(new NameCharsetTest());
addTest(new CreateAndDeleteRelationshipTest()); // addTest(new CreateAndDeleteRelationshipTest());
addTest(new CreateAndDeleteItemTest()); // addTest(new CreateAndDeleteItemTest());
addTest(new UpdateSmokeTest()); // addTest(new UpdateSmokeTest());
// TCK fails because we support only 1 object in bulk update at present // // TCK fails because we support only 1 object in bulk update at present
// See ACE-34 // // See ACE-34
//addTest(new BulkUpdatePropertiesTest()); // //addTest(new BulkUpdatePropertiesTest());
addTest(new SetAndDeleteContentTest()); // addTest(new SetAndDeleteContentTest());
addTest(new ChangeTokenTest()); // addTest(new ChangeTokenTest());
addTest(new ContentRangesTest()); // addTest(new ContentRangesTest());
addTest(new CopyTest()); // addTest(new CopyTest());
addTest(new MoveTest()); // addTest(new MoveTest());
addTest(new DeleteTreeTest()); // addTest(new DeleteTreeTest());
addTest(new OperationContextTest()); // addTest(new OperationContextTest());
} // }
} // }
public class OverrideQueryTestGroup extends AbstractSessionTestGroup public class OverrideQueryTestGroup extends AbstractSessionTestGroup
{ {

View File

@@ -6,6 +6,7 @@ import java.util.Map;
import org.alfresco.opencmis.OpenCMISClientContext; import org.alfresco.opencmis.OpenCMISClientContext;
import org.alfresco.opencmis.tck.tests.query.QueryForObjectCustom; 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.opencmis.tck.tests.query.QueryLikeTestCustom;
import org.alfresco.rest.api.tests.RepoService.TestNetwork; import org.alfresco.rest.api.tests.RepoService.TestNetwork;
import org.apache.chemistry.opencmis.commons.enums.BindingType; import org.apache.chemistry.opencmis.commons.enums.BindingType;
@@ -17,10 +18,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.crud.CRUDTestGroup;
import org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup; 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.ContentChangesSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.CheckedOutTest; 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.VersioningTestGroup;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningStateCreateTest;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.junit.AfterClass; import org.junit.AfterClass;
@@ -73,7 +72,7 @@ public class TestPublicApiAtomPub10TCK extends AbstractEnterpriseOpenCMIS10TCKTe
@Test @Test
public void testCMISTCKVersioning() throws Exception public void testCMISTCKVersioning() throws Exception
{ {
OverrideVersioningTestGroup versioningTestGroup = new OverrideVersioningTestGroup(); VersioningTestGroup versioningTestGroup = new VersioningTestGroup();
JUnitHelper.run(versioningTestGroup); JUnitHelper.run(versioningTestGroup);
} }
@@ -98,23 +97,23 @@ public class TestPublicApiAtomPub10TCK extends AbstractEnterpriseOpenCMIS10TCKTe
JUnitHelper.run(queryTestGroup); JUnitHelper.run(queryTestGroup);
} }
private class OverrideVersioningTestGroup extends AbstractSessionTestGroup // private class OverrideVersioningTestGroup extends AbstractSessionTestGroup
{ // {
@Override // @Override
public void init(Map<String, String> parameters) throws Exception // public void init(Map<String, String> parameters) throws Exception
{ // {
super.init(parameters); // super.init(parameters);
//
setName("Versioning Test Group"); // setName("Versioning Test Group");
setDescription("Versioning tests."); // setDescription("Versioning tests.");
//
addTest(new VersioningSmokeTest()); // addTest(new VersioningSmokeTest());
addTest(new VersionDeleteTest()); // addTest(new VersionDeleteTest());
addTest(new VersioningStateCreateTest()); // addTest(new VersioningStateCreateTest());
// relies on Solr being available // // relies on Solr being available
addTest(new CheckedOutTest()); // addTest(new CheckedOutTest());
} // }
} // }
private class OverrideQueryTestGroup extends AbstractSessionTestGroup private class OverrideQueryTestGroup extends AbstractSessionTestGroup
{ {
@@ -128,11 +127,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 // 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) // against the workspace://SpacesStore)
// addTest(new QuerySmokeTest()); addTest(new QuerySmokeTest());
// The test fails on Lucene see MNT-11223 // The test fails on Lucene see MNT-11223
// addTest(new QueryRootFolderTest()); // addTest(new QueryRootFolderTest());
addTest(new QueryForObjectCustom()); addTest(new QueryForObjectCustom());
addTest(new QueryLikeTestCustom()); addTest(new QueryLikeTestCustom());
addTest(new QueryInFolderTestCustom());
addTest(new ContentChangesSmokeTest()); addTest(new ContentChangesSmokeTest());
} }
} }