From c210aaf402ea5b4cd39d6c14c2f23deaa258aeb9 Mon Sep 17 00:00:00 2001
From: Jamal Kaabi-Mofrad <Jamal.kaabimofrad@alfresco.com>
Date: Tue, 10 May 2016 10:45:25 +0000
Subject: [PATCH] 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/HEAD/root@126406 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../AbstractEnterpriseOpenCMIS11TCKTest.java  | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 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 84d13cd5aa..914efe6df1 100644
--- a/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java
@@ -13,7 +13,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.query.ContentChangesSmokeTest;
 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;
 
 public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterpriseOpenCMISTCKTest
@@ -35,7 +37,7 @@ public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterp
     @Test
     public void testCMISTCKVersioning() throws Exception
     {
-        VersioningTestGroup versioningTestGroup = new VersioningTestGroup();
+        OverrideVersioningTestGroup versioningTestGroup = new OverrideVersioningTestGroup();
         JUnitHelper.run(versioningTestGroup);
     }
 
@@ -60,24 +62,24 @@ 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 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