diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/java/org/onap/a1pesimulator/service/fileready/FtpServerServiceTest.java | 21 | ||||
-rw-r--r-- | src/test/resources/application.properties | 2 | ||||
-rw-r--r-- | src/test/resources/vnf.config | 2 |
3 files changed, 17 insertions, 8 deletions
diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/FtpServerServiceTest.java b/src/test/java/org/onap/a1pesimulator/service/fileready/FtpServerServiceTest.java index d984b20..5fc3d84 100644 --- a/src/test/java/org/onap/a1pesimulator/service/fileready/FtpServerServiceTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/fileready/FtpServerServiceTest.java @@ -6,6 +6,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.onap.a1pesimulator.service.fileready.FtpServerService.deletePMBulkFile; @@ -16,10 +17,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Spy; import org.onap.a1pesimulator.data.fileready.FileData; +import org.onap.a1pesimulator.util.VnfConfigReader; import org.springframework.test.util.ReflectionTestUtils; import ch.qos.logback.classic.spi.ILoggingEvent; @@ -31,8 +34,7 @@ import reactor.test.StepVerifier; class FtpServerServiceTest extends CommonFileReady { - @Spy - FtpServerService ftpServerService; + private FtpServerService ftpServerService; @Mock SSHClient sshClient; @@ -40,6 +42,16 @@ class FtpServerServiceTest extends CommonFileReady { @Mock SFTPClient sftpClient; + @InjectMocks + VnfConfigReader vnfConfigReader; + + @BeforeEach + void setUp() { + super.setUp(); + ReflectionTestUtils.setField(vnfConfigReader, "vnfConfigFile", "src/test/resources/vnf.config"); + ftpServerService = spy(new FtpServerService(vnfConfigReader)); + } + /** * Test to save archived PM Bulk File into specify directory */ @@ -85,7 +97,6 @@ class FtpServerServiceTest extends CommonFileReady { @Test void errorWhileUploadingFileToFtp() { ReflectionTestUtils.setField(ftpServerService, "ftpServerUpload", true); - ReflectionTestUtils.setField(ftpServerService, "ftpServerPort", "22"); FileData testFileData = getTestFileData(); StepVerifier.create(ftpServerService.uploadFileToFtp(testFileData)) .verifyComplete(); @@ -112,8 +123,6 @@ class FtpServerServiceTest extends CommonFileReady { ftpPathVars.add("ftpServerProtocol"); ftpPathVars.add("ftpServerUsername"); ftpPathVars.add("ftpServerPassword"); - ftpPathVars.add("ftpServerUrl"); - ftpPathVars.add("ftpServerPort"); ftpPathVars.add("ftpServerFilepath"); ftpPathVars.forEach(var -> ReflectionTestUtils.setField(ftpServerService, var, var)); diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 56a17cb..ff09a40 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -22,8 +22,6 @@ ves.failing.latency=500 # in sec ves.failing.checkout.delay=15 ftp.server.protocol=sftp -ftp.server.url=localhost -ftp.server.port=22222 ftp.server.filepath=upload ftp.server.username=admin ftp.server.password=samsung diff --git a/src/test/resources/vnf.config b/src/test/resources/vnf.config index dab5ee9..3929ed3 100644 --- a/src/test/resources/vnf.config +++ b/src/test/resources/vnf.config @@ -4,5 +4,7 @@ vesUser=someVesUser vesPassword=someVesPassword vnfId=someVnfId vnfName=someVnfName +ftpHost=localhost +ftpPort=22222 unknownProperty=doNotFail repPeriod=30
\ No newline at end of file |