Use TestEntityOwnershipService that's now in controller

following https://git.opendaylight.org/gerrit/#/c/58089/

Change-Id: If0626ef349e16469cef14504ae6b11595030dad2
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/interfacemanager/interfacemanager-impl/pom.xml b/interfacemanager/interfacemanager-impl/pom.xml
index f8e55176e2ec5a75d3fe818e83e753e4c08a8adc..c447b2602357508b25aeb8e8491efcd193e4a55a 100644 (file)
--- a/interfacemanager/interfacemanager-impl/pom.xml
+++ b/interfacemanager/interfacemanager-impl/pom.xml
@@ -114,6 +114,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${genius.mdsalutil.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-common-testutil</artifactId>
+      <version>${controller.mdsal.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java
index 4929715cff55cfdcc0cf4f728fa9c6117e6825d2..55297748eee8ce65d5193da59917c62a735618f2 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java
@@ -10,10 +10,10 @@ package org.opendaylight.genius.interfacemanager.test;
 import static org.mockito.Mockito.mock;
 
 import java.net.UnknownHostException;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.test.DataBrokerTestModule;
 import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
+import org.opendaylight.controller.md.sal.common.api.clustering.testutil.TestEntityOwnershipService;
 import org.opendaylight.genius.datastoreutils.testutils.JobCoordinatorEventsWaiter;
 import org.opendaylight.genius.datastoreutils.testutils.TestableJobCoordinatorEventsWaiter;
 import org.opendaylight.genius.idmanager.IdManager;
@@ -32,7 +32,6 @@ import org.opendaylight.genius.interfacemanager.listeners.VlanMemberConfigListen
 import org.opendaylight.genius.interfacemanager.rpcservice.InterfaceManagerRpcService;
 import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.listeners.FlowBasedServicesConfigListener;
 import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.listeners.FlowBasedServicesInterfaceStateListener;
-import org.opendaylight.genius.interfacemanager.test.infra.TestEntityOwnershipService;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
 import org.opendaylight.genius.mdsalutil.interfaces.testutils.TestIMdsalApiManager;
 import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module;

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/infra/TestEntityOwnershipService.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/infra/TestEntityOwnershipService.java
deleted file mode 100644 (file)
index 4531662..0000000
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/infra/TestEntityOwnershipService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2016 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.genius.interfacemanager.test.infra;
-
-import static org.opendaylight.yangtools.testutils.mockito.MoreAnswers.realOrException;
-
-import com.google.common.base.Optional;
-import org.mockito.Mockito;
-import org.opendaylight.controller.md.sal.common.api.clustering.Entity;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipCandidateRegistration;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipListener;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipListenerRegistration;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipState;
-
-/**
- * Fake EntityOwnershipService suitable for non-clustered component tests.
- *
- * @author Michael Vorburger
- */
-public abstract class TestEntityOwnershipService implements EntityOwnershipService {
-
-    private static final EntityOwnershipState STATE = new EntityOwnershipState(true, true);
-
-    public static EntityOwnershipService newInstance() {
-        return Mockito.mock(TestEntityOwnershipService.class, realOrException());
-    }
-
-    @Override
-    public EntityOwnershipCandidateRegistration registerCandidate(Entity entity) {
-        return Mockito.mock(EntityOwnershipCandidateRegistration.class, realOrException());
-    }
-
-    @Override
-    public EntityOwnershipListenerRegistration registerListener(String entityType, EntityOwnershipListener listener) {
-        return Mockito.mock(EntityOwnershipListenerRegistration.class, realOrException());
-    }
-
-    @Override
-    public Optional<EntityOwnershipState> getOwnershipState(Entity forEntity) {
-        return Optional.of(STATE);
-    }
-
-    @Override
-    public boolean isCandidateRegistered(Entity entity) {
-        return true;
-    }
-}