summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--certService/pom.xml18
-rw-r--r--certServiceClient/pom.xml11
-rw-r--r--certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java (renamed from certServiceClient/src/main/java/org/onap/certservice/client/CertServiceClientApp.java)4
-rw-r--r--certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java33
-rw-r--r--pom.xml28
5 files changed, 75 insertions, 19 deletions
diff --git a/certService/pom.xml b/certService/pom.xml
index 03200dd3..a8a5296c 100644
--- a/certService/pom.xml
+++ b/certService/pom.xml
@@ -70,24 +70,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot-starter.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/certServiceClient/pom.xml b/certServiceClient/pom.xml
index 70cd38a7..2b4f2d02 100644
--- a/certServiceClient/pom.xml
+++ b/certServiceClient/pom.xml
@@ -27,5 +27,16 @@
</pluginManagement>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ </dependency>
+ </dependencies>
+
</project> \ No newline at end of file
diff --git a/certServiceClient/src/main/java/org/onap/certservice/client/CertServiceClientApp.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java
index 64d58633..f3b1c0f3 100644
--- a/certServiceClient/src/main/java/org/onap/certservice/client/CertServiceClientApp.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java
@@ -1,4 +1,4 @@
-package org.onap.certservice.client;/*
+/*
* ============LICENSE_START=======================================================
* aaf-certservice-client
* ================================================================================
@@ -18,6 +18,8 @@ package org.onap.certservice.client;/*
* ============LICENSE_END=========================================================
*/
+package org.onap.aaf.certservice.client;
+
public class CertServiceClientApp {
public static void main(String[] args) {
diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java
new file mode 100644
index 00000000..a79095c4
--- /dev/null
+++ b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java
@@ -0,0 +1,33 @@
+/*============LICENSE_START=======================================================
+ * aaf-certservice-client
+ * ================================================================================
+ * Copyright (C) 2020 Nokia. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.aaf.certservice.client;
+
+import org.junit.jupiter.api.Test;
+
+class CertServiceClientAppTest {
+ // Sonar check for this test disabled due to lack of assertion in test.
+ // Intention of this test is to check if app runs without exiting Java.
+ @Test
+ public void mainShouldSucceed() { //NOSONAR
+ String[] params = {""};
+ CertServiceClientApp.main(params);
+ }
+
+} \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5dcd8ac1..6c20bb45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
<springdoc-openapi-maven-plugin.version>0.2</springdoc-openapi-maven-plugin.version>
<gson.version>2.8.6</gson.version>
<docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
+ <junit.version>5.6.0</junit.version>
<!-- Docker -->
<skipDockerPush>true</skipDockerPush>
@@ -70,6 +71,27 @@
<module>certServiceClient</module>
</modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot-starter.version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<distributionManagement>
<repository>
<id>ecomp-releases</id>
@@ -155,6 +177,12 @@
<!-- Test dependecies -->
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito-core.version}</version>