BP-787 add some tests
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/reports/ReportController.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/reports/ReportController.java
index 0d4e768..61e6654 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/reports/ReportController.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/reports/ReportController.java
@@ -70,7 +70,7 @@
import org.eclipse.openk.sp.util.DateHelper;
import org.eclipse.openk.sp.util.FileHelper;
import org.eclipse.openk.sp.util.ReportGroupDtoConverter;
-import org.eclipse.openk.sp.util.ReportGroupDtoConverter2;
+import org.eclipse.openk.sp.util.ReportGroupNameDtoConverter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -94,7 +94,7 @@
ReportGroupDtoConverter reportGroupDtoConverter;
@Autowired
- ReportGroupDtoConverter2 reportGroupDtoConverter2;
+ ReportGroupNameDtoConverter reportGroupDtoConverter2;
@Autowired
StandbyListRepository standbyListRepository;
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/ReportGroupDtoConverter2.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/ReportGroupNameDtoConverter.java
similarity index 98%
rename from oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/ReportGroupDtoConverter2.java
rename to oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/ReportGroupNameDtoConverter.java
index d59b94b..8edc9a0 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/ReportGroupDtoConverter2.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/ReportGroupNameDtoConverter.java
@@ -38,7 +38,7 @@
import org.springframework.stereotype.Service;
@Service
-public class ReportGroupDtoConverter2 {
+public class ReportGroupNameDtoConverter {
@Autowired
StandbyGroupRepository standbyGroupRepository;
@@ -52,7 +52,7 @@
@Autowired
private EntityConverter entityConverter;
- protected static final Logger LOGGER = Logger.getLogger(ReportGroupDtoConverter2.class);
+ protected static final Logger LOGGER = Logger.getLogger(ReportGroupNameDtoConverter.class);
public List<ReportInputDto> get10Rows(ReportDto reportDto) throws SpException {
diff --git a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/rest/StandbyScheduleRestServiceTest.java b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/rest/StandbyScheduleRestServiceTest.java
index d11148d..bf78e72 100644
--- a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/rest/StandbyScheduleRestServiceTest.java
+++ b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/rest/StandbyScheduleRestServiceTest.java
@@ -50,6 +50,17 @@
}
@Test
+ public void filterPlanningDataByStatusIdAsZipTest() {
+ String jwt = "LET-ME-IN";
+ Long statusId = SpMsg.STATUS_CLOSED_PLANNING;
+ StandbyScheduleFilterDto standbyScheduleFilterDto = new StandbyScheduleFilterDto();
+ Response result = standbyScheduleRestService.filterPlanningDataByStatusIdAsZip(statusId, jwt,
+ standbyScheduleFilterDto);
+ assertNotNull(result);
+
+ }
+
+ @Test
public void calculateTest() {
String jwt = "LET-ME-IN";
diff --git a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/util/ReportGroupDtoConverterTest2.java b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/util/ReportGroupNameDtoConverterTest.java
similarity index 89%
rename from oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/util/ReportGroupDtoConverterTest2.java
rename to oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/util/ReportGroupNameDtoConverterTest.java
index 8a22d73..4cea205 100644
--- a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/util/ReportGroupDtoConverterTest2.java
+++ b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/util/ReportGroupNameDtoConverterTest.java
@@ -48,7 +48,7 @@
import com.google.gson.Gson;
@RunWith(MockitoJUnitRunner.class)
-public class ReportGroupDtoConverterTest2 {
+public class ReportGroupNameDtoConverterTest {
@Mock
private PlannedDataController plannedDataController;
@@ -60,7 +60,7 @@
StandbyGroupRepository standbyGroupRepository;
@InjectMocks
- public ReportGroupDtoConverter2 reportGroupDtoConverter2;
+ public ReportGroupNameDtoConverter reportGroupNameDtoConverter;
private ReportDto getReport() {
ReportDto report = null;
@@ -96,18 +96,18 @@
UserSmallSelectionDto user = (UserSmallSelectionDto) new Gson().fromJson(json, UserSmallSelectionDto.class);
sb.setUser(user);
- String result = reportGroupDtoConverter2.userString(null, sb, reportDto, 1);
+ String result = reportGroupNameDtoConverter.userString(null, sb, reportDto, 1);
assertNotNull(result);
- result = reportGroupDtoConverter2.userString(sb, sb, reportDto, 2);
+ result = reportGroupNameDtoConverter.userString(sb, sb, reportDto, 2);
assertNotNull(result);
reportDto.setReportName(ReportController.REPORT_MAX10_GROUPS);
- result = reportGroupDtoConverter2.userString(null, sb, reportDto, 1);
+ result = reportGroupNameDtoConverter.userString(null, sb, reportDto, 1);
assertNotNull(result);
sb.setUser(null);
- result = reportGroupDtoConverter2.userString(null, sb, reportDto, 1);
+ result = reportGroupNameDtoConverter.userString(null, sb, reportDto, 1);
assertNotNull(result);
}
@@ -138,7 +138,7 @@
List<StandbyScheduleBodySelectionDto> dayGroupList = new ArrayList<>();
dayGroupList.add(sb);
- reportGroupDtoConverter2.addUserString(1, sb, reportGroupDto, reportDto, lastBodyMap, dayGroupList);
+ reportGroupNameDtoConverter.addUserString(1, sb, reportGroupDto, reportDto, lastBodyMap, dayGroupList);
}
@@ -167,7 +167,7 @@
List<StandbyScheduleBodySelectionDto> dayGroupList = new ArrayList<>();
dayGroupList.add(sb);
- reportGroupDtoConverter2.addUserString(123, sb, reportGroupDto, reportDto, lastBodyMap, dayGroupList);
+ reportGroupNameDtoConverter.addUserString(123, sb, reportGroupDto, reportDto, lastBodyMap, dayGroupList);
}
@@ -190,7 +190,7 @@
try {
- result = reportGroupDtoConverter2.addReportRow(reportDto, inputDto, plan, dateIndex, groupIdArray,
+ result = reportGroupNameDtoConverter.addReportRow(reportDto, inputDto, plan, dateIndex, groupIdArray,
lastBodyMap);
} catch (Exception e) {
@@ -228,7 +228,7 @@
Mockito.when(standbyGroupRepository.findOne(Mockito.anyLong())).thenReturn(sb);
Mockito.when(entityConverter.convertEntityToDto(Mockito.any(), Mockito.any())).thenReturn(dto);
- List<ReportInputDto> result = reportGroupDtoConverter2.get10Rows(reportDto);
+ List<ReportInputDto> result = reportGroupNameDtoConverter.get10Rows(reportDto);
assertNotNull(result);
}
@@ -249,7 +249,7 @@
Mockito.when(standbyGroupRepository.findOne(Mockito.anyLong())).thenReturn(sb);
Mockito.when(entityConverter.convertEntityToDto(Mockito.any(), Mockito.any())).thenReturn(dto);
- reportGroupDtoConverter2.checkEmpty(dayGroupList, groupId);
+ reportGroupNameDtoConverter.checkEmpty(dayGroupList, groupId);
}
@@ -269,7 +269,7 @@
reportDto.setReportName("test");
Map<Long, StandbyScheduleBodySelectionDto> lastBodyMap = new HashMap<>();
- reportGroupDtoConverter2.addOneUserString(i, dayGroupList, reportGroupDto, reportDto, lastBodyMap);
+ reportGroupNameDtoConverter.addOneUserString(i, dayGroupList, reportGroupDto, reportDto, lastBodyMap);
}
}
