diff options
Diffstat (limited to 'src/test/java/org/onap/a1pesimulator')
-rw-r--r-- | src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java | 8 | ||||
-rw-r--r-- | src/test/java/org/onap/a1pesimulator/service/cell/RanCellStateServiceTest.java | 2 | ||||
-rw-r--r-- | src/test/java/org/onap/a1pesimulator/service/pm/CommonFileReady.java (renamed from src/test/java/org/onap/a1pesimulator/service/fileready/CommonFileReady.java) | 2 | ||||
-rw-r--r-- | src/test/java/org/onap/a1pesimulator/service/pm/FileReadyEventServiceTest.java (renamed from src/test/java/org/onap/a1pesimulator/service/fileready/FileReadyEventServiceTest.java) | 2 | ||||
-rw-r--r-- | src/test/java/org/onap/a1pesimulator/service/pm/FtpServerServiceTest.java (renamed from src/test/java/org/onap/a1pesimulator/service/fileready/FtpServerServiceTest.java) | 4 | ||||
-rw-r--r-- | src/test/java/org/onap/a1pesimulator/service/pm/PMBulkFileServiceTest.java (renamed from src/test/java/org/onap/a1pesimulator/service/fileready/PMBulkFileServiceTest.java) | 2 | ||||
-rw-r--r-- | src/test/java/org/onap/a1pesimulator/service/pm/RanFileReadyHolderTest.java (renamed from src/test/java/org/onap/a1pesimulator/service/fileready/RanFileReadyHolderTest.java) | 4 | ||||
-rw-r--r-- | src/test/java/org/onap/a1pesimulator/service/pm/RanSaveFileReadyRunnableTest.java (renamed from src/test/java/org/onap/a1pesimulator/service/fileready/RanSaveFileReadyRunnableTest.java) | 8 | ||||
-rw-r--r-- | src/test/java/org/onap/a1pesimulator/service/pm/RanSendReportsRunnableTest.java (renamed from src/test/java/org/onap/a1pesimulator/service/fileready/RanSendReportsRunnableTest.java) | 6 | ||||
-rw-r--r-- | src/test/java/org/onap/a1pesimulator/service/report/RanVesHolderTest.java (renamed from src/test/java/org/onap/a1pesimulator/service/ves/RanVesHolderTest.java) | 10 |
10 files changed, 24 insertions, 24 deletions
diff --git a/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java b/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java index 2c2d9ff..1df8820 100644 --- a/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java @@ -29,8 +29,8 @@ import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.onap.a1pesimulator.data.ReportingMethodEnum; import org.onap.a1pesimulator.data.ves.VesEvent; -import org.onap.a1pesimulator.service.ves.RanVesBrokerService; -import org.onap.a1pesimulator.service.ves.RanVesSender; +import org.onap.a1pesimulator.service.report.RanReportsBrokerService; +import org.onap.a1pesimulator.service.report.RanVesSender; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpEntity; @@ -50,7 +50,7 @@ public class VesBrokerServiceImplTest { private static final String VES_COLLECTOR_URL = "someProtocol://someVesCollectorIP:someVesCollectorPort/somePath"; @Autowired - private RanVesBrokerService vesBrokerService; + private RanReportsBrokerService vesBrokerService; @Autowired private RanVesSender vesSender; @Autowired @@ -70,7 +70,7 @@ public class VesBrokerServiceImplTest { when(restTemplate.exchange(ArgumentMatchers.eq(VES_COLLECTOR_URL), ArgumentMatchers.eq(HttpMethod.POST), ArgumentMatchers.any(HttpEntity.class), ArgumentMatchers.eq(String.class))).thenReturn(responseEntity); - ResponseEntity<String> response = vesBrokerService.startSendingVesEvents("CustomIdentifier", + ResponseEntity<String> response = vesBrokerService.startSendingReports("CustomIdentifier", loadEventFromFile("VesBrokerControllerTest_pm_ves.json"), 10, ReportingMethodEnum.VES); Assert.assertEquals(HttpStatus.ACCEPTED, response.getStatusCode()); diff --git a/src/test/java/org/onap/a1pesimulator/service/cell/RanCellStateServiceTest.java b/src/test/java/org/onap/a1pesimulator/service/cell/RanCellStateServiceTest.java index 3aefcb7..ee68836 100644 --- a/src/test/java/org/onap/a1pesimulator/service/cell/RanCellStateServiceTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/cell/RanCellStateServiceTest.java @@ -19,7 +19,7 @@ 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.CommonFileReady.TEST_CELL_ID; +import static org.onap.a1pesimulator.service.pm.CommonFileReady.TEST_CELL_ID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/CommonFileReady.java b/src/test/java/org/onap/a1pesimulator/service/pm/CommonFileReady.java index 9727777..aae5e53 100644 --- a/src/test/java/org/onap/a1pesimulator/service/fileready/CommonFileReady.java +++ b/src/test/java/org/onap/a1pesimulator/service/pm/CommonFileReady.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; import static org.onap.a1pesimulator.TestHelpers.deleteTempFiles; import static org.onap.a1pesimulator.util.Constants.TEMP_DIR; diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/FileReadyEventServiceTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/FileReadyEventServiceTest.java index 21794a2..141d455 100644 --- a/src/test/java/org/onap/a1pesimulator/service/fileready/FileReadyEventServiceTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/pm/FileReadyEventServiceTest.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/FtpServerServiceTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/FtpServerServiceTest.java index 48515a8..4284e33 100644 --- a/src/test/java/org/onap/a1pesimulator/service/fileready/FtpServerServiceTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/pm/FtpServerServiceTest.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -22,7 +22,7 @@ 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; +import static org.onap.a1pesimulator.service.pm.FtpServerService.deletePMBulkFile; import static org.onap.a1pesimulator.util.Constants.TEMP_DIR; import java.io.File; diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/PMBulkFileServiceTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/PMBulkFileServiceTest.java index 8133266..ea9326e 100644 --- a/src/test/java/org/onap/a1pesimulator/service/fileready/PMBulkFileServiceTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/pm/PMBulkFileServiceTest.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/RanFileReadyHolderTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/RanFileReadyHolderTest.java index d6fa574..dd82065 100644 --- a/src/test/java/org/onap/a1pesimulator/service/fileready/RanFileReadyHolderTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/pm/RanFileReadyHolderTest.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -33,7 +33,7 @@ import org.onap.a1pesimulator.data.fileready.EventMemoryHolder; import org.onap.a1pesimulator.data.fileready.FileData; import org.onap.a1pesimulator.data.fileready.FileReadyEvent; import org.onap.a1pesimulator.exception.VesBrokerException; -import org.onap.a1pesimulator.service.ves.RanVesSender; +import org.onap.a1pesimulator.service.report.RanVesSender; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/RanSaveFileReadyRunnableTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/RanSaveFileReadyRunnableTest.java index 9b94107..198d46c 100644 --- a/src/test/java/org/onap/a1pesimulator/service/fileready/RanSaveFileReadyRunnableTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/pm/RanSaveFileReadyRunnableTest.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -29,9 +29,9 @@ import org.mockito.Mock; import org.onap.a1pesimulator.data.ves.VesEvent; import org.onap.a1pesimulator.exception.VesBrokerException; import org.onap.a1pesimulator.service.ue.RanUeHolder; -import org.onap.a1pesimulator.service.ves.RanCellEventCustomizer; -import org.onap.a1pesimulator.service.ves.RanEventCustomizerFactory; -import org.onap.a1pesimulator.service.ves.RanEventCustomizerFactory.Mode; +import org.onap.a1pesimulator.service.report.RanCellEventCustomizer; +import org.onap.a1pesimulator.service.report.RanEventCustomizerFactory; +import org.onap.a1pesimulator.service.report.RanEventCustomizerFactory.Mode; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/RanSendReportsRunnableTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/RanSendReportsRunnableTest.java index d2e8da8..b7de25b 100644 --- a/src/test/java/org/onap/a1pesimulator/service/fileready/RanSendReportsRunnableTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/pm/RanSendReportsRunnableTest.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.fileready; +package org.onap.a1pesimulator.service.pm; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; @@ -23,8 +23,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.onap.a1pesimulator.service.ue.RanUeHolder; -import org.onap.a1pesimulator.service.ves.RanCellEventCustomizer; -import org.onap.a1pesimulator.service.ves.RanEventCustomizerFactory; +import org.onap.a1pesimulator.service.report.RanCellEventCustomizer; +import org.onap.a1pesimulator.service.report.RanEventCustomizerFactory; class RanSendReportsRunnableTest extends CommonFileReady { diff --git a/src/test/java/org/onap/a1pesimulator/service/ves/RanVesHolderTest.java b/src/test/java/org/onap/a1pesimulator/service/report/RanVesHolderTest.java index 7f6258c..94a2b18 100644 --- a/src/test/java/org/onap/a1pesimulator/service/ves/RanVesHolderTest.java +++ b/src/test/java/org/onap/a1pesimulator/service/report/RanVesHolderTest.java @@ -11,7 +11,7 @@ * limitations under the License */ -package org.onap.a1pesimulator.service.ves; +package org.onap.a1pesimulator.service.report; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -31,8 +31,8 @@ import org.onap.a1pesimulator.data.ReportingMethodEnum; import org.onap.a1pesimulator.data.fileready.RanPeriodicEvent; import org.onap.a1pesimulator.data.ves.VesEvent; import org.onap.a1pesimulator.service.common.EventCustomizer; -import org.onap.a1pesimulator.service.fileready.CommonFileReady; -import org.onap.a1pesimulator.service.fileready.RanFileReadyHolder; +import org.onap.a1pesimulator.service.pm.CommonFileReady; +import org.onap.a1pesimulator.service.pm.RanFileReadyHolder; import org.onap.a1pesimulator.service.ue.RanUeHolder; import org.onap.a1pesimulator.util.VnfConfigReader; import org.springframework.http.HttpStatus; @@ -127,7 +127,7 @@ class RanVesHolderTest extends CommonFileReady { } @Test - void getEventStructure() { + void getPMConfiguration() { VesEvent testedEvent = loadEventFromFile(); ranCellsHolder.startSendingVesEvents(TEST_CELL_ID, testedEvent, 10, ReportingMethodEnum.FILE_READY); RanPeriodicEvent event = ranCellsHolder.getPeriodicEventForCell(TEST_CELL_ID); @@ -137,7 +137,7 @@ class RanVesHolderTest extends CommonFileReady { } @Test - void getEventStructureError() { + void getPMConfigurationError() { assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> ranCellsHolder.getPeriodicEventForCell(TEST_CELL_ID)); } }
\ No newline at end of file |