Bump odlparent/yangtools/mdsal

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java
index a40739f1145f6aba1f0e348968025f95c0913bce..51435475753dbc73419f03e8dd6fb847bcba635c 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java
@@ -130,9 +130,9 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest {
 
         @Override
         public String getModuleNameFromNameSpace(final String nameSpace) {
-            if (TestModel.JUNK_QNAME.getNamespace().toASCIIString().equals(nameSpace)) {
+            if (TestModel.JUNK_QNAME.getNamespace().toString().equals(nameSpace)) {
                 return TestModel.JUNK_QNAME.getLocalName();
-            } else if (CarsModel.BASE_QNAME.getNamespace().toASCIIString().equals(nameSpace)) {
+            } else if (CarsModel.BASE_QNAME.getNamespace().toString().equals(nameSpace)) {
                 return CarsModel.BASE_QNAME.getLocalName();
             }
             return null;
@@ -202,7 +202,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest {
             final TransactionType type) {
         class CreateTransactionArgumentMatcher implements ArgumentMatcher<CreateTransaction> {
             @Override
-            public boolean matches(CreateTransaction argument) {
+            public boolean matches(final CreateTransaction argument) {
                 return argument.getTransactionId().getHistoryId().getClientId().getFrontendId().getMemberName()
                         .getName().equals(expMemberName) && argument.getTransactionType() == type.ordinal();
             }
@@ -214,7 +214,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest {
     protected DataExists eqDataExists() {
         class DataExistsArgumentMatcher implements ArgumentMatcher<DataExists> {
             @Override
-            public boolean matches(DataExists argument) {
+            public boolean matches(final DataExists argument) {
                 return argument.getPath().equals(TestModel.TEST_PATH);
             }
         }
@@ -229,7 +229,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest {
     protected ReadData eqReadData(final YangInstanceIdentifier path) {
         class ReadDataArgumentMatcher implements ArgumentMatcher<ReadData> {
             @Override
-            public boolean matches(ReadData argument) {
+            public boolean matches(final ReadData argument) {
                 return argument.getPath().equals(path);
             }
         }
@@ -242,7 +242,7 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest {
     }
 
 
-    protected Future<ReadDataReply> readDataReply(final NormalizedNode<?, ?> data) {
+    protected Future<ReadDataReply> readDataReply(final NormalizedNode data) {
         return Futures.successful(new ReadDataReply(data, DataStoreVersions.CURRENT_VERSION));
     }
 
@@ -470,9 +470,8 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest {
             while (iter.hasNext()) {
                 Object actual = iter.next();
                 if (CommitTransactionReply.isSerializedType(expReply)
-                        && CommitTransactionReply.isSerializedType(actual)) {
-                    found = true;
-                } else if (expReply instanceof ActorSelection && Objects.equals(expReply, actual)) {
+                        && CommitTransactionReply.isSerializedType(actual)
+                        || expReply instanceof ActorSelection && Objects.equals(expReply, actual)) {
                     found = true;
                 } else if (expReply instanceof Class && ((Class<?>) expReply).isInstance(actual)) {
                     found = true;