BUG-5280: switch transactionIdentifier

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / compat / PreBoronTransactionProxyTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/compat/PreBoronTransactionProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/compat/PreBoronTransactionProxyTest.java
index 0bf4f48cead2308e62482e7f0dc4c233e31e3646..f4c777ee61a290f88761144d4789fde097706c51 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/compat/PreBoronTransactionProxyTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/compat/PreBoronTransactionProxyTest.java
@@ -53,7 +53,7 @@ public class PreBoronTransactionProxyTest extends AbstractTransactionProxyTest {
             public boolean matches(Object argument) {
                 if(ShardTransactionMessages.CreateTransaction.class.equals(argument.getClass())) {
                     CreateTransaction obj = CreateTransaction.fromSerializable(argument);
             public boolean matches(Object argument) {
                 if(ShardTransactionMessages.CreateTransaction.class.equals(argument.getClass())) {
                     CreateTransaction obj = CreateTransaction.fromSerializable(argument);

-                    return obj.getTransactionId().startsWith(memberName) &&
+                    return obj.getTransactionId().startsWith(memberName + ':') &&

                             obj.getTransactionType() == type.ordinal();
                 }
 
                             obj.getTransactionType() == type.ordinal();
                 }
 


@@ -119,7 +119,7 @@ public class PreBoronTransactionProxyTest extends AbstractTransactionProxyTest {
     }
 
     @Test
     }
 
     @Test

-    public void testClose() throws Exception{
+    public void testClose() {

         ActorRef actorRef = setupPreBoronActorContextWithInitialCreateTransaction(getSystem(), READ_WRITE);
 
         expectBatchedModifications(actorRef, 1);
         ActorRef actorRef = setupPreBoronActorContextWithInitialCreateTransaction(getSystem(), READ_WRITE);
 
         expectBatchedModifications(actorRef, 1);