Refactor truststore merger logic

[oom/platform/cert-service.git] / trustStoreMerger / src / test / java / org / onap / oom / truststoremerger / merger / model / TruststoreFactoryTest.java

diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/TruststoreFactoryTest.java b/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TruststoreFactoryTest.java
similarity index 60%
rename from trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/TruststoreFactoryTest.java
rename to trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TruststoreFactoryTest.java
index b2063cc..eb6c847 100644 (file)
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/TruststoreFactoryTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/TruststoreFactoryTest.java
@@ -18,25 +18,18 @@
  */
 
 
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.merger.model;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.oom.truststoremerger.certification.file.TruststoreFileFactory;
-import org.onap.oom.truststoremerger.certification.file.model.JavaTruststore;
-import org.onap.oom.truststoremerger.certification.file.model.PemTruststore;
-import org.onap.oom.truststoremerger.certification.file.model.Truststore;
-import org.onap.oom.truststoremerger.certification.file.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.certification.file.exception.LoadTruststoreException;
-
-import java.io.File;
-import org.onap.oom.truststoremerger.certification.file.exception.PasswordReaderException;
-import org.onap.oom.truststoremerger.certification.file.exception.TruststoreFileFactoryException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
+import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.onap.oom.truststoremerger.merger.exception.TruststoreFileFactoryException;
 
 @ExtendWith(MockitoExtension.class)
 class TruststoreFactoryTest {
@@ -50,66 +43,66 @@ class TruststoreFactoryTest {
     private static final String TRUSTSTORE_UNKNOWN_EXTENSION_PATH = "src/test/resources/truststore-jks.unknown";
     private static final String NON_EXISTING_TRUSTSTORE_PATH = "src/test/resources/non-existing-truststore.jks";
 
-    private TruststoreFileFactory truststoreFileFactory;
-
-    @BeforeEach
-    void setUp() {
-        truststoreFileFactory = new TruststoreFileFactory(new FileManager(), new PasswordReader());
-    }
-
     @Test
     void shouldReturnCorrectJksTruststoreForJksFile()
         throws LoadTruststoreException, PasswordReaderException, TruststoreFileFactoryException, KeystoreInstanceException {
-        Truststore truststore = truststoreFileFactory
-                .create(TRUSTSTORE_JKS_PATH, TRUSTSTORE_JKS_PASS_PATH);
-        assertThat(truststore).isInstanceOf(JavaTruststore.class);
-        JavaTruststore jksTruststore = (JavaTruststore) truststore;
-        assertThat(jksTruststore.getFile()).isEqualTo(new File(TRUSTSTORE_JKS_PATH));
+        //given, when
+        Truststore truststore = TruststoreFactory
+            .create(TRUSTSTORE_JKS_PATH, TRUSTSTORE_JKS_PASS_PATH);
+
+        //then
+        assertThat(truststore).isInstanceOf(Truststore.class);
     }
 
     @Test
     void shouldReturnCorrectP12TruststoreForP12File()
         throws LoadTruststoreException, PasswordReaderException, TruststoreFileFactoryException, KeystoreInstanceException {
-        Truststore truststore = truststoreFileFactory
-                .create(TRUSTSTORE_P12_PATH,
-                        TRUSTSTORE_P12_PASS_PATH);
-        assertThat(truststore).isInstanceOf(JavaTruststore.class);
+        //given, when
+        Truststore truststore = TruststoreFactory
+            .create(TRUSTSTORE_P12_PATH, TRUSTSTORE_P12_PASS_PATH);
+
+        //then
+        assertThat(truststore).isInstanceOf(Truststore.class);
     }
 
     @Test
     void shouldReturnCorrectPemTruststoreForPemFile()
         throws LoadTruststoreException, PasswordReaderException, TruststoreFileFactoryException, KeystoreInstanceException {
-        Truststore truststore = truststoreFileFactory
-                .create(TRUSTSTORE_PEM_PATH,
-                        EMPTY_PASS_PATH);
-        assertThat(truststore).isInstanceOf(PemTruststore.class);
+        //given, when
+        Truststore truststore = TruststoreFactory
+            .create(TRUSTSTORE_PEM_PATH,
+                EMPTY_PASS_PATH);
+
+        //then
+        assertThat(truststore).isInstanceOf(Truststore.class);
     }
 
     @Test
     void shouldThrowExceptionForInvalidP12PassPath() {
         assertThatExceptionOfType(PasswordReaderException.class).isThrownBy(
-                () -> truststoreFileFactory.create(TRUSTSTORE_P12_PATH, EMPTY_PASS_PATH)
+            () -> TruststoreFactory.create(TRUSTSTORE_P12_PATH, EMPTY_PASS_PATH)
         );
     }
 
     @Test
     void shouldThrowExceptionForInvalidJksPassPath() {
         assertThatExceptionOfType(PasswordReaderException.class).isThrownBy(
-                () -> truststoreFileFactory.create(TRUSTSTORE_JKS_PATH, EMPTY_PASS_PATH)
+            () -> TruststoreFactory.create(TRUSTSTORE_JKS_PATH, EMPTY_PASS_PATH)
         );
     }
 
     @Test
     void shouldThrowExceptionForUnknownTruststoreExtension() {
         assertThatExceptionOfType(TruststoreFileFactoryException.class).isThrownBy(
-                () -> truststoreFileFactory.create(TRUSTSTORE_UNKNOWN_EXTENSION_PATH, TRUSTSTORE_JKS_PASS_PATH)
+            () -> TruststoreFactory
+                .create(TRUSTSTORE_UNKNOWN_EXTENSION_PATH, TRUSTSTORE_JKS_PASS_PATH)
         );
     }
 
     @Test
     void shouldThrowExceptionForNonExistingTruststoreFile() {
         assertThatExceptionOfType(TruststoreFileFactoryException.class).isThrownBy(
-                () -> truststoreFileFactory.create(NON_EXISTING_TRUSTSTORE_PATH, TRUSTSTORE_JKS_PASS_PATH)
+            () -> TruststoreFactory.create(NON_EXISTING_TRUSTSTORE_PATH, TRUSTSTORE_JKS_PASS_PATH)
         );
     }