summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImplTest.java2
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java6
-rw-r--r--appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java2
-rw-r--r--appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestValidator.java2
4 files changed, 6 insertions, 6 deletions
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImplTest.java b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImplTest.java
index 06398f7f5..834bd8655 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImplTest.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/openecomp/appc/dg/common/impl/DCAEReporterPluginImplTest.java
@@ -68,7 +68,7 @@ public class DCAEReporterPluginImplTest {
PowerMockito.when(FrameworkUtil.getBundle(Matchers.any(Class.class))).thenReturn(bundleService);
PowerMockito.when(bundleService.getBundleContext()).thenReturn(bundleContext);
PowerMockito.when(bundleContext.getServiceReference(Matchers.any(Class.class))).thenReturn(sref);
- PowerMockito.when(bundleContext.getService(sref)).thenReturn(eventSender);
+ PowerMockito.when(bundleContext.<EventSender>getService(sref)).thenReturn(eventSender);
dcaeReporterPlugin = new DCAEReporterPluginImpl();
}
diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java
index 5c5aa71a1..3b4a32385 100644
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/src/test/java/org/openecomp/appc/dg/netconf/impl/NetconfClientPluginImplTest.java
@@ -626,7 +626,7 @@ public class NetconfClientPluginImplTest {
when(FrameworkUtil.getBundle(Matchers.any(Class.class))).thenReturn(bundleService);
when(bundleService.getBundleContext()).thenReturn(bundleContext);
when(bundleContext.getServiceReference(NetconfDataAccessService.class)).thenReturn(sref1);
- when(bundleContext.getService(sref1)).thenReturn(dao);
+ when(bundleContext.<NetconfDataAccessService>getService(sref1)).thenReturn(dao);
}
@@ -652,7 +652,7 @@ public class NetconfClientPluginImplTest {
when(FrameworkUtil.getBundle(Matchers.any(Class.class))).thenReturn(bundleService);
when(bundleService.getBundleContext()).thenReturn(bundleContext);
when(bundleContext.getServiceReference(NetconfClientFactory.class)).thenReturn(sref2);
- when(bundleContext.getService(sref2)).thenReturn(clientFactory);
+ when(bundleContext.<NetconfClientFactory>getService(sref2)).thenReturn(clientFactory);
}
@@ -661,7 +661,7 @@ public class NetconfClientPluginImplTest {
when(FrameworkUtil.getBundle(Matchers.any(Class.class))).thenReturn(bundleService);
when(bundleService.getBundleContext()).thenReturn(bundleContext);
when(bundleContext.getServiceReference(Matchers.anyString())).thenReturn(sref3);
- when(bundleContext.getService(sref3)).thenReturn(clientFactory);
+ when(bundleContext.<NetconfClientFactory>getService(sref3)).thenReturn(clientFactory);
}
private void substituteMapper(boolean command) throws NoSuchFieldException, IllegalAccessException {
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java
index f2c30990e..61611a9e2 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/test/java/org/openecomp/appc/executor/TestCommandExecutionTask.java
@@ -92,7 +92,7 @@ public class TestCommandExecutionTask {
PowerMockito.when(FrameworkUtil.getBundle(AAIService.class)).thenReturn(bundleService);
PowerMockito.when(bundleService.getBundleContext()).thenReturn(bundleContext);
PowerMockito.when(bundleContext.getServiceReference(AAIService.class.getName())).thenReturn(sref);
- PowerMockito.when(bundleContext.getService(sref)).thenReturn(aaiService);
+ PowerMockito.when(bundleContext.<AAIService>getService(sref)).thenReturn(aaiService);
PowerMockito.when(aaiService.query(anyString(),anyBoolean(),anyString(),anyString(),anyString(),anyString(),(SvcLogicContext)anyObject())).thenAnswer(new Answer<SvcLogicResource.QueryStatus>() {
@Override
public SvcLogicResource.QueryStatus answer(InvocationOnMock invocation) throws Throwable {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestValidator.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestValidator.java
index f4d703756..16caf5860 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestValidator.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestValidator.java
@@ -119,7 +119,7 @@ public class TestRequestValidator {
PowerMockito.when(FrameworkUtil.getBundle(AAIService.class)).thenReturn(bundleService);
PowerMockito.when(bundleService.getBundleContext()).thenReturn(bundleContext);
PowerMockito.when(bundleContext.getServiceReference(AAIService.class.getName())).thenReturn(sref);
- PowerMockito.when(bundleContext.getService(sref)).thenReturn(aaiService);
+ PowerMockito.when(bundleContext.<AAIService>getService(sref)).thenReturn(aaiService);
PowerMockito.when(aaiService.query(anyString(),anyBoolean(),anyString(),anyString(),anyString(),anyString(),(SvcLogicContext)anyObject())).thenAnswer(new Answer<SvcLogicResource.QueryStatus>() {
@Override
public SvcLogicResource.QueryStatus answer(InvocationOnMock invocation) throws Throwable {