Refactor truststore MainApp (rename to CertificatePostProcessor)

- Move common exception handling logic to dedicated class AppExecutor

Issue-ID: DCAEGEN2-2253
Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Change-Id: Ic3cffa155e488258067df22e901ceaa0a2eca5f1

2 files changed, 76 insertions, 42 deletions

diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/AppExecutorTest.java b/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/AppExecutorTest.java
new file mode 100644
index 00000000..bf5196e9
--- /dev/null
+++ b/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/AppExecutorTest.java
@@ -0,0 +1,76 @@
+/*============LICENSE_START=======================================================
+ * oom-truststore-merger
+ * ================================================================================
+ * 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.oom.truststoremerger;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.verify;
+import static org.onap.oom.truststoremerger.api.ExitStatus.ALIAS_CONFLICT_EXCEPTION;
+import static org.onap.oom.truststoremerger.api.ExitStatus.SUCCESS;
+import static org.onap.oom.truststoremerger.api.ExitStatus.UNEXPECTED_EXCEPTION;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.onap.oom.truststoremerger.merger.exception.AliasConflictException;
+
+@ExtendWith(MockitoExtension.class)
+public class AppExecutorTest {
+
+    @Mock
+    Runnable logic;
+    @Mock
+    AppExitHandler exitHandler;
+    @InjectMocks
+    AppExecutor executor = new AppExecutor();
+
+    @Test
+    void shouldExitWithUnexpectedException() {
+        doThrow(new NullPointerException()).when(logic).run();
+        doNothing().when(exitHandler).exit(UNEXPECTED_EXCEPTION);
+
+        executor.execute(logic);
+
+        verify(exitHandler).exit(UNEXPECTED_EXCEPTION);
+    }
+
+    @Test
+    void shouldExitWithKnownException() {
+        doThrow(new AliasConflictException("")).when(logic).run();
+        doNothing().when(exitHandler).exit(ALIAS_CONFLICT_EXCEPTION);
+
+        executor.execute(logic);
+
+        verify(exitHandler).exit(ALIAS_CONFLICT_EXCEPTION);
+    }
+
+    @Test
+    void shouldExitWithSuccess() {
+        doNothing().when(logic).run();
+        doNothing().when(exitHandler).exit(SUCCESS);
+
+        executor.execute(logic);
+
+        verify(exitHandler).exit(SUCCESS);
+    }
+}
diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/TrustStoreMergerTest.java b/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/TrustStoreMergerTest.java
deleted file mode 100644
index a7c62361..00000000
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/TrustStoreMergerTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*============LICENSE_START=======================================================
- * oom-truststore-merger
- * ================================================================================
- * 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.oom.truststoremerger;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.oom.truststoremerger.api.ExitStatus;
-
-import static org.mockito.Mockito.verify;
-
-@ExtendWith(MockitoExtension.class)
-class TrustStoreMergerTest {
-
-    @Mock
-    AppExitHandler appExitHandler;
-
-    @Test
-    void shouldExitWithTruststoresPathsProviderExceptionDueToMissingTrustoresPathEnvs() {
-        new TrustStoreMerger(appExitHandler).run();
-
-        verify(appExitHandler).exit(ExitStatus.TRUSTSTORES_PATHS_PROVIDER_EXCEPTION);
-    }
-}