From: Toine Siebelink <toine.siebelink@est.tech>
Date: Mon, 1 Feb 2021 15:50:32 +0000 (+0000)
Subject: Merge "Retrieve an Anchor for a given dataspace by anchor name - REST layer"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3786f6394d8a973adba50bb5af3b459f0d296f93;hp=-c;p=cps.git

Merge "Retrieve an Anchor for a given dataspace by anchor name - REST layer"
---

3786f6394d8a973adba50bb5af3b459f0d296f93
diff --combined cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
index c1c7c5dcd,db0ab6d64..5f8147cd5
mode 100644,100755..100755
--- a/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
+++ b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
@@@ -20,9 -20,14 +20,15 @@@
  
  package org.onap.cps.rest.controller
  
+ import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED
+ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete
+ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart
+ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
+ 
  import org.modelmapper.ModelMapper
  import org.onap.cps.api.CpsAdminService
 +import org.onap.cps.api.CpsDataService
  import org.onap.cps.api.CpsModuleService
  import org.onap.cps.spi.exceptions.DataspaceAlreadyDefinedException
  import org.onap.cps.spi.exceptions.SchemaSetInUseException
@@@ -41,12 -46,6 +47,6 @@@ import org.springframework.util.MultiVa
  import spock.lang.Specification
  import spock.lang.Unroll
  
- import static org.onap.cps.spi.CascadeDeleteAllowed.CASCADE_DELETE_PROHIBITED
- import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete
- import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
- import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart
- import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
- 
  @WebMvcTest
  class AdminRestControllerSpec extends Specification {
  
@@@ -56,9 -55,6 +56,9 @@@
      @SpringBean
      CpsAdminService mockCpsAdminService = Mock()
  
 +    @SpringBean
 +    CpsDataService mockCpsDataService = Mock()
 +
      @SpringBean
      ModelMapper modelMapper = Mock()
  
@@@ -69,6 -65,7 +69,7 @@@
      def basePath
  
      def anchorsEndpoint = '/v1/dataspaces/my_dataspace/anchors'
+     def anchorEndpoint = '/v1/dataspaces/my_dataspace/anchors/my_anchorname'
      def schemaSetsEndpoint = '/v1/dataspaces/test-dataspace/schema-sets'
      def schemaSetEndpoint = schemaSetsEndpoint + '/my_schema_set'
  
@@@ -243,4 -240,17 +244,17 @@@
              response.status == HttpStatus.OK.value()
              response.getContentAsString().contains('my_anchor')
      }
+ 
+     def 'Get existing anchor by dataspace and anchor name.'() {
+         given:
+             mockCpsAdminService.getAnchor('my_dataspace','my_anchorname') >> new Anchor(name: 'my_anchorname', dataspaceName: 'my_dataspace', schemaSetName: 'my_schemaSetName')
+         when: 'get anchor API is invoked'
+             def response = mvc.perform(get("$basePath$anchorEndpoint")).andReturn().response
+             def responseContent = response.getContentAsString()
+         then: 'the correct anchor is returned'
+             response.status == HttpStatus.OK.value()
+             responseContent.contains('my_anchorname')
+             responseContent.contains('my_dataspace')
+             responseContent.contains('my_schemaSetName')
+     }
  }