summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkjaniak <kornel.janiak@nokia.com>2020-02-18 13:25:43 +0100
committerkjaniak <kornel.janiak@nokia.com>2020-02-18 14:48:30 +0100
commit3a1f830126b02e30bcb46de697ae7ff9a3f6b97e (patch)
treeee18f6dea10dae52114e1ad532b39c2bf755285e
parent39d5f8d61857e55fd36add1235ca87157b4c9c92 (diff)
Add first test of System.exit
Issue-ID: AAF-996 Signed-off-by: kjaniak <kornel.janiak@nokia.com> Change-Id: Id0ee4d6a08e7050ef080f0e1fadea8c07459571c
-rw-r--r--certServiceClient/pom.xml9
-rw-r--r--certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClient.java (renamed from certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientAppTest.java)19
-rw-r--r--certServiceClient/src/main/java/org/onap/aaf/certservice/client/CertServiceClientApp.java4
-rw-r--r--certServiceClient/src/test/java/org/onap/aaf/certservice/client/CertServiceClientTest.java48
-rw-r--r--pom.xml8
5 files changed, 74 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
diff --git a/pom.xml b/pom.xml
index 38dfc9f3..5366313f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
<gson.version>2.8.6</gson.version>
<docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
<junit.version>5.5.2</junit.version>
+ <mockito-junit-jupiter.version>2.17.0</mockito-junit-jupiter.version>
<!-- Docker -->
<skipDockerPush>true</skipDockerPush>
@@ -258,6 +259,13 @@
<version>${mockito-core.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockito-junit-jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</dependencyManagement>