Merged HEAD-BUG-FIX (Cloud/4.3) to HEAD (Cloud/4.3)

62592: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62550: MNT-10059 Re-enable PublishWebContentJbpmTest and PublishingRestApiTest tests, which had been lost


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-19 12:07:27 +00:00
parent cd7b6d00e6
commit 18461c6af6

View File

@@ -33,6 +33,7 @@ import org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test;
import org.alfresco.repo.web.scripts.groups.GroupsTest;
import org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest;
import org.alfresco.repo.web.scripts.invite.InviteServiceTest;
import org.alfresco.repo.web.scripts.publishing.PublishingRestApiTest;
import org.alfresco.repo.web.scripts.person.PersonServiceTest;
import org.alfresco.repo.web.scripts.preference.PreferenceServiceTest;
import org.alfresco.repo.web.scripts.quickshare.QuickShareRestApiTest;
@@ -95,6 +96,7 @@ public class WebScriptTestSuite extends TestSuite
suite.addTestSuite( WorkflowModelBuilderTest.class );
suite.addTestSuite( ActivitiWorkflowRestApiTest.class );
suite.addTestSuite( JBPMWorkflowRestApiTest.class );
suite.addTestSuite( PublishingRestApiTest.class );
// This uses a slightly different context
// As such, we can't run it in the same suite as the others,