Bump odlparent/yangtools/mdsal

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / config / ConfigurationImplTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplTest.java
index f4ba78e7aabf1875a545c21e7d55c1554b0e9d84..1b13be7c8d2dcd8e8d9a5104266f88386d9b0260 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImplTest.java
@@ -5,15 +5,14 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.cluster.datastore.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Sets;
-import java.net.URI;
 import java.util.Collection;
 import java.util.Set;
 import org.junit.Assert;
@@ -22,6 +21,7 @@ import org.junit.Test;
 import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.controller.cluster.datastore.shardstrategy.ModuleShardStrategy;
 import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
 
 public class ConfigurationImplTest {
     private static final MemberName MEMBER_1 = MemberName.forName("member-1");
@@ -34,17 +34,17 @@ public class ConfigurationImplTest {
     private ConfigurationImpl configuration;
 
     @Before
-    public void setup(){
+    public void setup() {
         configuration = new ConfigurationImpl("module-shards.conf", "modules.conf");
     }
 
     @Test
-    public void testConstructor(){
+    public void testConstructor() {
         Assert.assertNotNull(configuration);
     }
 
     @Test
-    public void testGetMemberShardNames(){
+    public void testGetMemberShardNames() {
         Collection<String> memberShardNames = configuration.getMemberShardNames(MEMBER_1);
         assertEquals("getMemberShardNames", ImmutableSortedSet.of("people-1", "cars-1", "test-1", "default"),
                 ImmutableSortedSet.copyOf(memberShardNames));
@@ -58,7 +58,7 @@ public class ConfigurationImplTest {
     }
 
     @Test
-    public void testGetMembersFromShardName(){
+    public void testGetMembersFromShardName() {
         Collection<MemberName> members = configuration.getMembersFromShardName("default");
         assertEquals("getMembersFromShardName", ImmutableSortedSet.of(MEMBER_1, MEMBER_2, MEMBER_3),
                 ImmutableSortedSet.copyOf(members));
@@ -74,7 +74,7 @@ public class ConfigurationImplTest {
     }
 
     @Test
-    public void testGetAllShardNames(){
+    public void testGetAllShardNames() {
         Set<String> allShardNames = configuration.getAllShardNames();
         assertEquals("getAllShardNames", ImmutableSortedSet.of("people-1", "cars-1", "test-1", "default"),
                 ImmutableSortedSet.copyOf(allShardNames));
@@ -125,7 +125,7 @@ public class ConfigurationImplTest {
 
     @Test
     public void testAddModuleShardConfiguration() throws Exception {
-        URI namespace = new URI("urn:opendaylight:test:oven");
+        XMLNamespace namespace = XMLNamespace.of("urn:opendaylight:test:oven");
         String moduleName = "oven";
         String shardName = "oven-shard";
         String shardStrategyName = ModuleShardStrategy.NAME;
@@ -144,7 +144,7 @@ public class ConfigurationImplTest {
                 ImmutableSortedSet.copyOf(configuration.getMembersFromShardName(shardName)));
         assertEquals("getShardNameForModule", shardName, configuration.getShardNameForModule(moduleName));
         assertEquals("getModuleNameFromNameSpace", moduleName,
-                configuration.getModuleNameFromNameSpace(namespace.toASCIIString()));
+                configuration.getModuleNameFromNameSpace(namespace.toString()));
         assertEquals("getAllShardNames", ImmutableSortedSet.of("people-1", "cars-1", "test-1", "default", shardName),
                 ImmutableSortedSet.copyOf(configuration.getAllShardNames()));