diff options
author | Dan Timoney <dtimoney@att.com> | 2021-02-04 10:30:40 -0500 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2021-02-04 10:30:40 -0500 |
commit | 2e63f133b29f1bb7fccaf6e35d11488f042a5855 (patch) | |
tree | 8f95c37abe39ba61b21fb8b6bafe1cb4780580d0 /generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/GenericResourceApiProviderTest.java | |
parent | 20ca6ead983ca534e1ce93abbeaa23a2e4aac0f1 (diff) |
Upgrade to ODL Aluminum
Updated code to conform to OpenDaylight Aluminum release.
Change-Id: I3ef7daebc689a5d2e344fc7b96ce885bda77a7f8
Issue-ID: SDNC-1474
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/GenericResourceApiProviderTest.java')
-rw-r--r-- | generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/GenericResourceApiProviderTest.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/GenericResourceApiProviderTest.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/GenericResourceApiProviderTest.java index 6bf6959e..62976378 100644 --- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/GenericResourceApiProviderTest.java +++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/GenericResourceApiProviderTest.java @@ -27,21 +27,21 @@ import org.mockito.Mock; import org.onap.sdnc.northbound.util.DataBrokerUtil; import org.onap.sdnc.northbound.util.GenericResourceApiSvcLogicServiceClientMockUtil; import org.onap.sdnc.northbound.util.PropBuilder; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBrokerTest; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.NotificationPublishService; +import org.opendaylight.mdsal.binding.api.RpcProviderService; +import org.opendaylight.mdsal.binding.testutils.DataBrokerTestModule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class GenericResourceApiProviderTest extends AbstractConcurrentDataBrokerTest { +public class GenericResourceApiProviderTest { protected static final Logger LOG = LoggerFactory.getLogger(GenericResourceApiProvider.class); protected GenericResourceApiProvider genericResourceApiProvider; protected DataBroker dataBroker; protected @Mock NotificationPublishService mockNotificationPublishService; - protected @Mock RpcProviderRegistry mockRpcProviderRegistry; + protected @Mock RpcProviderService mockRpcProviderService; protected @Mock GenericResourceApiSvcLogicServiceClient mockGenericResourceApiSvcLogicServiceClient; @@ -59,7 +59,7 @@ public class GenericResourceApiProviderTest extends AbstractConcurrentDataBroker genericResourceApiProvider = new GenericResourceApiProvider( dataBroker, mockNotificationPublishService, - mockRpcProviderRegistry, + mockRpcProviderService, mockGenericResourceApiSvcLogicServiceClient ); } catch (Exception e) { @@ -68,6 +68,9 @@ public class GenericResourceApiProviderTest extends AbstractConcurrentDataBroker } } + public DataBroker getDataBroker() { + return DataBrokerTestModule.dataBroker(); + } public static PropBuilder prop(){ return (new PropBuilder()); |