Merge pull request #2 from Acosix/ALF-21849

Fix for ALF-21849
This commit is contained in:
aforascu
2017-09-12 10:25:11 +03:00
committed by GitHub
2 changed files with 49 additions and 22 deletions

View File

@@ -139,7 +139,7 @@ public class DynamicNamespacePrefixResolver implements NamespaceService
{ {
uris.addAll(delegate.getURIs()); uris.addAll(delegate.getURIs());
} }
uris.addAll(map.keySet()); uris.addAll(map.values());
return uris; return uris;
} }
} }

View File

@@ -25,6 +25,8 @@
*/ */
package org.alfresco.service.namespace; package org.alfresco.service.namespace;
import java.util.Collection;
import junit.framework.TestCase; import junit.framework.TestCase;
public class DynamicNameSpaceResolverTest extends TestCase public class DynamicNameSpaceResolverTest extends TestCase
@@ -113,9 +115,34 @@ public class DynamicNameSpaceResolverTest extends TestCase
public void testGetters() public void testGetters()
{ {
DynamicNamespacePrefixResolver dnpr = new DynamicNamespacePrefixResolver(new QNameTest.MockNamespacePrefixResolver()); DynamicNamespacePrefixResolver dnpr = new DynamicNamespacePrefixResolver(new QNameTest.MockNamespacePrefixResolver());
assertNotNull(dnpr.getPrefixes());
assertNotNull(dnpr.getURIs()); dnpr.registerNamespace("one", "http:/namespace/one");
assertNotNull(new DynamicNamespacePrefixResolver()); dnpr.registerNamespace("two", "http:/namespace/two");
dnpr.registerNamespace("three", "http:/namespace/three");
dnpr.registerNamespace("oneagain", "http:/namespace/one");
dnpr.registerNamespace("four", "http:/namespace/one");
dnpr.registerNamespace("four", "http:/namespace/four");
dnpr.registerNamespace("five", "http:/namespace/five");
dnpr.registerNamespace("six", "http:/namespace/six");
Collection<String> prefixes = dnpr.getPrefixes();
assertNotNull(prefixes);
assertTrue(prefixes.contains("one"));
assertTrue(prefixes.contains("two"));
assertTrue(prefixes.contains("three"));
assertTrue(prefixes.contains("four"));
assertTrue(prefixes.contains("five"));
assertTrue(prefixes.contains("six"));
assertTrue(prefixes.contains("oneagain"));
Collection<String> uris = dnpr.getURIs();
assertNotNull(uris);
assertTrue(uris.contains("http:/namespace/one"));
assertTrue(uris.contains("http:/namespace/two"));
assertTrue(uris.contains("http:/namespace/three"));
assertTrue(uris.contains("http:/namespace/four"));
assertTrue(uris.contains("http:/namespace/five"));
assertTrue(uris.contains("http:/namespace/six"));
} }
} }