X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fshardstrategy%2FModuleShardStrategyTest.java;fp=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fshardstrategy%2FModuleShardStrategyTest.java;h=fd42b6287c7bac04e83553de8242b636c640b428;hp=036e881166883730cf012e67e04b2c811c9bf8c9;hb=4e991c7dc07090690a29b20c962b24ee4dd1f157;hpb=c4a5044acac899561cf0a2a211e5f3e6128b456c 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 036e881166..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 @@ -5,15 +5,12 @@ * 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.config.Configuration; import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl; import org.opendaylight.controller.md.cluster.datastore.model.CarsModel; @@ -21,9 +18,6 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; public class ModuleShardStrategyTest { - @Rule - public ExpectedException expectedEx = ExpectedException.none(); - private static Configuration configuration; @BeforeClass @@ -31,14 +25,10 @@ public class ModuleShardStrategyTest { configuration = new ConfigurationImpl("module-shards.conf", "modules.conf"); } - @Test public void testFindShard() { - ModuleShardStrategy moduleShardStrategy = - new ModuleShardStrategy("cars", configuration); - + ModuleShardStrategy moduleShardStrategy = new ModuleShardStrategy("cars", configuration); String shard = moduleShardStrategy.findShard(CarsModel.BASE_PATH); - assertEquals("cars-1", shard); } @@ -50,12 +40,8 @@ public class ModuleShardStrategyTest { final YangInstanceIdentifier BASE_PATH = YangInstanceIdentifier.of(baseQName); - ModuleShardStrategy moduleShardStrategy = - new ModuleShardStrategy("missing", configuration); - + ModuleShardStrategy moduleShardStrategy = new ModuleShardStrategy("missing", configuration); String shard = moduleShardStrategy.findShard(BASE_PATH); - assertEquals(DefaultShardStrategy.DEFAULT_SHARD, shard); - } }