X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=generic-resource-api%2Fprovider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fsdnc%2Fnorthbound%2Futil%2FGenericResourceApiSvcLogicServiceClientMockUtil.java;h=784717d9df9e1e38ad4e1170c640992d5fd347d1;hb=957aad2599fe9e694dbe63f900f272c1028687e2;hp=cd6280b7c5fe3c72a6d550541932961d8ed987af;hpb=107951a4b13c1a4c725b9df201a1af7595ef4dec;p=sdnc%2Fnorthbound.git

diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/GenericResourceApiSvcLogicServiceClientMockUtil.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/GenericResourceApiSvcLogicServiceClientMockUtil.java
index cd6280b7..784717d9 100644
--- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/GenericResourceApiSvcLogicServiceClientMockUtil.java
+++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/GenericResourceApiSvcLogicServiceClientMockUtil.java
@@ -21,17 +21,16 @@
 
 package org.onap.sdnc.northbound.util;
 
-import org.onap.sdnc.northbound.GenericResourceApiSvcLogicServiceClient;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.ServiceDataBuilder;
-
-import java.util.Properties;
-
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.isA;
 import static org.mockito.Mockito.when;
 import static org.onap.sdnc.northbound.util.MDSALUtil.build;
 import static org.onap.sdnc.northbound.util.PropBuilder.propBuilder;
 
+import java.util.Properties;
+import org.onap.sdnc.northbound.GenericResourceApiSvcLogicServiceClient;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.ServiceDataBuilder;
+
 
 /**
  * GenericResourceApiSvcLogicServiceClientMockUtil provides a set of util methods for quickly configuring method
@@ -50,75 +49,117 @@ public class GenericResourceApiSvcLogicServiceClientMockUtil {
     public final String errorMessage = "error-message";
     public final String ackFinal = "ack-final";
     public final String serviceObjectPath = "service-object-path";
+    public final String networkObjectPath = "network-object-path";
+    public final String networkId = "networkId";
 
-    private final GenericResourceApiSvcLogicServiceClient mockGenericResourceApiSvcLogicServiceClient;
 
+    private final GenericResourceApiSvcLogicServiceClient mockGenericResourceApiSvcLogicServiceClient;
 
 
-    public GenericResourceApiSvcLogicServiceClientMockUtil(GenericResourceApiSvcLogicServiceClient mockGenericResourceApiSvcLogicServiceClient) {
+    public GenericResourceApiSvcLogicServiceClientMockUtil(
+        GenericResourceApiSvcLogicServiceClient mockGenericResourceApiSvcLogicServiceClient) {
         this.mockGenericResourceApiSvcLogicServiceClient = mockGenericResourceApiSvcLogicServiceClient;
     }
 
 
-    /** @param scvOperation -  The scvOperation parameter to use on the {@link GenericResourceApiSvcLogicServiceClient} methods */
+    /**
+     * @param scvOperation -  The scvOperation parameter to use on the {@link GenericResourceApiSvcLogicServiceClient}
+     * methods
+     */
     public void setScvOperation(String scvOperation) {
         this.scvOperation = scvOperation;
     }
 
     /**
-     * Configure {@link GenericResourceApiSvcLogicServiceClient#hasGraph(String, String, String, String)}
-     * to return the specified value when when invoked with the parameters
-     * {@link #MODULE}, {@link #MODE}, {@link #VERSION} and {@link #scvOperation}
+     * Configure {@link GenericResourceApiSvcLogicServiceClient#hasGraph(String, String, String, String)} to return the
+     * specified value when when invoked with the parameters {@link #MODULE}, {@link #MODE}, {@link #VERSION} and {@link
+     * #scvOperation}
      */
     public void mockHasGraph(Boolean isHasGraph) throws Exception {
         when(
-                mockGenericResourceApiSvcLogicServiceClient
-                        .hasGraph(
-                                eq(MODULE),
-                                eq(scvOperation),
-                                eq(VERSION),
-                                eq(MODE)
-                        )
-        )
-                .thenReturn(isHasGraph);
+            mockGenericResourceApiSvcLogicServiceClient
+                .hasGraph(
+                    eq(MODULE),
+                    eq(scvOperation),
+                    eq(VERSION),
+                    eq(MODE))
+        ).thenReturn(isHasGraph);
     }
 
 
     /**
-     * @return
-     * PropBuilder - A PropBuilder populated with the expected properties returned from
-     * {@link GenericResourceApiSvcLogicServiceClient#execute(String, String, String, String, ServiceDataBuilder, Properties)}
+     * @return PropBuilder - A PropBuilder populated with the expected properties returned from {@link
+     * GenericResourceApiSvcLogicServiceClient#execute(String, String, String, String, ServiceDataBuilder, Properties)}
      */
