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

Merge DEV/BELARUS/HEAD-2010_02_22 to HEAD

Browse Source 
18845 : SAIL-200: Enhance webscript (Get all folder rules for folder) with inherited, linked rules



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18870 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2010-02-26 05:10:46 +00:00
parent b8ac2b0736
commit 1ac8cad3aa
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/java/org/alfresco/repo/web/scripts/rule/RuleServiceTest.java
View File

@@ -28,8 +28,10 @@ import java.text.MessageFormat;
import java.util.List; import java.util.List;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.rule.LinkRules;
import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.web.scripts.BaseWebScriptTest; import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ActionService; import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.action.ParameterConstraint; import org.alfresco.service.cmr.action.ParameterConstraint;
import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileFolderService;
@@ -281,7 +283,8 @@ public class RuleServiceTest extends BaseWebScriptTest
assertEquals(before.has("url"), after.has("url")); assertEquals(before.has("url"), after.has("url"));
} }
private void checkRuleset(JSONObject result, int rulesCount, String[] ruleIds, int inhRulesCount, String[] parentRuleIds) throws Exception private void checkRuleset(JSONObject result, int rulesCount, String[] ruleIds, int inhRulesCount, String[] parentRuleIds,
boolean isLinkedFrom, boolean isLinkedTo) throws Exception
{ {
assertNotNull("Response is null.", result); assertNotNull("Response is null.", result);
@@ -333,6 +336,10 @@ public class RuleServiceTest extends BaseWebScriptTest
} }
} }
assertEquals(isLinkedTo, data.has("linkedToRuleSet"));
assertEquals(isLinkedFrom, data.has("linkedFromRuleSets"));
assertTrue(data.has("url")); assertTrue(data.has("url"));
} }
@@ -610,10 +617,19 @@ public class RuleServiceTest extends BaseWebScriptTest
JSONObject jsonRule = createRule(testNodeRef); JSONObject jsonRule = createRule(testNodeRef);
String[] ruleIds = new String[] { jsonRule.getJSONObject("data").getString("id") }; String[] ruleIds = new String[] { jsonRule.getJSONObject("data").getString("id") };
Response response = sendRequest(new GetRequest(formatRulesetUrl(testNodeRef)), 200); Action linkRulesAction = actionService.createAction(LinkRules.NAME);
JSONObject result = new JSONObject(response.getContentAsString()); linkRulesAction.setParameterValue(LinkRules.PARAM_LINK_FROM_NODE, testNodeRef);
actionService.executeAction(linkRulesAction, testNodeRef2);
checkRuleset(result, 1, ruleIds, 1, parentRuleIds); Response linkedFromResponse = sendRequest(new GetRequest(formatRulesetUrl(testNodeRef)), 200);
JSONObject linkedFromResult = new JSONObject(linkedFromResponse.getContentAsString());
checkRuleset(linkedFromResult, 1, ruleIds, 1, parentRuleIds, true, false);
Response linkedToResponse = sendRequest(new GetRequest(formatRulesetUrl(testNodeRef2)), 200);
JSONObject linkedToResult = new JSONObject(linkedToResponse.getContentAsString());
checkRuleset(linkedToResult, 1, ruleIds, 1, parentRuleIds, false, true);
} }
public void testGetRuleDetails() throws Exception public void testGetRuleDetails() throws Exception