From: Toine Siebelink <toine.siebelink@est.tech>
Date: Fri, 22 Jan 2021 15:32:19 +0000 (+0000)
Subject: Merge "Enable log level management via actuator, /cps/api path to use for REST contro... 
X-Git-Tag: 0.0.1~42
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5fa9a9ebb6459755a4267066e23f9671b9fac5b9;p=cps.git

Merge "Enable log level management via actuator, /cps/api path to use for REST controllers only only"
---

5fa9a9ebb6459755a4267066e23f9671b9fac5b9
diff --cc cps-rest/src/test/groovy/org/onap/cps/rest/controller/AdminRestControllerSpec.groovy
index 60f54bfa7b,2d4fe9bb01..540d6224aa
--- 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
@@@ -176,22 -142,9 +180,22 @@@ class AdminRestControllerSpec extends S
          return new MockMultipartFile("file", filename, "text/plain", content.getBytes())
      }
  
 +    def createZipMultipartFileFromResource(resourcePath) {
 +        return new MockMultipartFile("file", "test.zip", "application/zip",
 +                getClass().getResource(resourcePath).getBytes())
 +    }
 +
 +    def createMultipartFileForIOException(extension) {
 +        def multipartFile = Mock(MockMultipartFile)
 +        multipartFile.getOriginalFilename() >> "TEST." + extension
 +        multipartFile.getBytes() >> { throw new IOException() }
 +        multipartFile.getInputStream() >> { throw new IOException() }
 +        return multipartFile
 +    }
 +
      def performCreateSchemaSetRequest(multipartFile) {
          return mvc.perform(
-                 multipart(schemaSetsEndpoint)
+                 multipart("$basePath$schemaSetsEndpoint")
                          .file(multipartFile)
                          .param('schema-set-name', 'test-schema-set')
          ).andReturn().response