From 874f632d1bf349ee96fca82e9705a4e7ded46de4 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Tue, 22 Jul 2014 15:40:31 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    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
---
 .../org/alfresco/RemoteApi00TestSuite.java    | 35 +++++++++++++++++++
 .../org/alfresco/RemoteApi01TestSuite.java    |  8 +++--
 .../workflow/api/impl/ProcessesImplTest.java  |  5 +--
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 source/test-java/org/alfresco/RemoteApi00TestSuite.java
 rename source/test-java/org/alfresco/rest/{ => test}/workflow/api/impl/ProcessesImplTest.java (94%)

diff --git a/source/test-java/org/alfresco/RemoteApi00TestSuite.java b/source/test-java/org/alfresco/RemoteApi00TestSuite.java
new file mode 100644
index 0000000000..bebdcbb15f
--- /dev/null
+++ b/source/test-java/org/alfresco/RemoteApi00TestSuite.java
@@ -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;
+    }
+}
diff --git a/source/test-java/org/alfresco/RemoteApi01TestSuite.java b/source/test-java/org/alfresco/RemoteApi01TestSuite.java
index c4c5e817af..642670e5c5 100644
--- a/source/test-java/org/alfresco/RemoteApi01TestSuite.java
+++ b/source/test-java/org/alfresco/RemoteApi01TestSuite.java
@@ -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) // 
diff --git a/source/test-java/org/alfresco/rest/workflow/api/impl/ProcessesImplTest.java b/source/test-java/org/alfresco/rest/test/workflow/api/impl/ProcessesImplTest.java
similarity index 94%
rename from source/test-java/org/alfresco/rest/workflow/api/impl/ProcessesImplTest.java
rename to source/test-java/org/alfresco/rest/test/workflow/api/impl/ProcessesImplTest.java
index 0087964ff7..83b725ed9f 100644
--- a/source/test-java/org/alfresco/rest/workflow/api/impl/ProcessesImplTest.java
+++ b/source/test-java/org/alfresco/rest/test/workflow/api/impl/ProcessesImplTest.java
@@ -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);
     }