Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 1894: Add LISP configuration options to etc/custom.properties in Karaf"
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ShardManagerTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java
index e6f68c032a325f59bea291e2f17e129fd47da766..02201f7cd1672d2c8d02415ae4d65d8b71432f8e 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java
@@
-15,8
+15,10
@@
import org.opendaylight.controller.cluster.datastore.messages.LocalShardFound;
import org.opendaylight.controller.cluster.datastore.messages.LocalShardNotFound;
import org.opendaylight.controller.cluster.datastore.messages.PrimaryFound;
import org.opendaylight.controller.cluster.datastore.messages.PrimaryNotFound;
import org.opendaylight.controller.cluster.datastore.messages.LocalShardNotFound;
import org.opendaylight.controller.cluster.datastore.messages.PrimaryFound;
import org.opendaylight.controller.cluster.datastore.messages.PrimaryNotFound;
+import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContext;
import org.opendaylight.controller.cluster.datastore.utils.MockClusterWrapper;
import org.opendaylight.controller.cluster.datastore.utils.MockConfiguration;
import org.opendaylight.controller.cluster.datastore.utils.MockClusterWrapper;
import org.opendaylight.controller.cluster.datastore.utils.MockConfiguration;
+import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import scala.concurrent.duration.Duration;
import static junit.framework.Assert.assertEquals;
import scala.concurrent.duration.Duration;
import static junit.framework.Assert.assertEquals;
@@
-42,11
+44,11
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
- new MockConfiguration(), new
Shard
Context());
+ new MockConfiguration(), new
Datastore
Context());
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
- new Within(duration("1 seconds")) {
+ new Within(duration("1
0
seconds")) {
@Override
protected void run() {
@Override
protected void run() {
@@
-67,11
+69,13
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
- new MockConfiguration(), new
Shard
Context());
+ new MockConfiguration(), new
Datastore
Context());
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
- new Within(duration("1 seconds")) {
+ subject.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+
+ new Within(duration("10 seconds")) {
@Override
protected void run() {
@Override
protected void run() {
@@
-91,17
+95,17
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
- new MockConfiguration(), new
Shard
Context());
+ new MockConfiguration(), new
Datastore
Context());
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
- new Within(duration("1 seconds")) {
+ new Within(duration("1
0
seconds")) {
@Override
protected void run() {
subject.tell(new FindLocalShard("inventory"), getRef());
@Override
protected void run() {
subject.tell(new FindLocalShard("inventory"), getRef());
- final String out = new ExpectMsg<String>(duration("1 seconds"), "find local") {
+ final String out = new ExpectMsg<String>(duration("1
0
seconds"), "find local") {
@Override
protected String match(Object in) {
if (in instanceof LocalShardNotFound) {
@Override
protected String match(Object in) {
if (in instanceof LocalShardNotFound) {
@@
-128,17
+132,19
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", mockClusterWrapper,
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", mockClusterWrapper,
- new MockConfiguration(), new
Shard
Context());
+ new MockConfiguration(), new
Datastore
Context());
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
- new Within(duration("1 seconds")) {
+ subject.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+
+ new Within(duration("10 seconds")) {
@Override
protected void run() {
subject.tell(new FindLocalShard(Shard.DEFAULT_NAME), getRef());
@Override
protected void run() {
subject.tell(new FindLocalShard(Shard.DEFAULT_NAME), getRef());
- final ActorRef out = new ExpectMsg<ActorRef>(duration("1 seconds"), "find local") {
+ final ActorRef out = new ExpectMsg<ActorRef>(duration("1
0
seconds"), "find local") {
@Override
protected ActorRef match(Object in) {
if (in instanceof LocalShardFound) {
@Override
protected ActorRef match(Object in) {
if (in instanceof LocalShardFound) {
@@
-164,12
+170,12
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
- new MockConfiguration(), new
Shard
Context());
+ new MockConfiguration(), new
Datastore
Context());
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
// the run() method needs to finish within 3 seconds
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
// the run() method needs to finish within 3 seconds
- new Within(duration("1 seconds")) {
+ new Within(duration("1
0
seconds")) {
@Override
protected void run() {
@Override
protected void run() {
@@
-204,12
+210,12
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
- new MockConfiguration(), new
Shard
Context());
+ new MockConfiguration(), new
Datastore
Context());
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
// the run() method needs to finish within 3 seconds
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
// the run() method needs to finish within 3 seconds
- new Within(duration("1 seconds")) {
+ new Within(duration("1
0
seconds")) {
@Override
protected void run() {
@Override
protected void run() {