fix unit test Renderer

JIRA: TRNSPRTPCE-11
Change-Id: Ibf13f1af6ba04755c624ee58e6a5520e14c44adc
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java
index c15a936382de0f839ea3faa6362ad08015f8a928..e86fc4b268c9f916f190e078879cf2bb39a5e979 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/TransportPCEServicePathRPCImpl.java
@@ -34,8 +34,8 @@ public class TransportPCEServicePathRPCImpl implements TransportpceServicepathSe
     }
 
     @Override
-    public ListenableFuture<RpcResult<CancelResourceReserveOutput>>
-            cancelResourceReserve(CancelResourceReserveInput input) {
+    public ListenableFuture<RpcResult<CancelResourceReserveOutput>> cancelResourceReserve(
+            CancelResourceReserveInput input) {
         // TODO Auto-generated method stub
         return null;
     }
@@ -55,8 +55,8 @@ public class TransportPCEServicePathRPCImpl implements TransportpceServicepathSe
     }
 
     @Override
-    public ListenableFuture<RpcResult<PathComputationRequestOutput>>
-            pathComputationRequest(PathComputationRequestInput input) {
+    public ListenableFuture<RpcResult<PathComputationRequestOutput>> pathComputationRequest(
+            PathComputationRequestInput input) {
         // TODO Auto-generated method stub
         return null;
     }

diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java
index 8822b9b76e57aee7753526d6b6f7f2c6e8db60a7..70f71473c826003e751aac72986bd4b4c29c0aa5 100644 (file)
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java
+++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java
@@ -51,13 +51,13 @@ public class OlmServiceStub implements OlmService {
         return null;
     }
 
-    @Override public ListenableFuture<RpcResult<ServicePowerResetOutput>>
-        servicePowerReset(ServicePowerResetInput input) {
+    @Override public ListenableFuture<RpcResult<ServicePowerResetOutput>> servicePowerReset(
+            ServicePowerResetInput input) {
         return null;
     }
 
-    @Override public ListenableFuture<RpcResult<ServicePowerSetupOutput>>
-        servicePowerSetup(ServicePowerSetupInput input) {
+    @Override public ListenableFuture<RpcResult<ServicePowerSetupOutput>> servicePowerSetup(
+            ServicePowerSetupInput input) {
         return RpcResultBuilder.success(new ServicePowerSetupOutputBuilder().build()).buildFuture();
     }
 }

diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java
index 4a9dc7d42b8b4887f05930b3a4e97e0e5b8d5fd5..25e141597c15644e24e2834ed1845a9f24471cf6 100644 (file)
--- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java
+++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java
@@ -8,9 +8,9 @@
 
 package org.opendaylight.transportpce.renderer.utils;
 
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import org.mockito.Mockito;
@@ -50,10 +50,8 @@ public final class MountPointUtils {
         GetConnectionPortTrailOutputBuilder getConnectionPortTrailOutputBuilder =
                 new GetConnectionPortTrailOutputBuilder();
         getConnectionPortTrailOutputBuilder.setPorts(ports);
-        RpcResultBuilder<GetConnectionPortTrailOutput> rpcResultBuilder =
-                RpcResultBuilder.success(getConnectionPortTrailOutputBuilder.build());
-        Future<RpcResult<GetConnectionPortTrailOutput>> rpcResultFuture =
-                CompletableFuture.completedFuture(rpcResultBuilder.build());
+        ListenableFuture<RpcResult<GetConnectionPortTrailOutput>> rpcResultFuture =
+                RpcResultBuilder.success(getConnectionPortTrailOutputBuilder.build()).buildFuture();
         Mockito.doReturn(rpcResultFuture).when(orgOpenroadmDeviceService).getConnectionPortTrail(Mockito.any());
         Mockito.doReturn(orgOpenroadmDeviceService).when(rpcConsumerRegistry).getRpcService(Mockito.any());
         MountPointStub mountPoint = new MountPointStub(dataBroker);