4 files changed, 66 insertions, 14 deletions
diff --git a/certServiceClient/pom.xml b/certServiceClient/pom.xml
index 2f3aa62e..84c33c72 100644
--- a/certServiceClient/pom.xml
+++ b/certServiceClient/pom.xml
@@ -25,7 +25,14 @@
     </build>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClient.java
index e9d169a0..e5f1a6a0 100644
--- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClient.java
@@ -16,19 +16,14 @@
  * 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);
+public class CertServiceClient {
+    public void run(String[] args) {
+        exit(0);
     }
 
-}
-\ No newline at end of file
+    protected void exit(int statusCode){
+        System.exit(statusCode);
+    }
+}
diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java
index 8b200be3..b0490e88 100644
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java
@@ -22,6 +22,8 @@ package org.onap.aaf.certservice.client;
 
 public class CertServiceClientApp {
     public static void main(String[] args) {
-
+        CertServiceClient certServiceClient = new CertServiceClient();
+        certServiceClient.run(args);
     }
+
 }
 \ No newline at end of file
diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientTest.java b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientTest.java
new file mode 100644
index 00000000..12c2db06
--- /dev/null
+++ b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientTest.java
@@ -0,0 +1,48 @@
+/*============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;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class CertServiceClientTest {
+    @Spy
+    CertServiceClient certServiceClient = new CertServiceClient();
+
+    //  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 shouldExitWithZero_onApplicationSuccessfulFinish() {   //NOSONAR
+        //  given
+        String[] params = {""};
+        doNothing().when(certServiceClient).exit(0);
+        //  when
+        certServiceClient.run(params);
+        //  then
+        verify(certServiceClient).exit(0);
+    }
+
+}
+\ No newline at end of file