Fixing build failures. WebscriptTestSuite now references ActivitiWorkflowRestAPITest and JbpmWorkflowRestAPITest instead of WorkflowRestAPITest.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@25995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-03-03 12:12:24 +00:00
parent fe2dd3ff60
commit 58d7427d3f
4 changed files with 7 additions and 1732 deletions

View File

@@ -47,8 +47,10 @@ import org.alfresco.repo.web.scripts.wcm.WebProjectTest;
import org.alfresco.repo.web.scripts.wcm.membership.WebProjectMembershipTest; import org.alfresco.repo.web.scripts.wcm.membership.WebProjectMembershipTest;
import org.alfresco.repo.web.scripts.wcm.sandbox.AssetTest; import org.alfresco.repo.web.scripts.wcm.sandbox.AssetTest;
import org.alfresco.repo.web.scripts.wcm.sandbox.SandboxTest; import org.alfresco.repo.web.scripts.wcm.sandbox.SandboxTest;
import org.alfresco.repo.web.scripts.workflow.ActivitiWorkflowRestApiTest;
import org.alfresco.repo.web.scripts.workflow.JBPMWorkflowRestApiTest;
import org.alfresco.repo.web.scripts.workflow.WorkflowModelBuilderTest; import org.alfresco.repo.web.scripts.workflow.WorkflowModelBuilderTest;
import org.alfresco.repo.web.scripts.workflow.WorkflowRestApiTest; import org.alfresco.repo.web.scripts.workflow.AbstractWorkflowRestApiTest;
/** /**
* Web Scripts test suite * Web Scripts test suite
@@ -90,7 +92,8 @@ public class WebScriptTestSuite extends TestSuite
suite.addTestSuite( WebProjectMembershipTest.class ); suite.addTestSuite( WebProjectMembershipTest.class );
suite.addTestSuite( WebProjectTest.class ); suite.addTestSuite( WebProjectTest.class );
suite.addTestSuite( WorkflowModelBuilderTest.class ); suite.addTestSuite( WorkflowModelBuilderTest.class );
suite.addTestSuite( WorkflowRestApiTest.class ); suite.addTestSuite( ActivitiWorkflowRestApiTest.class );
suite.addTestSuite( JBPMWorkflowRestApiTest.class );
// This uses a slightly different context // This uses a slightly different context
// As such, we can't run it in the same suite as the others, // As such, we can't run it in the same suite as the others,

View File

@@ -6,7 +6,7 @@ import java.util.HashMap;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
public class ActivitiWorkflowRestApiTest extends WorkflowRestApiTest public class ActivitiWorkflowRestApiTest extends AbstractWorkflowRestApiTest
{ {
private static final String ADHOC_WORKFLOW_DEFINITION_NAME = "activiti$activitiAdhoc"; private static final String ADHOC_WORKFLOW_DEFINITION_NAME = "activiti$activitiAdhoc";

View File

@@ -6,7 +6,7 @@ import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest; import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.Response; import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
public class JBPMWorkflowRestApiTest extends WorkflowRestApiTest public class JBPMWorkflowRestApiTest extends AbstractWorkflowRestApiTest
{ {
private static final String ADHOC_WORKFLOW_DEFINITION_NAME = "jbpm$wf:adhoc"; private static final String ADHOC_WORKFLOW_DEFINITION_NAME = "jbpm$wf:adhoc";
private static final String REVIEW_WORKFLOW_DEFINITION_NAME = "jbpm$wf:review"; private static final String REVIEW_WORKFLOW_DEFINITION_NAME = "jbpm$wf:review";