Daily merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-12 20:22:46 +00:00
parent 1250a0352c
commit 1dd2a7b72b
67 changed files with 1364 additions and 389 deletions

View File

@@ -18,6 +18,7 @@ package org.alfresco.web.config;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -27,6 +28,8 @@ import org.alfresco.config.ConfigException;
import org.alfresco.config.source.FileConfigSource;
import org.alfresco.config.xml.XMLConfigService;
import org.alfresco.util.BaseTest;
import org.alfresco.web.config.ActionsConfigElement.ActionDefinition;
import org.alfresco.web.config.ActionsConfigElement.ActionGroup;
import org.alfresco.web.config.AdvancedSearchConfigElement.CustomProperty;
import org.alfresco.web.config.DialogsConfigElement.DialogConfig;
import org.alfresco.web.config.PropertySheetConfigElement.ItemConfig;
@@ -653,6 +656,7 @@ public class WebClientConfigTest extends BaseTest
assertEquals("icon", "/images/icons/create_space_large.gif", dialog.getIcon());
assertEquals("title-id", "create_space_title", dialog.getTitleId());
assertEquals("description-id", "create_space_description", dialog.getDescriptionId());
assertEquals("error-message-id", "error_create_space_dialog", dialog.getErrorMessageId());
assertNull("title should be null", dialog.getTitle());
assertNull("description should be null", dialog.getDescription());
@@ -668,6 +672,7 @@ public class WebClientConfigTest extends BaseTest
assertEquals("icon", "/images/icons/create_space_large.gif", dialog.getIcon());
assertEquals("title", "Space Details Dialog", dialog.getTitle());
assertEquals("description", "Space Details Dialog Decsription", dialog.getDescription());
assertEquals("error-message-id", "error_dialog", dialog.getErrorMessageId());
assertNull("title-id should be null", dialog.getTitleId());
assertNull("description-id should be null", dialog.getDescriptionId());
}
@@ -738,6 +743,7 @@ public class WebClientConfigTest extends BaseTest
assertEquals("icon", "/images/icons/example-logo.gif", wizard.getIcon());
assertEquals("title", "Example Wizard Title", wizard.getTitle());
assertEquals("description", "Example Wizard Description", wizard.getDescription());
assertEquals("error-message-id", "error_wizard", wizard.getErrorMessageId());
assertNull("title-id should be null", wizard.getTitleId());
assertNull("description-id should be null", wizard.getDescriptionId());
@@ -757,6 +763,7 @@ public class WebClientConfigTest extends BaseTest
assertEquals("icon", "/images/icons/create_space_large.gif", wizard.getIcon());
assertEquals("title-id", "advanced_space_details_title", wizard.getTitleId());
assertEquals("description-id", "advanced_space_details_description", wizard.getDescriptionId());
assertEquals("error-message-id", "error_create_space_wizard", wizard.getErrorMessageId());
assertNull("title should be null", wizard.getTitle());
assertNull("description should be null", wizard.getDescription());
List<StepConfig> steps = wizard.getStepsAsList();
@@ -815,4 +822,109 @@ public class WebClientConfigTest extends BaseTest
assertNull("step 3 title should be null", step3Page.getTitle());
assertNull("step 3 description should be null", step3Page.getDescription());
}
public void testActions()
{
// setup the config service
String configFile = getResourcesDir() + "test-config.xml";
XMLConfigService svc = new XMLConfigService(new FileConfigSource(configFile));
svc.init();
// get the "Actions" config
Config cfg = svc.getGlobalConfig();
assertNotNull("cfg should not be null", cfg);
// get the <actions> config element
ActionsConfigElement actionsConfig = (ActionsConfigElement)cfg.
getConfigElement(ActionsConfigElement.CONFIG_ELEMENT_ID);
assertNotNull("actions config element should not be null", actionsConfig);
// get the individual actions
ActionDefinition docDetails = actionsConfig.getActionDefinition("details_doc");
assertNotNull("details_doc action definition should not be null", docDetails);
assertEquals("details_doc action", "dialog:showDocDetails", docDetails.Action);
ActionDefinition spaceDetails = actionsConfig.getActionDefinition("details_space");
assertNotNull("details_space action definition should not be null", spaceDetails);
assertEquals("details_space action", "dialog:showSpaceDetails", spaceDetails.Action);
// get the action group
ActionGroup group = actionsConfig.getActionGroup("document_browse");
assertNotNull("group definition should not be null", group);
assertFalse("showLink for document_browse group should be false", group.ShowLink);
for (String actionId : group)
{
if (actionId.equals("details_doc") == false &&
actionId.equals("details_space") == false)
{
fail("Unrecognised action-id '" + actionId + "' in action group '" + group.getId() + "'");
}
}
}
public void testActionsOverriding()
{
// setup the config service
List<String> configFiles = new ArrayList<String>(2);
configFiles.add(getResourcesDir() + "test-config.xml");
configFiles.add(getResourcesDir() + "test-config-override.xml");
XMLConfigService svc = new XMLConfigService(new FileConfigSource(configFiles));
svc.init();
// get the "Actions" config
Config cfg = svc.getConfig("Actions Override");
assertNotNull("cfg should not be null", cfg);
// get the <actions> config element
ActionsConfigElement actionsConfig = (ActionsConfigElement)cfg.
getConfigElement(ActionsConfigElement.CONFIG_ELEMENT_ID);
assertNotNull("actions config element should not be null", actionsConfig);
// get the individual actions
ActionDefinition docDetails = actionsConfig.getActionDefinition("details_doc");
assertNotNull("details_doc action definition should not be null", docDetails);
assertEquals("details_doc action", "dialog:showCustomDocDetails", docDetails.Action);
ActionDefinition spaceDetails = actionsConfig.getActionDefinition("details_space");
assertNotNull("details_space action definition should not be null", spaceDetails);
assertEquals("details_space action", "dialog:showSpaceDetails", spaceDetails.Action);
ActionDefinition customAction = actionsConfig.getActionDefinition("custom_action");
assertNotNull("custom_action action definition should not be null", customAction);
assertEquals("custom_action action", "customAction", customAction.Action);
// get the document_browse action group
ActionGroup group = actionsConfig.getActionGroup("document_browse");
assertNotNull("group definition should not be null", group);
assertTrue("showLink for document_browse group should be true", group.ShowLink);
assertEquals("document_browse group style class", "inlineAction", group.StyleClass);
assertNull("Style for document_browse group should be null", group.Style);
// make sure there are 2 items (as one was hidden in the override)
ArrayList<String> actions = new ArrayList<String>(3);
for (String actionId : group)
{
actions.add(actionId);
}
assertEquals("number of items in document_browse group", 2, actions.size());
// make sure they are in the correct order
assertEquals("first action", "details_doc", actions.get(0));
assertEquals("second action", "custom_action", actions.get(1));
// get the new_group action group
ActionGroup newGroup = actionsConfig.getActionGroup("new_group");
assertNotNull("new_group definition should not be null", newGroup);
// make sure there is only 1 item and it's id is correct
actions = new ArrayList<String>(1);
for (String actionId : newGroup)
{
actions.add(actionId);
}
assertEquals("number of items in new_group group", 1, actions.size());
assertEquals("action", "custom_action", actions.get(0));
}
}