X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-client%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fclient%2FAbstractClientConnectionTest.java;h=550dd9fa518b35b2c94d28f3ed0054863d5ab30c;hp=14ddf047d427ed471793be95f64ea65ea1cba20b;hb=a00880a67730250c359680310bce0c10cefc31d4;hpb=a6ee12d91ddadc775123a40a11c3a3bae7373ebe;ds=sidebyside

diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java
index 14ddf047d4..550dd9fa51 100644
--- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java
+++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/AbstractClientConnectionTest.java
@@ -14,6 +14,7 @@ import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
+import static org.opendaylight.controller.cluster.access.client.ConnectionEntryMatcher.entryWithRequest;
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
@@ -21,8 +22,6 @@ import akka.testkit.JavaTestKit;
 import akka.testkit.TestProbe;
 import java.util.Optional;
 import java.util.function.Consumer;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -164,37 +163,4 @@ public abstract class AbstractClientConnectionTest<T extends AbstractClientConne
         return new AbortLocalTransactionRequest(identifier, replyTo);
     }
 
-    private static ConnectionEntryMatcher entryWithRequest(final Request<?, ?> request) {
-        return new ConnectionEntryMatcher(request);
-    }
-
-    private static class ConnectionEntryMatcher extends BaseMatcher<ConnectionEntry> {
-
-        private final Request request;
-
-        private ConnectionEntryMatcher(final Request request) {
-            this.request = request;
-        }
-
-        @Override
-        public boolean matches(final Object item) {
-            if (!(item instanceof ConnectionEntry)) {
-                return false;
-            }
-            final ConnectionEntry entry = (ConnectionEntry) item;
-            return this.request.equals(entry.getRequest());
-        }
-
-        @Override
-        public void describeMismatch(final Object item, final Description description) {
-            final ConnectionEntry entry = (ConnectionEntry) item;
-            super.describeMismatch(entry.getRequest(), description);
-        }
-
-        @Override
-        public void describeTo(final Description description) {
-            description.appendValue(request);
-        }
-    }
-
-}
+}
\ No newline at end of file