Refactor truststore merger logic

[oom/platform/cert-service.git] / trustStoreMerger / src / test / java / org / onap / oom / truststoremerger / common / PasswordReaderTest.java

diff --git a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/PasswordReaderTest.java b/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/PasswordReaderTest.java
similarity index 79%
rename from trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/PasswordReaderTest.java
rename to trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/PasswordReaderTest.java
index 40eda4d..a43951b 100644 (file)
--- a/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/certification/file/provider/PasswordReaderTest.java
+++ b/trustStoreMerger/src/test/java/org/onap/oom/truststoremerger/common/PasswordReaderTest.java
@@ -17,12 +17,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.common;
 
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
-import org.onap.oom.truststoremerger.certification.file.exception.PasswordReaderException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -31,15 +31,13 @@ class PasswordReaderTest {
 
     @Test
     void shouldReturnCorrectPasswordFromFile() throws PasswordReaderException {
-        PasswordReader passwordReader = new PasswordReader();
-        String fileData = passwordReader.readPassword(new File("src/test/resources/truststore-jks.pass"));
+        String fileData = PasswordReader.readPassword(new File("src/test/resources/truststore-jks.pass"));
         assertThat(fileData).isEqualTo("EOyuFbuYDyq_EhpboM72RHua");
     }
 
     @Test
     void shouldThrowExceptionForNonExistingFile() {
-        PasswordReader passwordReader = new PasswordReader();
         assertThatExceptionOfType(PasswordReaderException.class)
-                .isThrownBy(() -> passwordReader.readPassword(new File("src/test/resources/non-esisting-file.pass")));
+                .isThrownBy(() -> PasswordReader.readPassword(new File("src/test/resources/non-esisting-file.pass")));
     }
 }