fix mvc tests skipped for rest services

IssueID: CPS-175
Change-Id: I0ec53bf1b00a7fe7413819398cc7eddd520b4358
Signed-off-by: Ruslan Kashapov <ruslan.kashapov@pantheon.tech>

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 (file)
index 0000000..5e0e367
--- /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 (file)
index 0000000..fed1559
--- /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 5bd223d..8e22022 100755 (executable)
--- a/cps-rest/pom.xml
+++ b/cps-rest/pom.xml
@@ -1,129 +1,125 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"\r
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-    <modelVersion>4.0.0</modelVersion>\r
-    <parent>\r
-        <groupId>org.onap.cps</groupId>\r
-        <artifactId>cps-parent</artifactId>\r
-        <version>0.0.1-SNAPSHOT</version>\r
-        <relativePath>../cps-parent/pom.xml</relativePath>\r
-    </parent>\r
-\r
-    <artifactId>cps-rest</artifactId>\r
-\r
-    <properties>\r
-        <minimum-coverage>0.51</minimum-coverage>\r
-    </properties>\r
-\r
-    <dependencies>\r
-        <dependency>\r
-            <groupId>${project.groupId}</groupId>\r
-            <artifactId>cps-service</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>${project.groupId}</groupId>\r
-            <artifactId>cps-ri</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.springframework.boot</groupId>\r
-            <artifactId>spring-boot-starter-web</artifactId>\r
-            <exclusions>\r
-                <exclusion>\r
-                    <groupId>org.springframework.boot</groupId>\r
-                    <artifactId>spring-boot-starter-tomcat</artifactId>\r
-                </exclusion>\r
-            </exclusions>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.springframework.boot</groupId>\r
-            <artifactId>spring-boot-starter-jetty</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.springframework.boot</groupId>\r
-            <artifactId>spring-boot-starter-actuator</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>io.swagger.core.v3</groupId>\r
-            <artifactId>swagger-annotations</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>io.springfox</groupId>\r
-            <artifactId>springfox-boot-starter</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>io.swagger</groupId>\r
-            <artifactId>swagger-annotations</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.apache.commons</groupId>\r
-            <artifactId>commons-lang3</artifactId>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.modelmapper</groupId>\r
-            <artifactId>modelmapper</artifactId>\r
-        </dependency>\r
-        <!-- T E S T   D E P E N D E N C I E S -->\r
-        <dependency>\r
-            <groupId>org.codehaus.groovy</groupId>\r
-            <artifactId>groovy</artifactId>\r
-            <scope>test</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.spockframework</groupId>\r
-            <artifactId>spock-core</artifactId>\r
-            <scope>test</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.spockframework</groupId>\r
-            <artifactId>spock-spring</artifactId>\r
-            <scope>test</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>cglib</groupId>\r
-            <artifactId>cglib-nodep</artifactId>\r
-            <scope>test</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.springframework.boot</groupId>\r
-            <artifactId>spring-boot-starter-test</artifactId>\r
-            <scope>test</scope>\r
-            <exclusions>\r
-                <exclusion>\r
-                    <groupId>org.junit.vintage</groupId>\r
-                    <artifactId>junit-vintage-engine</artifactId>\r
-                </exclusion>\r
-            </exclusions>\r
-        </dependency>\r
-    </dependencies>\r
-\r
-    <build>\r
-        <plugins>\r
-            <!-- Swagger code generation. -->\r
-            <plugin>\r
-                <groupId>io.swagger.codegen.v3</groupId>\r
-                <artifactId>swagger-codegen-maven-plugin</artifactId>\r
-                <executions>\r
-                    <execution>\r
-                        <goals>\r
-                            <goal>generate</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <inputSpec>${project.basedir}/docs/api/swagger/openapi.yml</inputSpec>\r
-                            <invokerPackage>org.onap.cps.rest.controller</invokerPackage>\r
-                            <modelPackage>org.onap.cps.rest.model</modelPackage>\r
-                            <apiPackage>org.onap.cps.rest.api</apiPackage>\r
-                            <language>spring</language>\r
-                            <generateSupportingFiles>false</generateSupportingFiles>\r
-                            <configOptions>\r
-                                <sourceFolder>src/gen/java</sourceFolder>\r
-                                <dateLibrary>java11</dateLibrary>\r
-                                <interfaceOnly>true</interfaceOnly>\r
-                                <useTags>true</useTags>\r
-                            </configOptions>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-</project>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.cps</groupId>
+        <artifactId>cps-parent</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../cps-parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>cps-rest</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cps-service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cps-ri</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jetty</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.modelmapper</groupId>
+            <artifactId>modelmapper</artifactId>
+        </dependency>
+        <!-- T E S T   D E P E N D E N C I E S -->
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-spring</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Swagger code generation. -->
+            <plugin>
+                <groupId>io.swagger.codegen.v3</groupId>
+                <artifactId>swagger-codegen-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>${project.basedir}/docs/api/swagger/openapi.yml</inputSpec>
+                            <invokerPackage>org.onap.cps.rest.controller</invokerPackage>
+                            <modelPackage>org.onap.cps.rest.model</modelPackage>
+                            <apiPackage>org.onap.cps.rest.api</apiPackage>
+                            <language>spring</language>
+                            <generateSupportingFiles>false</generateSupportingFiles>
+                            <configOptions>
+                                <sourceFolder>src/gen/java</sourceFolder>
+                                <dateLibrary>java11</dateLibrary>
+                                <interfaceOnly>true</interfaceOnly>
+                                <useTags>true</useTags>
+                            </configOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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 bed3ba2..f6df3ce 100644 (file)
--- 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 (file)
index 0000000..5e0e367
--- /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 (file)
index 0000000..8fd4087
--- /dev/null
+++ b/cps-rest/src/test/resources/application.yml
@@ -0,0 +1,5 @@
+
+rest:
+    api:
+        cps-base-path: /cps/api
+spring: