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 "Fix for -Pintegrationtest profile"
[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 a8df49f5ca4514ceb9ea1dfc25809cf789647150..89cf7e7728f8bbaec5a28b4c389869ecb43f0391 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
@@
-7,7
+7,6
@@
import com.google.common.util.concurrent.ListenableFuture;
import junit.framework.Assert;
import org.junit.Test;
import org.opendaylight.controller.cluster.datastore.messages.CloseTransaction;
import junit.framework.Assert;
import org.junit.Test;
import org.opendaylight.controller.cluster.datastore.messages.CloseTransaction;
-import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionReply;
import org.opendaylight.controller.cluster.datastore.messages.DeleteData;
import org.opendaylight.controller.cluster.datastore.messages.MergeData;
import org.opendaylight.controller.cluster.datastore.messages.ReadDataReply;
import org.opendaylight.controller.cluster.datastore.messages.DeleteData;
import org.opendaylight.controller.cluster.datastore.messages.MergeData;
import org.opendaylight.controller.cluster.datastore.messages.ReadDataReply;
@@
-17,7
+16,9
@@
import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
import org.opendaylight.controller.cluster.datastore.utils.DoNothingActor;
import org.opendaylight.controller.cluster.datastore.utils.MessageCollectorActor;
import org.opendaylight.controller.cluster.datastore.utils.MockActorContext;
import org.opendaylight.controller.cluster.datastore.utils.DoNothingActor;
import org.opendaylight.controller.cluster.datastore.utils.MessageCollectorActor;
import org.opendaylight.controller.cluster.datastore.utils.MockActorContext;
+import org.opendaylight.controller.cluster.datastore.utils.MockConfiguration;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
+import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
@@
-28,6
+29,9
@@
import java.util.concurrent.Executors;
public class TransactionProxyTest extends AbstractActorTest {
public class TransactionProxyTest extends AbstractActorTest {
+ private final ActorContext testContext =
+ new ActorContext(getSystem(), getSystem().actorOf(Props.create(DoNothingActor.class)), new MockConfiguration());
+
private ExecutorService transactionExecutor =
Executors.newSingleThreadExecutor();
private ExecutorService transactionExecutor =
Executors.newSingleThreadExecutor();
@@
-40,9
+44,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
+58,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
+78,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
+89,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,12
+109,11
@@
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));
- ActorContext testContext = new ActorContext(getSystem(), getSystem().actorOf(Props.create(DoNothingActor.class)));
Object messages = testContext
.executeLocalOperation(actorRef, "messages",
ActorContext.ASK_DURATION);
Object messages = testContext
.executeLocalOperation(actorRef, "messages",
ActorContext.ASK_DURATION);
@@
-122,7
+126,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,12
+140,11
@@
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));
- ActorContext testContext = new ActorContext(getSystem(), getSystem().actorOf(Props.create(DoNothingActor.class)));
Object messages = testContext
.executeLocalOperation(actorRef, "messages",
ActorContext.ASK_DURATION);
Object messages = testContext
.executeLocalOperation(actorRef, "messages",
ActorContext.ASK_DURATION);
@@
-154,7
+157,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,11
+171,10
@@
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);
- ActorContext testContext = new ActorContext(getSystem(), getSystem().actorOf(Props.create(DoNothingActor.class)));
Object messages = testContext
.executeLocalOperation(actorRef, "messages",
ActorContext.ASK_DURATION);
Object messages = testContext
.executeLocalOperation(actorRef, "messages",
ActorContext.ASK_DURATION);
@@
-185,7
+187,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
+201,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
+224,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,11
+240,10
@@
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();
- ActorContext testContext = new ActorContext(getSystem(), getSystem().actorOf(Props.create(DoNothingActor.class)));
Object messages = testContext
.executeLocalOperation(actorRef, "messages",
ActorContext.ASK_DURATION);
Object messages = testContext
.executeLocalOperation(actorRef, "messages",
ActorContext.ASK_DURATION);
@@
-259,6
+260,9
@@
public class TransactionProxyTest extends AbstractActorTest {
}
private CreateTransactionReply createTransactionReply(ActorRef actorRef){
}
private CreateTransactionReply createTransactionReply(ActorRef actorRef){
- return new CreateTransactionReply(actorRef.path(), "txn-1");
+ return CreateTransactionReply.newBuilder()
+ .setTransactionActorPath(actorRef.path().toString())
+ .setTransactionId("txn-1")
+ .build();
}
}
}
}