Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ReadData and ReadDataReply protobuff messages
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
TransactionProxyTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java
index d6cb1fb97c818d96b0d598512d686aa00cac9503..1e9fc90a6e1e9831ab9ecb86f5692dbacf7aec6f 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java
@@
-40,9
+40,10
@@
public class TransactionProxyTest extends AbstractActorTest {
actorContext.setExecuteShardOperationResponse(createTransactionReply(actorRef));
actorContext.setExecuteRemoteOperationResponse("message");
actorContext.setExecuteShardOperationResponse(createTransactionReply(actorRef));
actorContext.setExecuteRemoteOperationResponse("message");
+
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
- TransactionProxy.TransactionType.READ_ONLY, transactionExecutor);
+ TransactionProxy.TransactionType.READ_ONLY, transactionExecutor
, TestModel.createTestContext()
);
ListenableFuture<Optional<NormalizedNode<?, ?>>> read =
ListenableFuture<Optional<NormalizedNode<?, ?>>> read =
@@
-53,7
+54,7
@@
public class TransactionProxyTest extends AbstractActorTest {
Assert.assertFalse(normalizedNodeOptional.isPresent());
actorContext.setExecuteRemoteOperationResponse(new ReadDataReply(
Assert.assertFalse(normalizedNodeOptional.isPresent());
actorContext.setExecuteRemoteOperationResponse(new ReadDataReply(
-
ImmutableNodes.containerNode(TestModel.TEST_QNAME)
));
+
TestModel.createTestContext(),ImmutableNodes.containerNode(TestModel.TEST_QNAME)).toSerializable(
));
read = transactionProxy.read(TestModel.TEST_PATH);
read = transactionProxy.read(TestModel.TEST_PATH);
@@
-73,7
+74,7
@@
public class TransactionProxyTest extends AbstractActorTest {
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
- TransactionProxy.TransactionType.READ_ONLY, transactionExecutor);
+ TransactionProxy.TransactionType.READ_ONLY, transactionExecutor
, TestModel.createTestContext()
);
ListenableFuture<Optional<NormalizedNode<?, ?>>> read =
ListenableFuture<Optional<NormalizedNode<?, ?>>> read =
@@
-84,7
+85,7
@@
public class TransactionProxyTest extends AbstractActorTest {
Assert.assertFalse(normalizedNodeOptional.isPresent());
actorContext.setExecuteRemoteOperationResponse(new ReadDataReply(
Assert.assertFalse(normalizedNodeOptional.isPresent());
actorContext.setExecuteRemoteOperationResponse(new ReadDataReply(
-
null
));
+
TestModel.createTestContext(), null).toSerializable(
));
read = transactionProxy.read(TestModel.TEST_PATH);
read = transactionProxy.read(TestModel.TEST_PATH);
@@
-104,7
+105,7
@@
public class TransactionProxyTest extends AbstractActorTest {
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
- TransactionProxy.TransactionType.READ_ONLY, transactionExecutor);
+ TransactionProxy.TransactionType.READ_ONLY, transactionExecutor
, TestModel.createTestContext()
);
transactionProxy.write(TestModel.TEST_PATH,
ImmutableNodes.containerNode(TestModel.NAME_QNAME));
transactionProxy.write(TestModel.TEST_PATH,
ImmutableNodes.containerNode(TestModel.NAME_QNAME));
@@
-122,7
+123,7
@@
public class TransactionProxyTest extends AbstractActorTest {
Assert.assertEquals(1, listMessages.size());
Assert.assertEquals(1, listMessages.size());
- Assert.assert
True(listMessages.get(0) instanceof WriteData
);
+ Assert.assert
Equals(WriteData.SERIALIZABLE_CLASS, listMessages.get(0).getClass()
);
}
@Test
}
@Test
@@
-136,7
+137,7
@@
public class TransactionProxyTest extends AbstractActorTest {
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
- TransactionProxy.TransactionType.READ_ONLY, transactionExecutor);
+ TransactionProxy.TransactionType.READ_ONLY, transactionExecutor
, TestModel.createTestContext()
);
transactionProxy.merge(TestModel.TEST_PATH,
ImmutableNodes.containerNode(TestModel.NAME_QNAME));
transactionProxy.merge(TestModel.TEST_PATH,
ImmutableNodes.containerNode(TestModel.NAME_QNAME));
@@
-154,7
+155,7
@@
public class TransactionProxyTest extends AbstractActorTest {
Assert.assertEquals(1, listMessages.size());
Assert.assertEquals(1, listMessages.size());
- Assert.assert
True(listMessages.get(0) instanceof MergeData
);
+ Assert.assert
Equals(MergeData.SERIALIZABLE_CLASS, listMessages.get(0).getClass()
);
}
@Test
}
@Test
@@
-168,7
+169,7
@@
public class TransactionProxyTest extends AbstractActorTest {
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
- TransactionProxy.TransactionType.READ_ONLY, transactionExecutor);
+ TransactionProxy.TransactionType.READ_ONLY, transactionExecutor
, TestModel.createTestContext()
);
transactionProxy.delete(TestModel.TEST_PATH);
transactionProxy.delete(TestModel.TEST_PATH);
@@
-185,7
+186,7
@@
public class TransactionProxyTest extends AbstractActorTest {
Assert.assertEquals(1, listMessages.size());
Assert.assertEquals(1, listMessages.size());
- Assert.assert
True(listMessages.get(0) instanceof DeleteData
);
+ Assert.assert
Equals(DeleteData.SERIALIZABLE_CLASS, listMessages.get(0).getClass()
);
}
@Test
}
@Test
@@
-199,7
+200,7
@@
public class TransactionProxyTest extends AbstractActorTest {
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
- TransactionProxy.TransactionType.READ_ONLY, transactionExecutor);
+ TransactionProxy.TransactionType.READ_ONLY, transactionExecutor
, TestModel.createTestContext()
);
DOMStoreThreePhaseCommitCohort ready = transactionProxy.ready();
DOMStoreThreePhaseCommitCohort ready = transactionProxy.ready();
@@
-222,7
+223,7
@@
public class TransactionProxyTest extends AbstractActorTest {
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
- TransactionProxy.TransactionType.READ_ONLY, transactionExecutor);
+ TransactionProxy.TransactionType.READ_ONLY, transactionExecutor
, TestModel.createTestContext()
);
Assert.assertNotNull(transactionProxy.getIdentifier());
}
Assert.assertNotNull(transactionProxy.getIdentifier());
}
@@
-238,7
+239,7
@@
public class TransactionProxyTest extends AbstractActorTest {
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
TransactionProxy transactionProxy =
new TransactionProxy(actorContext,
- TransactionProxy.TransactionType.READ_ONLY, transactionExecutor);
+ TransactionProxy.TransactionType.READ_ONLY, transactionExecutor
, TestModel.createTestContext()
);
transactionProxy.close();
transactionProxy.close();