-    public PropBuilder createExecuteOKResult(){
+    public PropBuilder createExecuteOKResult() {
         return propBuilder()
-                .set(errorCode,"200")
-                .set(errorMessage,"OK")
-                .set(ackFinal,"Y")
-                .set(serviceObjectPath,"XYZ");
+            .set(errorCode, "200")
+            .set(errorMessage, "OK")
+            .set(ackFinal, "Y")
+            .set(serviceObjectPath, "serviceObjectPath: XYZ")
+            .set(networkObjectPath, "networkObjectPath: XYZ")
+            .set(networkId, "networkId: XYZ");
+
     }
 
 
     /**
-     * Configure
-     * {@link GenericResourceApiSvcLogicServiceClient#execute(String, String, String, String, ServiceDataBuilder, Properties)}
-     * to return the specified svcResultProp when when invoked with the parameters
+     * Configure {@link GenericResourceApiSvcLogicServiceClient#execute(String, String, String, String,
+     * ServiceDataBuilder, Properties)} to return the specified svcResultProp when when invoked with the parameters
      * {@link #MODULE}, {@link #MODE}, {@link #VERSION} and {@link #scvOperation}
      */
-    public void mockExecute(PropBuilder svcResultProp) throws Exception{
+    public void mockExecute(PropBuilder svcResultProp) throws Exception {
         when(
-                mockGenericResourceApiSvcLogicServiceClient
-                        .execute(
-                                eq(MODULE),
-                                eq(scvOperation),
-                                eq(VERSION),
-                                eq(MODE),
-                                isA(ServiceDataBuilder.class),
-                                isA(Properties.class)
-                        )
-        )
-                .thenReturn(build(
-                        svcResultProp
-                ));
+            mockGenericResourceApiSvcLogicServiceClient
+                .execute(
+                    eq(MODULE),
+                    eq(scvOperation),
+                    eq(VERSION),
+                    eq(MODE),
+                    isA(ServiceDataBuilder.class),
+                    isA(Properties.class))
+        ).thenReturn(build(svcResultProp));
     }
 
+    public void mockExecute(RuntimeException exception) throws Exception {
+        when(
+            mockGenericResourceApiSvcLogicServiceClient
+                .execute(
+                    eq(MODULE),
+                    eq(scvOperation),
+                    eq(VERSION),
+                    eq(MODE),
+                    isA(ServiceDataBuilder.class),
+                    isA(Properties.class)
+                )
+        ).thenThrow(exception);
+    }
+
+
+    public void mockExecuteWoServiceData(PropBuilder svcResultProp) throws Exception {
+        when(
+            mockGenericResourceApiSvcLogicServiceClient
+                .execute(
+                    eq(MODULE),
+                    eq(scvOperation),
+                    eq(VERSION),
+                    eq(MODE),
+                    isA(Properties.class))
+        ).thenReturn(build(svcResultProp));
+    }
+
+    public void mockExecuteWoServiceData(RuntimeException exception) throws Exception {
+        when(
+            mockGenericResourceApiSvcLogicServiceClient
+                .execute(
+                    eq(MODULE),
+                    eq(scvOperation),
+                    eq(VERSION),
+                    eq(MODE),
+                    isA(Properties.class)
+                )
+        ).thenThrow(exception);
+    }
+
+
 }