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

77154: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74004: ACE-1802 "MT / Cloud Restrict namespace URI of dynamic models."
      ACE-955 "Custom Content Models in Cloud"
      fix tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78012 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 16:03:56 +00:00
parent 1b4155add7
commit ece83f5410
4 changed files with 50 additions and 77 deletions

View File

@@ -24,7 +24,7 @@ import java.util.List;
import junit.framework.TestCase;
import org.alfresco.repo.cache.NullCache;
import org.alfresco.repo.cache.MemoryCache;
import org.alfresco.repo.dictionary.DictionaryBootstrap;
import org.alfresco.repo.dictionary.DictionaryComponent;
import org.alfresco.repo.dictionary.DictionaryDAOImpl;
@@ -77,11 +77,11 @@ public class PolicyComponentTest extends TestCase
policyComponent = new PolicyComponentImpl(dictionary);
}
@SuppressWarnings("unchecked")
@SuppressWarnings({ "unchecked", "rawtypes" })
private void initDictionaryCaches(DictionaryDAOImpl dictionaryDAO)
{
// note: unit tested here with null cache
dictionaryDAO.setDictionaryRegistryCache(new NullCache());
dictionaryDAO.setDictionaryRegistryCache(new MemoryCache());
}
public void testJavaBehaviour()