Merge "Changing putOperationWithJson to postOperationWithJson"

[cps.git] / cps-ncmp-service / src / test / groovy / org / onap / cps / ncmp / api / impl / NetworkCmProxyDataServiceImplSpec.groovy

diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImplSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImplSpec.groovy
index 8bb0ee2..6249271 100644 (file)
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImplSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImplSpec.groovy
@@ -22,10 +22,6 @@
 
 package org.onap.cps.ncmp.api.impl
 
-import org.onap.cps.ncmp.api.impl.client.DmiRestClient
-import org.onap.cps.ncmp.api.impl.operations.DmiRequestBody
-import org.springframework.http.HttpHeaders
-
 import static org.onap.cps.ncmp.api.impl.operations.DmiOperations.DataStoreEnum.PASSTHROUGH_OPERATIONAL
 import static org.onap.cps.ncmp.api.impl.operations.DmiOperations.DataStoreEnum.PASSTHROUGH_RUNNING
 import static org.onap.cps.ncmp.api.impl.operations.DmiRequestBody.OperationEnum.CREATE
@@ -40,7 +36,6 @@ import org.onap.cps.api.CpsModuleService
 import org.onap.cps.api.CpsQueryService
 import org.onap.cps.ncmp.api.impl.exception.NcmpException
 import org.onap.cps.ncmp.api.impl.operations.DmiDataOperations
-import org.onap.cps.ncmp.api.impl.operations.DmiModelOperations
 import org.onap.cps.spi.FetchDescendantsOption
 import org.onap.cps.spi.model.DataNode
 import org.springframework.http.HttpStatus
@@ -97,7 +92,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification {
             1 * mockCpsDataService.saveListElements(expectedDataspaceName, cmHandle, xpath, jsonData, noTimestamp)
     }
 
-    def 'Write resource data for passthrough running from dmi using POST #scenario cm handle properties.'() {
+    def 'Write resource data for pass-through running from dmi using POST #scenario cm handle properties.'() {
         given: 'a data node'
             def dataNode = getDataNode(includeCmHandleProperties)
         and: 'cpsDataService returns valid datanode'
@@ -117,7 +112,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification {
             'without' | false                     || '{}'
     }
 
-    def 'Write resource data for passthrough running from dmi using POST "not found" response (from DMI).'() {
+    def 'Write resource data for pass-through running from dmi using POST "not found" response (from DMI).'() {
         given: 'a data node'
             def dataNode = getDataNode(true)
         and: 'cpsDataService returns valid dataNode'
@@ -147,7 +142,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification {
             fetchDescendantsOption << FetchDescendantsOption.values()
     }
 
-    def 'Get resource data for passthrough operational from dmi.'() {
+    def 'Get resource data for pass-through operational from dmi.'() {
         given: 'a data node'
             def dataNode = getDataNode(true)
         and: 'get data node is called'
@@ -169,7 +164,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification {
             response == 'result-json'
     }
 
-    def 'Get resource data for passthrough operational from dmi with Json Processing Exception.'() {
+    def 'Get resource data for pass-through operational from dmi with Json Processing Exception.'() {
         given: 'a data node'
             def dataNode = getDataNode(true)
         and: 'cps data service returns valid data node'
@@ -192,7 +187,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification {
             exceptionThrown.details == 'DMI status code: 404, DMI response body: NOK-json'
     }
 
-    def 'Get resource data for passthrough operational from dmi return NOK response.'() {
+    def 'Get resource data for pass-through operational from dmi return NOK response.'() {
         given: 'a data node'
             def dataNode = getDataNode(true)
         and: 'cps data service returns valid data node'
@@ -216,7 +211,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification {
             exceptionThrown.details.contains('NOK-json')
     }
 
-    def 'Get resource data for passthrough running from dmi.'() {
+    def 'Get resource data for pass-through running from dmi.'() {
         given: 'a data node'
             def dataNode = getDataNode(true)
         and: 'cpsDataService returns valid data node'
@@ -237,7 +232,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification {
             response == '{result-json}'
     }
 
-    def 'Get resource data for passthrough running from dmi return NOK response.'() {
+    def 'Get resource data for pass-through running from dmi return NOK response.'() {
         given: 'a data node'
             def dataNode = getDataNode(true)
         and: 'cpsDataService returns valid dataNode'
@@ -295,7 +290,7 @@ class NetworkCmProxyDataServiceImplSpec extends Specification {
             1 * mockCpsDataService.replaceNodeTree(expectedDataspaceName, cmHandle, xpath, jsonData, noTimestamp)
     }
 
-    def 'Update resource data for passthrough running from dmi using POST #scenario cm handle properties.'() {
+    def 'Update resource data for pass-through running from dmi using POST #scenario cm handle properties.'() {
         given: 'a data node'
             def dataNode = getDataNode(includeCmHandleProperties)
         and: 'cpsDataService returns valid datanode'