BUG-5626: Eliminate ShardIdentifier.Builder

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifierTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifierTest.java
index 0b5e7132c77791cab3e2c4276fe1fb966bb6445e..60e4539da8940b4fb8376c758d7c4ff36b27ae35 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifierTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifierTest.java
@@ -1,15 +1,22 @@
-package org.opendaylight.controller.cluster.datastore.identifiers;
+/*
+ * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 
-import org.junit.Test;
+package org.opendaylight.controller.cluster.datastore.identifiers;
 
 import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.opendaylight.controller.cluster.access.concepts.MemberName;
 
 public class ShardIdentifierTest {
 
     @Test
     public void testBasic(){
-        ShardIdentifier id = ShardIdentifier.builder().memberName("member-1")
-            .shardName("inventory").type("config").build();
+        ShardIdentifier id = ShardIdentifier.create("inventory", MemberName.forName("member-1"), "config");
 
         assertEquals("member-1-shard-inventory-config", id.toString());
     }
@@ -18,9 +25,9 @@ public class ShardIdentifierTest {
     public void testFromShardIdString(){
         String shardIdStr = "member-1-shard-inventory-config";
 
-        ShardIdentifier id = ShardIdentifier.builder().fromShardIdString(shardIdStr).build();
+        ShardIdentifier id = ShardIdentifier.fromShardIdString(shardIdStr);
 
-        assertEquals("member-1", id.getMemberName());
+        assertEquals("member-1", id.getMemberName().getName());
         assertEquals("inventory", id.getShardName());
         assertEquals("config", id.getType());
     }