inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
76575: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76363: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
      Additional fix for build failure: https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-452


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-22 15:40:31 +00:00
parent 079b879c67
commit 874f632d1b
3 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/test-java/org/alfresco/RemoteApi00TestSuite.java Normal file
View File

@@ -0,0 +1,35 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco;
import junit.framework.Test;
import junit.framework.TestSuite;
/**
* @author Dmitry Velichkevich
*/
public class RemoteApi00TestSuite extends TestSuite
{
public static Test suite()
{
TestSuite suite = new TestSuite();
RemoteApi01TestSuite.tests0(suite);
return suite;
}
}

8
source/test-java/org/alfresco/RemoteApi01TestSuite.java
View File

@@ -43,7 +43,12 @@ public class RemoteApi01TestSuite extends TestSuite
return suite;
}
static void tests0(TestSuite suite)
{
suite.addTestSuite(org.alfresco.rest.test.workflow.api.impl.ProcessesImplTest.class); // Fails with tests8() tests
}
static void tests1(TestSuite suite)
{
suite.addTestSuite(org.alfresco.repo.management.subsystems.test.SubsystemsTest.class);
@@ -81,7 +86,6 @@ public class RemoteApi01TestSuite extends TestSuite
{
suite.addTest(new JUnit4TestAdapter(org.alfresco.rest.workflow.api.tests.DeploymentWorkflowApiTest.class));
suite.addTest(new JUnit4TestAdapter(org.alfresco.rest.workflow.api.tests.ProcessDefinitionWorkflowApiTest.class));
suite.addTestSuite(org.alfresco.rest.workflow.api.impl.ProcessesImplTest.class);
}
static void tests7(TestSuite suite) //

5
source/test-java/org/alfresco/rest/workflow/api/impl/ProcessesImplTest.java → source/test-java/org/alfresco/rest/test/workflow/api/impl/ProcessesImplTest.java
View File

@@ -16,7 +16,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.rest.workflow.api.impl;
package org.alfresco.rest.test.workflow.api.impl;
import java.io.Serializable;
import java.util.Collections;
@@ -39,6 +39,7 @@ import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams;
import org.alfresco.rest.framework.resource.parameters.where.Query;
import org.alfresco.rest.framework.webscripts.ResourceWebScriptHelper;
import org.alfresco.rest.workflow.api.Processes;
import org.alfresco.rest.workflow.api.impl.ProcessesImpl;
import org.alfresco.rest.workflow.api.model.ProcessInfo;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -121,7 +122,7 @@ public class ProcessesImplTest extends TestCase
{
Map<QName, Serializable> parameters = new HashMap<QName, Serializable>();
parameters.put(WorkflowModel.ASSOC_ASSIGNEE, (Serializable) Collections.singletonList(assignee));
parameters.put(WorkflowModel.ASSOC_PACKAGE, workflowService.createPackage(null));
//parameters.put(WorkflowModel.ASSOC_PACKAGE, workflowService.createPackage(null));
workflowService.startWorkflow(neededDefinition.getId(), parameters);
}