From: Ruslan Kashapov Date: Thu, 4 Feb 2021 15:26:01 +0000 (+0200) Subject: fix mvc tests skipped for rest services X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5e1a5a7bde3a1650b86e2d22edde26520439757f;p=cps.git fix mvc tests skipped for rest services IssueID: CPS-175 Change-Id: I0ec53bf1b00a7fe7413819398cc7eddd520b4358 Signed-off-by: Ruslan Kashapov --- diff --git a/cps-nf-proxy-rest/src/test/java/org/onap/cps/TestApplication.java b/cps-nf-proxy-rest/src/test/java/org/onap/cps/TestApplication.java new file mode 100644 index 000000000..5e0e3679e --- /dev/null +++ b/cps-nf-proxy-rest/src/test/java/org/onap/cps/TestApplication.java @@ -0,0 +1,30 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2020 Pantheon.tech + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.cps; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * The @SpringBootApplication annotated class is required in order to run tests + * marked with @SpringBootTest annotation. + */ +@SpringBootApplication +public class TestApplication { +} diff --git a/cps-nf-proxy-rest/src/test/resources/application.yml b/cps-nf-proxy-rest/src/test/resources/application.yml new file mode 100644 index 000000000..fed1559b8 --- /dev/null +++ b/cps-nf-proxy-rest/src/test/resources/application.yml @@ -0,0 +1,5 @@ + +rest: + api: + xnf-base-path: /xnf-proxy/api +spring: diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml index 5bd223d30..8e220221a 100755 --- a/cps-rest/pom.xml +++ b/cps-rest/pom.xml @@ -1,129 +1,125 @@ - - 4.0.0 - - org.onap.cps - cps-parent - 0.0.1-SNAPSHOT - ../cps-parent/pom.xml - - - cps-rest - - - 0.51 - - - - - ${project.groupId} - cps-service - - - ${project.groupId} - cps-ri - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-jetty - - - org.springframework.boot - spring-boot-starter-actuator - - - io.swagger.core.v3 - swagger-annotations - - - io.springfox - springfox-boot-starter - - - io.swagger - swagger-annotations - - - org.apache.commons - commons-lang3 - - - org.modelmapper - modelmapper - - - - org.codehaus.groovy - groovy - test - - - org.spockframework - spock-core - test - - - org.spockframework - spock-spring - test - - - cglib - cglib-nodep - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - - - - - - - io.swagger.codegen.v3 - swagger-codegen-maven-plugin - - - - generate - - - ${project.basedir}/docs/api/swagger/openapi.yml - org.onap.cps.rest.controller - org.onap.cps.rest.model - org.onap.cps.rest.api - spring - false - - src/gen/java - java11 - true - true - - - - - - - - + + 4.0.0 + + org.onap.cps + cps-parent + 0.0.1-SNAPSHOT + ../cps-parent/pom.xml + + + cps-rest + + + + ${project.groupId} + cps-service + + + ${project.groupId} + cps-ri + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-jetty + + + org.springframework.boot + spring-boot-starter-actuator + + + io.swagger.core.v3 + swagger-annotations + + + io.springfox + springfox-boot-starter + + + io.swagger + swagger-annotations + + + org.apache.commons + commons-lang3 + + + org.modelmapper + modelmapper + + + + org.codehaus.groovy + groovy + test + + + org.spockframework + spock-core + test + + + org.spockframework + spock-spring + test + + + cglib + cglib-nodep + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + + io.swagger.codegen.v3 + swagger-codegen-maven-plugin + + + + generate + + + ${project.basedir}/docs/api/swagger/openapi.yml + org.onap.cps.rest.controller + org.onap.cps.rest.model + org.onap.cps.rest.api + spring + false + + src/gen/java + java11 + true + true + + + + + + + + diff --git a/cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy index bed3ba2c9..f6df3ce9e 100644 --- a/cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy +++ b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy @@ -52,7 +52,7 @@ class DataRestControllerSpec extends Specification { @Autowired MockMvc mvc - @Value('${rest.api.base-path}') + @Value('${rest.api.cps-base-path}') def basePath def dataspaceName = 'my_dataspace' diff --git a/cps-rest/src/test/java/org/onap/cps/TestApplication.java b/cps-rest/src/test/java/org/onap/cps/TestApplication.java new file mode 100644 index 000000000..5e0e3679e --- /dev/null +++ b/cps-rest/src/test/java/org/onap/cps/TestApplication.java @@ -0,0 +1,30 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2020 Pantheon.tech + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.cps; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * The @SpringBootApplication annotated class is required in order to run tests + * marked with @SpringBootTest annotation. + */ +@SpringBootApplication +public class TestApplication { +} diff --git a/cps-rest/src/test/resources/application.yml b/cps-rest/src/test/resources/application.yml new file mode 100644 index 000000000..8fd408710 --- /dev/null +++ b/cps-rest/src/test/resources/application.yml @@ -0,0 +1,5 @@ + +rest: + api: + cps-base-path: /cps/api +spring: