inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
78421: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75797: ACE-2149: EOL AVM / WCM
       - Removal from 'remote-api' project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:11:32 +00:00
parent 4249c9ac4b
commit 4e8556fc9b
18 changed files with 8 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/test-java/org/alfresco/repo/web/scripts/groups/GroupsTest.java
View File

@@ -786,7 +786,7 @@ public class GroupsTest extends BaseWebScriptTest
// Negative test Search for a group in a wrong zone
{
Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE + "&zone=" + AuthorityService.ZONE_APP_WCM), Status.STATUS_OK);
Response response = sendRequest(new GetRequest(URL_GROUPS + "?shortNameFilter=" + TEST_GROUPE + "&zone=" + "SOME.THING"), Status.STATUS_OK);
JSONObject top = new JSONObject(response.getContentAsString());
logger.debug(response.getContentAsString());
// System.out.println(response.getContentAsString());

8
source/test-java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java
View File

@@ -823,7 +823,7 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
assertFalse("Found adhoc workflow when it was supposed to be excluded", adhocWorkflowPresent);
// filter with a wildcard and ensure they all get filtered out
exclude = adhocDefName + ", jbpm$wcmwf:*";
exclude = adhocDefName;
response = sendRequest(new GetRequest(URL_WORKFLOW_DEFINITIONS + "?exclude=" + exclude), 200);
assertEquals(Status.STATUS_OK, response.getStatus());
json = new JSONObject(response.getContentAsString());
@@ -831,7 +831,6 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
assertNotNull(results);
adhocWorkflowPresent = false;
boolean wcmWorkflowsPresent = false;
for (int i = 0; i < results.length(); i++)
{
JSONObject workflowDefinitionJSON = results.getJSONObject(i);
@@ -841,14 +840,9 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
{
adhocWorkflowPresent = true;
}
if (name.startsWith("jbpm$wcmwf:"))
{
wcmWorkflowsPresent = true;
}
}
assertFalse("Found adhoc workflow when it was supposed to be excluded", adhocWorkflowPresent);
assertFalse("Found a WCM workflow when they were supposed to be excluded", wcmWorkflowsPresent);
}
public void testWorkflowDefinitionGet() throws Exception