X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fconfig%2FConfigurationImplTest.java;h=68bad4f4c02076bc4f5aa5b09017373d87554935;hb=2faf656bf68dd3843fd59520b27a7ec2abbdcc68;hp=a2f01c377e9a48f3dd4a19092f0d241aefede959;hpb=60dbe8adeda3af724255231af9400341b17953b9;p=controller.git

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 a2f01c377e..68bad4f4c0 100644
--- 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
@@ -11,6 +11,7 @@ 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;
@@ -19,45 +20,52 @@ import java.util.Set;
 import org.junit.Assert;
 import org.junit.Before;
 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;
 
 public class ConfigurationImplTest {
+    private static final MemberName MEMBER_1 = MemberName.forName("member-1");
+    private static final MemberName MEMBER_2 = MemberName.forName("member-2");
+    private static final MemberName MEMBER_3 = MemberName.forName("member-3");
+    private static final MemberName MEMBER_4 = MemberName.forName("member-4");
+    private static final MemberName MEMBER_5 = MemberName.forName("member-5");
+    private static final MemberName MEMBER_100 = MemberName.forName("member-100");
 
     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(){
-        Collection<String> memberShardNames = configuration.getMemberShardNames("member-1");
+    public void testGetMemberShardNames() {
+        Collection<String> memberShardNames = configuration.getMemberShardNames(MEMBER_1);
         assertEquals("getMemberShardNames", ImmutableSortedSet.of("people-1", "cars-1", "test-1", "default"),
                 ImmutableSortedSet.copyOf(memberShardNames));
 
-        memberShardNames = configuration.getMemberShardNames("member-2");
+        memberShardNames = configuration.getMemberShardNames(MEMBER_2);
         assertEquals("getMemberShardNames", ImmutableSortedSet.of("default"),
                 ImmutableSortedSet.copyOf(memberShardNames));
 
-        memberShardNames = configuration.getMemberShardNames("member-100");
+        memberShardNames = configuration.getMemberShardNames(MEMBER_100);
         assertEquals("getMemberShardNames size", 0, memberShardNames.size());
     }
 
     @Test
-    public void testGetMembersFromShardName(){
-        Collection<String> members = configuration.getMembersFromShardName("default");
-        assertEquals("getMembersFromShardName", ImmutableSortedSet.of("member-1", "member-2", "member-3"),
+    public void testGetMembersFromShardName() {
+        Collection<MemberName> members = configuration.getMembersFromShardName("default");
+        assertEquals("getMembersFromShardName", ImmutableSortedSet.of(MEMBER_1, MEMBER_2, MEMBER_3),
                 ImmutableSortedSet.copyOf(members));
 
         members = configuration.getMembersFromShardName("cars-1");
-        assertEquals("getMembersFromShardName", ImmutableSortedSet.of("member-1"),
+        assertEquals("getMembersFromShardName", ImmutableSortedSet.of(MEMBER_1),
                 ImmutableSortedSet.copyOf(members));
 
         // Try to find a shard which is not present
@@ -67,7 +75,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));
@@ -122,17 +130,17 @@ public class ConfigurationImplTest {
         String moduleName = "oven";
         String shardName = "oven-shard";
         String shardStrategyName = ModuleShardStrategy.NAME;
-        Collection<String> shardMemberNames = ImmutableSortedSet.of("member-1", "member-4", "member-5");
+        Collection<MemberName> shardMemberNames = ImmutableSortedSet.of(MEMBER_1, MEMBER_4, MEMBER_5);
 
         configuration.addModuleShardConfiguration(new ModuleShardConfiguration(namespace, moduleName, shardName,
                 shardStrategyName, shardMemberNames));
 
         assertEquals("getMemberShardNames", ImmutableSortedSet.of("people-1", "cars-1", "test-1", "default", shardName),
-                ImmutableSortedSet.copyOf(configuration.getMemberShardNames("member-1")));
+                ImmutableSortedSet.copyOf(configuration.getMemberShardNames(MEMBER_1)));
         assertEquals("getMemberShardNames", ImmutableSortedSet.of(shardName),
-                ImmutableSortedSet.copyOf(configuration.getMemberShardNames("member-4")));
+                ImmutableSortedSet.copyOf(configuration.getMemberShardNames(MEMBER_4)));
         assertEquals("getMemberShardNames", ImmutableSortedSet.of(shardName),
-                ImmutableSortedSet.copyOf(configuration.getMemberShardNames("member-5")));
+                ImmutableSortedSet.copyOf(configuration.getMemberShardNames(MEMBER_5)));
         assertEquals("getMembersFromShardName", shardMemberNames,
                 ImmutableSortedSet.copyOf(configuration.getMembersFromShardName(shardName)));
         assertEquals("getShardNameForModule", shardName, configuration.getShardNameForModule(moduleName));
@@ -148,22 +156,22 @@ public class ConfigurationImplTest {
 
     @Test
     public void testGetUniqueMemberNamesForAllShards() {
-        assertEquals("getUniqueMemberNamesForAllShards", Sets.newHashSet("member-1", "member-2", "member-3"),
+        assertEquals("getUniqueMemberNamesForAllShards", Sets.newHashSet(MEMBER_1, MEMBER_2, MEMBER_3),
                 configuration.getUniqueMemberNamesForAllShards());
     }
 
     @Test
     public void testAddMemberReplicaForShard() {
-        configuration.addMemberReplicaForShard("people-1", "member-2");
+        configuration.addMemberReplicaForShard("people-1", MEMBER_2);
         String shardName = configuration.getShardNameForModule("people");
         assertEquals("ModuleShardName", "people-1", shardName);
         ShardStrategy shardStrategy = configuration.getStrategyForModule("people");
         assertEquals("ModuleStrategy", ModuleShardStrategy.class, shardStrategy.getClass());
-        Collection<String> members = configuration.getMembersFromShardName("people-1");
-        assertEquals("Members", ImmutableSortedSet.of("member-1", "member-2"),
+        Collection<MemberName> members = configuration.getMembersFromShardName("people-1");
+        assertEquals("Members", ImmutableSortedSet.of(MEMBER_1, MEMBER_2),
             ImmutableSortedSet.copyOf(members));
 
-        configuration.addMemberReplicaForShard("non-existent", "member-2");
+        configuration.addMemberReplicaForShard("non-existent", MEMBER_2);
         Set<String> shardNames = configuration.getAllShardNames();
         assertEquals("ShardNames", ImmutableSortedSet.of("people-1", "cars-1", "test-1", "default"),
             ImmutableSortedSet.copyOf(shardNames));
@@ -171,16 +179,16 @@ public class ConfigurationImplTest {
 
     @Test
     public void testRemoveMemberReplicaForShard() {
-        configuration.removeMemberReplicaForShard("default", "member-2");
+        configuration.removeMemberReplicaForShard("default", MEMBER_2);
         String shardName = configuration.getShardNameForModule("default");
         assertEquals("ModuleShardName", "default", shardName);
         ShardStrategy shardStrategy = configuration.getStrategyForModule("default");
         assertNull("ModuleStrategy", shardStrategy);
-        Collection<String> members = configuration.getMembersFromShardName("default");
-        assertEquals("Members", ImmutableSortedSet.of("member-1", "member-3"),
+        Collection<MemberName> members = configuration.getMembersFromShardName("default");
+        assertEquals("Members", ImmutableSortedSet.of(MEMBER_1, MEMBER_3),
             ImmutableSortedSet.copyOf(members));
 
-        configuration.removeMemberReplicaForShard("non-existent", "member-2");
+        configuration.removeMemberReplicaForShard("non-existent", MEMBER_2);
         Set<String> shardNames = configuration.getAllShardNames();
         assertEquals("ShardNames", ImmutableSortedSet.of("people-1", "cars-1", "test-1", "default"),
             ImmutableSortedSet.copyOf(shardNames));