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%2Fshardstrategy%2FModuleShardStrategyTest.java;h=fd42b6287c7bac04e83553de8242b636c640b428;hb=ccca30bbb1545643c427fc59c23329c5d49f8d4b;hp=3394cdc959757e167cb71988cf3d8e208fde041d;hpb=f4b583dd481d8db60c894690a6c9189922f360a9;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategyTest.java
index 3394cdc959..fd42b6287c 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategyTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardstrategy/ModuleShardStrategyTest.java
@@ -1,53 +1,47 @@
+/*
+ * 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
+ */
 package org.opendaylight.controller.cluster.datastore.shardstrategy;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.opendaylight.controller.cluster.datastore.Configuration;
-import org.opendaylight.controller.cluster.datastore.ConfigurationImpl;
+import org.opendaylight.controller.cluster.datastore.config.Configuration;
+import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl;
 import org.opendaylight.controller.md.cluster.datastore.model.CarsModel;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
-import static junit.framework.Assert.assertEquals;
-
 public class ModuleShardStrategyTest {
-    @Rule
-    public ExpectedException expectedEx = ExpectedException.none();
-
     private static Configuration configuration;
 
     @BeforeClass
-    public static void setUpClass(){
+    public static void setUpClass() {
         configuration = new ConfigurationImpl("module-shards.conf", "modules.conf");
     }
 
-
     @Test
-    public void testFindShard() throws Exception {
-        ModuleShardStrategy moduleShardStrategy =
-            new ModuleShardStrategy("cars", configuration);
-
+    public void testFindShard() {
+        ModuleShardStrategy moduleShardStrategy = new ModuleShardStrategy("cars", configuration);
         String shard = moduleShardStrategy.findShard(CarsModel.BASE_PATH);
-
         assertEquals("cars-1", shard);
     }
 
     @Test
     public void testFindShardWhenModuleConfigurationPresentInModulesButMissingInModuleShards() {
+        final QName baseQName = QName.create(
+                "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test:missing", "2014-03-13",
+                "missing");
 
-        final QName BASE_QNAME = QName.create("urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test:missing", "2014-03-13",
-            "missing");
-
-        final YangInstanceIdentifier BASE_PATH = YangInstanceIdentifier.of(BASE_QNAME);
-
-        ModuleShardStrategy moduleShardStrategy =
-            new ModuleShardStrategy("missing", configuration);
+        final YangInstanceIdentifier BASE_PATH = YangInstanceIdentifier.of(baseQName);
 
+        ModuleShardStrategy moduleShardStrategy = new ModuleShardStrategy("missing", configuration);
         String shard = moduleShardStrategy.findShard(BASE_PATH);
-
         assertEquals(DefaultShardStrategy.DEFAULT_SHARD, shard);
-
     }
 }