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

Partially applied patch from ETHREEOH-2145 to resolve combining issue in JSF client config

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2009-06-03 09:44:15 +00:00
parent 35d40aa9cf
commit 67971c3851
6 changed files with 83 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/java/org/alfresco/web/config/WebClientConfigTest.java
View File

@@ -33,6 +33,7 @@ import org.alfresco.config.Config;
import org.alfresco.config.ConfigElement;
import org.alfresco.config.ConfigException;
import org.alfresco.config.xml.XMLConfigService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.BaseTest;
import org.alfresco.web.config.ActionsConfigElement.ActionDefinition;
import org.alfresco.web.config.ActionsConfigElement.ActionGroup;
@@ -321,6 +322,10 @@ public class WebClientConfigTest extends BaseTest
assertEquals("recent spaces", 1, clientConfig.getRecentSpacesItems());
assertEquals("search minimum", 10, clientConfig.getSearchMinimum());
assertFalse("shelf visible", clientConfig.isShelfVisible());
List<QName> attrs = clientConfig.getSimpleSearchAdditionalAttributes();
assertNotNull("Expecting a list of search attributes", attrs);
assertEquals("Expecting 4 search attributes", 4, attrs.size());
}
/**
@@ -895,4 +900,25 @@ public class WebClientConfigTest extends BaseTest
assertEquals("number of items in new_group group", 1, actions.size());
assertEquals("action", "custom_action", actions.get(0));
}
public void testETHREEOH2145()
{
XMLConfigService svc = initXMLConfigService("test-config.xml", "test-config-e30-2145.xml");
// get the "client" config from global config section
Config cfg = svc.getGlobalConfig();
assertNotNull("cfg should not be null", cfg);
ClientConfigElement clientConfig = (ClientConfigElement)cfg.getConfigElement("client");
assertNotNull("clientConfig should not be null", clientConfig);
assertEquals("from-email-address", "alfresco@alfresco.org", clientConfig.getFromEmailAddress());
assertEquals("cifs-url-suffix", ".alfresco.org", clientConfig.getCifsURLSuffix());
assertEquals("edit-link-type", "http", clientConfig.getEditLinkType());
assertEquals("error-page", "/jsp/error.jsp", clientConfig.getErrorPage());
assertEquals("home-space-permission", "Consumer", clientConfig.getHomeSpacePermission());
List<QName> attrs = clientConfig.getSimpleSearchAdditionalAttributes();
assertNotNull("Expecting a list of search attributes", attrs);
assertEquals("Expecting 2 search attributes", 2, attrs.size());
}
}