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

77127: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73448: Added SubscriptionServiceRestApiTest (not in any suites) to WebScriptTestSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 15:40:11 +00:00
parent 8fbde8d254
commit 53eb8be74a

View File

@@ -43,6 +43,7 @@ import org.alfresco.repo.web.scripts.rule.RuleServiceTest;
import org.alfresco.repo.web.scripts.search.PersonSearchTest;
import org.alfresco.repo.web.scripts.site.SiteServiceTest;
import org.alfresco.repo.web.scripts.solr.SOLRWebScriptTest;
import org.alfresco.repo.web.scripts.subscriptions.SubscriptionServiceRestApiTest;
import org.alfresco.repo.web.scripts.tagging.TaggingServiceTest;
import org.alfresco.repo.web.scripts.thumbnail.ThumbnailServiceTest;
import org.alfresco.repo.web.scripts.transfer.TransferWebScriptTest;
@@ -93,6 +94,7 @@ public class WebScriptTestSuite extends TestSuite
suite.addTestSuite( JBPMWorkflowRestApiTest.class );
suite.addTestSuite( PublishingRestApiTest.class );
suite.addTestSuite( SOLRWebScriptTest.class );
suite.addTestSuite( SubscriptionServiceRestApiTest.class );
// This uses a slightly different context
// As such, we can't run it in the same suite as the others,