Merged HEAD (5.2) to 5.2.N (5.2.1)

126406 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      121355 gcornwell: RA-758: Disable the CheckedOutTest for the 1.1 bindings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:03:28 +00:00
parent 76f7691c4a
commit ef7aafc7a4

View File

@@ -38,7 +38,9 @@ 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.query.QuerySmokeTest; import org.apache.chemistry.opencmis.tck.tests.query.QuerySmokeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningTestGroup; 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; import org.junit.Test;
public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterpriseOpenCMISTCKTest public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterpriseOpenCMISTCKTest
@@ -60,7 +62,7 @@ public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterp
@Test @Test
public void testCMISTCKVersioning() throws Exception public void testCMISTCKVersioning() throws Exception
{ {
VersioningTestGroup versioningTestGroup = new VersioningTestGroup(); OverrideVersioningTestGroup versioningTestGroup = new OverrideVersioningTestGroup();
JUnitHelper.run(versioningTestGroup); JUnitHelper.run(versioningTestGroup);
} }
@@ -85,24 +87,24 @@ 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