Refactor truststore merger logic

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

diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/JavaCertificateStoreControllerTest.java b/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/JavaTruststoreTest.java
similarity index 58%
rename from trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/JavaCertificateStoreControllerTest.java
rename to trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/JavaTruststoreTest.java
index 8ee77ef..99b8e62 100644 (file)
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/JavaCertificateStoreControllerTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/merger/model/JavaTruststoreTest.java
@@ -17,43 +17,40 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.merger.model;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.onap.oom.truststoremerger.certification.file.TestCertificateProvider.getSampleJksTruststoreFile;
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
-import org.onap.oom.truststoremerger.certification.file.TestCertificateProvider;
-import org.onap.oom.truststoremerger.certification.file.exception.AliasConflictException;
-import org.onap.oom.truststoremerger.certification.file.exception.MissingTruststoreException;
-import org.onap.oom.truststoremerger.certification.file.model.JavaTruststore;
-
-class JavaCertificateStoreControllerTest {
+import org.onap.oom.truststoremerger.merger.exception.AliasConflictException;
+import org.onap.oom.truststoremerger.merger.exception.MissingTruststoreException;
+import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
 
+class JavaTruststoreTest {
 
     @Test
     void throwExceptionWhenAliasConflictDetected() throws Exception {
         //given
-        JavaTruststore p12Truststore = TestCertificateProvider.getSampleP12Truststore();
-        List<CertificateWithAlias> jksTruststoreCertificates = getSampleJksTruststoreFile().getCertificates();
+        Truststore p12Truststore = TestCertificateProvider.getSampleP12Truststore();
+
+        List<CertificateWithAlias> certificateFromJks = TestCertificateProvider
+            .getSampleJksTruststoreFile().getCertificates();
 
         //when //then
         assertThatExceptionOfType(AliasConflictException.class)
-            .isThrownBy(() -> p12Truststore.addCertificate(jksTruststoreCertificates));
+            .isThrownBy(() -> p12Truststore.addCertificates(certificateFromJks));
     }
 
-
     @Test
     void throwExceptionWhenFileNotContainsTruststoreEntry() throws ExitableException {
         //given
-        JavaTruststore p12Truststore = TestCertificateProvider.getSampleP12Keystore();
+        Truststore p12Truststore = TestCertificateProvider.getSampleP12Keystore();
 
         //when//then
         assertThatExceptionOfType(MissingTruststoreException.class)
-            .isThrownBy(p12Truststore::getCertificates);
+            .isThrownBy(() -> p12Truststore.getCertificates());
     }
 
 }