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 "Serialization/Deserialization and a host of other fixes"
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ShardTransactionTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
index 28bbdba3eaffc4f1f8df5ebedf454fa841e5dd7e..4d7c61a197e08420e7cec90753aa1ef427f4ce4d 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java
@@
-26,8
+26,9
@@
import org.opendaylight.controller.cluster.datastore.modification.Modification;
import org.opendaylight.controller.cluster.datastore.modification.WriteModification;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore;
import org.opendaylight.controller.cluster.datastore.modification.WriteModification;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.
Yang
InstanceIdentifier;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@
-39,8
+40,10
@@
public class ShardTransactionTest extends AbstractActorTest {
private static final InMemoryDOMDataStore store =
new InMemoryDOMDataStore("OPER", storeExecutor);
private static final InMemoryDOMDataStore store =
new InMemoryDOMDataStore("OPER", storeExecutor);
+ private static final SchemaContext testSchemaContext = TestModel.createTestContext();
+
static {
static {
- store.onGlobalContextUpdated(
TestModel.createTestContext()
);
+ store.onGlobalContextUpdated(
testSchemaContext
);
}
@Test
}
@Test
@@
-48,22
+51,22
@@
public class ShardTransactionTest extends AbstractActorTest {
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
- ShardTransaction.props(store.newReadWriteTransaction(), shard);
+ ShardTransaction.props(store.newReadWriteTransaction(), shard
, testSchemaContext
);
final ActorRef subject = getSystem().actorOf(props, "testReadData");
new Within(duration("1 seconds")) {
protected void run() {
subject.tell(
final ActorRef subject = getSystem().actorOf(props, "testReadData");
new Within(duration("1 seconds")) {
protected void run() {
subject.tell(
- new ReadData(
InstanceIdentifier.builder().build()
),
+ new ReadData(
YangInstanceIdentifier.builder().build()).toSerializable(
),
getRef());
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
getRef());
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
- if (in
instanceof ReadDataReply
) {
-
if (((ReadDataReply) in).getNormalizedNode(
)
-
!= null) {
+ if (in
.getClass().equals(ReadDataReply.SERIALIZABLE_CLASS)
) {
+
if (ReadDataReply.fromSerializable(testSchemaContext,YangInstanceIdentifier.builder().build(), in
)
+
.getNormalizedNode()
!= null) {
return "match";
}
return null;
return "match";
}
return null;
@@
-88,21
+91,22
@@
public class ShardTransactionTest extends AbstractActorTest {
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
- ShardTransaction.props(store.newReadWriteTransaction(), shard);
+ ShardTransaction.props(store.newReadWriteTransaction(), shard
, testSchemaContext
);
final ActorRef subject = getSystem().actorOf(props, "testReadDataWhenDataNotFound");
new Within(duration("1 seconds")) {
protected void run() {
subject.tell(
final ActorRef subject = getSystem().actorOf(props, "testReadDataWhenDataNotFound");
new Within(duration("1 seconds")) {
protected void run() {
subject.tell(
- new ReadData(TestModel.TEST_PATH),
+ new ReadData(TestModel.TEST_PATH)
.toSerializable()
,
getRef());
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
getRef());
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
- if (in instanceof ReadDataReply) {
- if (((ReadDataReply) in).getNormalizedNode()
+ if (in.getClass().equals(ReadDataReply.SERIALIZABLE_CLASS)) {
+ if (ReadDataReply.fromSerializable(testSchemaContext,TestModel.TEST_PATH, in)
+ .getNormalizedNode()
== null) {
return "match";
}
== null) {
return "match";
}
@@
-161,7
+165,7
@@
public class ShardTransactionTest extends AbstractActorTest {
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
- ShardTransaction.props(store.newReadWriteTransaction(), shard);
+ ShardTransaction.props(store.newReadWriteTransaction(), shard
, TestModel.createTestContext()
);
final ActorRef subject =
getSystem().actorOf(props, "testWriteData");
final ActorRef subject =
getSystem().actorOf(props, "testWriteData");
@@
-169,13
+173,13
@@
public class ShardTransactionTest extends AbstractActorTest {
protected void run() {
subject.tell(new WriteData(TestModel.TEST_PATH,
protected void run() {
subject.tell(new WriteData(TestModel.TEST_PATH,
- ImmutableNodes.containerNode(TestModel.TEST_QNAME), TestModel.createTestContext()),
+ ImmutableNodes.containerNode(TestModel.TEST_QNAME), TestModel.createTestContext())
.toSerializable()
,
getRef());
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
getRef());
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
- if (in
instanceof WriteDataReply
) {
+ if (in
.getClass().equals(WriteDataReply.SERIALIZABLE_CLASS)
) {
return "match";
} else {
throw noMatch();
return "match";
} else {
throw noMatch();
@@
-199,7
+203,7
@@
public class ShardTransactionTest extends AbstractActorTest {
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
- ShardTransaction.props(store.newReadWriteTransaction(), shard);
+ ShardTransaction.props(store.newReadWriteTransaction(), shard
, testSchemaContext
);
final ActorRef subject =
getSystem().actorOf(props, "testMergeData");
final ActorRef subject =
getSystem().actorOf(props, "testMergeData");
@@
-207,13
+211,13
@@
public class ShardTransactionTest extends AbstractActorTest {
protected void run() {
subject.tell(new MergeData(TestModel.TEST_PATH,
protected void run() {
subject.tell(new MergeData(TestModel.TEST_PATH,
- ImmutableNodes.containerNode(TestModel.TEST_QNAME),
TestModel.createTestContext()
),
+ ImmutableNodes.containerNode(TestModel.TEST_QNAME),
testSchemaContext).toSerializable(
),
getRef());
getRef());
- final String out = new ExpectMsg<String>("match hint") {
+ final String out = new ExpectMsg<String>(
duration("500 milliseconds"),
"match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
- if (in
instanceof MergeDataReply
) {
+ if (in
.getClass().equals(MergeDataReply.SERIALIZABLE_CLASS)
) {
return "match";
} else {
throw noMatch();
return "match";
} else {
throw noMatch();
@@
-238,7
+242,7
@@
public class ShardTransactionTest extends AbstractActorTest {
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
- ShardTransaction.props(store.newReadWriteTransaction(), shard);
+ ShardTransaction.props(store.newReadWriteTransaction(), shard
, TestModel.createTestContext()
);
final ActorRef subject =
getSystem().actorOf(props, "testDeleteData");
final ActorRef subject =
getSystem().actorOf(props, "testDeleteData");
@@
-250,7
+254,7
@@
public class ShardTransactionTest extends AbstractActorTest {
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
- if (in
instanceof DeleteDataReply
) {
+ if (in
.getClass().equals(DeleteDataReply.SERIALIZABLE_CLASS)
) {
return "match";
} else {
throw noMatch();
return "match";
} else {
throw noMatch();
@@
-275,19
+279,19
@@
public class ShardTransactionTest extends AbstractActorTest {
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
- ShardTransaction.props(store.newReadWriteTransaction(), shard);
+ ShardTransaction.props(store.newReadWriteTransaction(), shard
, TestModel.createTestContext()
);
final ActorRef subject =
getSystem().actorOf(props, "testReadyTransaction");
new Within(duration("1 seconds")) {
protected void run() {
final ActorRef subject =
getSystem().actorOf(props, "testReadyTransaction");
new Within(duration("1 seconds")) {
protected void run() {
- subject.tell(new ReadyTransaction(), getRef());
+ subject.tell(new ReadyTransaction()
.toSerializable()
, getRef());
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
- if (in
instanceof ReadyTransactionReply
) {
+ if (in
.getClass().equals(ReadyTransactionReply.SERIALIZABLE_CLASS)
) {
return "match";
} else {
throw noMatch();
return "match";
} else {
throw noMatch();
@@
-311,7
+315,7
@@
public class ShardTransactionTest extends AbstractActorTest {
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
new JavaTestKit(getSystem()) {{
final ActorRef shard = getSystem().actorOf(Shard.props("config"));
final Props props =
- ShardTransaction.props(store.newReadWriteTransaction(), shard);
+ ShardTransaction.props(store.newReadWriteTransaction(), shard
, TestModel.createTestContext()
);
final ActorRef subject =
getSystem().actorOf(props, "testCloseTransaction");
final ActorRef subject =
getSystem().actorOf(props, "testCloseTransaction");
@@
-320,12
+324,12
@@
public class ShardTransactionTest extends AbstractActorTest {
new Within(duration("2 seconds")) {
protected void run() {
new Within(duration("2 seconds")) {
protected void run() {
- subject.tell(new CloseTransaction(), getRef());
+ subject.tell(new CloseTransaction()
.toSerializable()
, getRef());
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
final String out = new ExpectMsg<String>("match hint") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
- if (in
instanceof CloseTransactionReply
) {
+ if (in
.getClass().equals(CloseTransactionReply.SERIALIZABLE_CLASS)
) {
return "match";
} else {
throw noMatch();
return "match";
} else {
throw noMatch();