Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
akka.actor.provider set to 'cluster'
[controller.git]
/
opendaylight
/
md-sal
/
sal-remoterpc-connector
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
remote
/
rpc
/
registry
/
mbeans
/
RemoteRpcRegistryMXBeanImplTest.java
diff --git
a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java
b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java
index dea930bf85ba145fad440b3ea663e0c1ca27fa3b..282b7b5ee49371df7884a9002f5e50c581e8efec 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java
@@
-7,6
+7,12
@@
*/
package org.opendaylight.controller.remote.rpc.registry.mbeans;
*/
package org.opendaylight.controller.remote.rpc.registry.mbeans;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import akka.actor.Props;
@@
-15,28
+21,25
@@
import akka.testkit.TestActorRef;
import akka.testkit.javadsl.TestKit;
import akka.util.Timeout;
import com.google.common.collect.Lists;
import akka.testkit.javadsl.TestKit;
import akka.util.Timeout;
import com.google.common.collect.Lists;
+import com.typesafe.config.ConfigFactory;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.Before;
import org.junit.Test;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier;
-import org.opendaylight.controller.remote.rpc.RemoteRpcProviderConfig;
+import org.opendaylight.controller.remote.rpc.RemoteOpsProviderConfig;
import org.opendaylight.controller.remote.rpc.registry.RpcRegistry;
import org.opendaylight.controller.remote.rpc.registry.gossip.BucketStoreAccess;
import org.opendaylight.controller.remote.rpc.registry.RpcRegistry;
import org.opendaylight.controller.remote.rpc.registry.gossip.BucketStoreAccess;
+import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
public class RemoteRpcRegistryMXBeanImplTest {
public class RemoteRpcRegistryMXBeanImplTest {
-
private static final QName LOCAL_QNAME = QName.create("base", "local");
private static final QName LOCAL_QNAME = QName.create("base", "local");
- private static final SchemaPath EMPTY_SCHEMA_PATH = SchemaPath.ROOT;
- private static final SchemaPath LOCAL_SCHEMA_PATH = SchemaPath.create(true, LOCAL_QNAME);
+ private static final QName REMOTE_QNAME = QName.create("base", "remote");
private ActorSystem system;
private TestActorRef<RpcRegistry> testActor;
private ActorSystem system;
private TestActorRef<RpcRegistry> testActor;
@@
-44,17
+47,17
@@
public class RemoteRpcRegistryMXBeanImplTest {
private RemoteRpcRegistryMXBeanImpl mxBean;
@Before
private RemoteRpcRegistryMXBeanImpl mxBean;
@Before
- public void setUp()
throws Exception
{
- system = ActorSystem.create("test");
+ public void setUp() {
+ system = ActorSystem.create("test"
, ConfigFactory.load().getConfig("unit-test")
);
final DOMRpcIdentifier emptyRpcIdentifier = DOMRpcIdentifier.create(
final DOMRpcIdentifier emptyRpcIdentifier = DOMRpcIdentifier.create(
-
EMPTY_SCHEMA_PATH, YangInstanceIdentifier.EMPTY
);
+
REMOTE_QNAME, YangInstanceIdentifier.empty()
);
final DOMRpcIdentifier localRpcIdentifier = DOMRpcIdentifier.create(
final DOMRpcIdentifier localRpcIdentifier = DOMRpcIdentifier.create(
- LOCAL_
SCHEMA_PATH
, YangInstanceIdentifier.of(LOCAL_QNAME));
+ LOCAL_
QNAME
, YangInstanceIdentifier.of(LOCAL_QNAME));
buckets = Lists.newArrayList(emptyRpcIdentifier, localRpcIdentifier);
buckets = Lists.newArrayList(emptyRpcIdentifier, localRpcIdentifier);
- final Remote
RpcProviderConfig config = new RemoteRpc
ProviderConfig.Builder("system").build();
+ final Remote
OpsProviderConfig config = new RemoteOps
ProviderConfig.Builder("system").build();
final TestKit invoker = new TestKit(system);
final TestKit registrar = new TestKit(system);
final TestKit supervisor = new TestKit(system);
final TestKit invoker = new TestKit(system);
final TestKit registrar = new TestKit(system);
final TestKit supervisor = new TestKit(system);
@@
-68,98
+71,97
@@
public class RemoteRpcRegistryMXBeanImplTest {
}
@After
}
@After
- public void tearDown()
throws Exception
{
+ public void tearDown() {
TestKit.shutdownActorSystem(system, Boolean.TRUE);
}
@Test
TestKit.shutdownActorSystem(system, Boolean.TRUE);
}
@Test
- public void testGetGlobalRpcEmptyBuckets()
throws Exception
{
+ public void testGetGlobalRpcEmptyBuckets() {
final Set<String> globalRpc = mxBean.getGlobalRpc();
final Set<String> globalRpc = mxBean.getGlobalRpc();
-
Assert.
assertNotNull(globalRpc);
-
Assert.
assertTrue(globalRpc.isEmpty());
+ assertNotNull(globalRpc);
+ assertTrue(globalRpc.isEmpty());
}
@Test
}
@Test
- public void testGetGlobalRpc()
throws Exception
{
+ public void testGetGlobalRpc() {
testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender());
final Set<String> globalRpc = mxBean.getGlobalRpc();
testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender());
final Set<String> globalRpc = mxBean.getGlobalRpc();
-
Assert.
assertNotNull(globalRpc);
-
Assert.
assertEquals(1, globalRpc.size());
+ assertNotNull(globalRpc);
+ assertEquals(1, globalRpc.size());
final String rpc = globalRpc.iterator().next();
final String rpc = globalRpc.iterator().next();
-
Assert.assertEquals(EMPTY_SCHEMA_PATH
.toString(), rpc);
+
assertEquals(REMOTE_QNAME
.toString(), rpc);
}
@Test
}
@Test
- public void testGetLocalRegisteredRoutedRpcEmptyBuckets()
throws Exception
{
+ public void testGetLocalRegisteredRoutedRpcEmptyBuckets() {
final Set<String> localRegisteredRoutedRpc = mxBean.getLocalRegisteredRoutedRpc();
final Set<String> localRegisteredRoutedRpc = mxBean.getLocalRegisteredRoutedRpc();
-
Assert.
assertNotNull(localRegisteredRoutedRpc);
-
Assert.
assertTrue(localRegisteredRoutedRpc.isEmpty());
+ assertNotNull(localRegisteredRoutedRpc);
+ assertTrue(localRegisteredRoutedRpc.isEmpty());
}
@Test
}
@Test
- public void testGetLocalRegisteredRoutedRpc()
throws Exception
{
+ public void testGetLocalRegisteredRoutedRpc() {
testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender());
final Set<String> localRegisteredRoutedRpc = mxBean.getLocalRegisteredRoutedRpc();
testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender());
final Set<String> localRegisteredRoutedRpc = mxBean.getLocalRegisteredRoutedRpc();
-
Assert.
assertNotNull(localRegisteredRoutedRpc);
-
Assert.
assertEquals(1, localRegisteredRoutedRpc.size());
+ assertNotNull(localRegisteredRoutedRpc);
+ assertEquals(1, localRegisteredRoutedRpc.size());
final String localRpc = localRegisteredRoutedRpc.iterator().next();
final String localRpc = localRegisteredRoutedRpc.iterator().next();
- Assert.assertTrue(localRpc.contains(LOCAL_QNAME.toString()));
- Assert.assertTrue(localRpc.contains(LOCAL_SCHEMA_PATH.toString()));
+ assertThat(localRpc, containsString(LOCAL_QNAME.toString()));
}
@Test
}
@Test
- public void testFindRpcByNameEmptyBuckets()
throws Exception
{
+ public void testFindRpcByNameEmptyBuckets() {
final Map<String, String> rpcByName = mxBean.findRpcByName("");
final Map<String, String> rpcByName = mxBean.findRpcByName("");
-
Assert.
assertNotNull(rpcByName);
-
Assert.
assertTrue(rpcByName.isEmpty());
+ assertNotNull(rpcByName);
+ assertTrue(rpcByName.isEmpty());
}
@Test
}
@Test
- public void testFindRpcByName()
throws Exception
{
+ public void testFindRpcByName() {
testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender());
final Map<String, String> rpcByName = mxBean.findRpcByName("");
testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender());
final Map<String, String> rpcByName = mxBean.findRpcByName("");
-
Assert.
assertNotNull(rpcByName);
-
Assert.
assertEquals(1, rpcByName.size());
-
Assert.
assertTrue(rpcByName.containsValue(LOCAL_QNAME.getLocalName()));
+ assertNotNull(rpcByName);
+ assertEquals(1, rpcByName.size());
+ assertTrue(rpcByName.containsValue(LOCAL_QNAME.getLocalName()));
}
@Test
}
@Test
- public void testFindRpcByRouteEmptyBuckets()
throws Exception
{
+ public void testFindRpcByRouteEmptyBuckets() {
final Map<String, String> rpcByRoute = mxBean.findRpcByRoute("");
final Map<String, String> rpcByRoute = mxBean.findRpcByRoute("");
-
Assert.
assertNotNull(rpcByRoute);
-
Assert.
assertTrue(rpcByRoute.isEmpty());
+ assertNotNull(rpcByRoute);
+ assertTrue(rpcByRoute.isEmpty());
}
@Test
}
@Test
- public void testFindRpcByRoute()
throws Exception
{
+ public void testFindRpcByRoute() {
testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender());
final Map<String, String> rpcByRoute = mxBean.findRpcByRoute("");
testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender());
final Map<String, String> rpcByRoute = mxBean.findRpcByRoute("");
-
Assert.
assertNotNull(rpcByRoute);
-
Assert.
assertEquals(1, rpcByRoute.size());
-
Assert.
assertTrue(rpcByRoute.containsValue(LOCAL_QNAME.getLocalName()));
+ assertNotNull(rpcByRoute);
+ assertEquals(1, rpcByRoute.size());
+ assertTrue(rpcByRoute.containsValue(LOCAL_QNAME.getLocalName()));
}
@Test
}
@Test
- public void testGetBucketVersionsEmptyBuckets()
throws Exception
{
+ public void testGetBucketVersionsEmptyBuckets() {
final String bucketVersions = mxBean.getBucketVersions();
final String bucketVersions = mxBean.getBucketVersions();
-
Assert.assertEquals(Collections.EMPTY_MAP
.toString(), bucketVersions);
+
assertEquals(Collections.emptyMap()
.toString(), bucketVersions);
}
@Test
}
@Test
- public void testGetBucketVersions()
throws Exception
{
+ public void testGetBucketVersions() {
testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender());
final String bucketVersions = mxBean.getBucketVersions();
testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender());
final String bucketVersions = mxBean.getBucketVersions();
-
Assert.
assertTrue(bucketVersions.contains(testActor.provider().getDefaultAddress().toString()));
+ assertTrue(bucketVersions.contains(testActor.provider().getDefaultAddress().toString()));
}
}
}
}