EPMRPP-88291 || Fix case when child recalculates parent status when s…

…tatus is already defined (#1874) * EPMRPP-88291 || Fix case when child recalculates parent status when status is already defined * EPMRPP-88291 || Fix tests
reportportal · Nov 23, 2023 · 7eb2abb · 7eb2abb
1 parent fa85842
commit 7eb2abb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ChangeStatusHandlerImpl.java b/src/main/java/com/epam/ta/reportportal/core/item/impl/status/ChangeStatusHandlerImpl.java
@@ -91,6 +91,8 @@ public void changeParentStatus(TestItem childItem, Long projectId, ReportPortalU
 
   private boolean isParentStatusUpdateRequired(TestItem parent) {
     return parent.getItemResults().getStatus() != StatusEnum.IN_PROGRESS
+        && parent.getItemResults().getStatus() != PASSED
+        && parent.getItemResults().getStatus() != FAILED
         && !testItemRepository.hasItemsInStatusByParent(parent.getItemId(), parent.getPath(),
         StatusEnum.IN_PROGRESS.name());
   }

diff --git a/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerTest.java b/src/test/java/com/epam/ta/reportportal/ws/controller/TestItemControllerTest.java
@@ -758,7 +758,7 @@ void changeStatusFromPassedToSkippedWithoutIssue() throws Exception {
 
   @Sql("/db/test-item/item-change-status-from-passed.sql")
   @Test
-  void finishTestItemWithFinishedParent() throws Exception {
+  void finishChildTestItemWithFailedStatusWithFinishedParentWithPassedStatus() throws Exception {
     FinishTestItemRQ rq = new FinishTestItemRQ();
     rq.setLaunchUuid(UUID.randomUUID().toString());
     rq.setEndTime(Date.from(LocalDateTime.now().atZone(ZoneId.of("UTC")).toInstant()));
@@ -783,12 +783,12 @@ void finishTestItemWithFinishedParent() throws Exception {
         updatedItem.get().getItemResults().getIssue().getIssueType().getIssueGroup()
             .getTestItemIssueGroup()
     );
-    assertEquals(StatusEnum.FAILED,
+    assertEquals(StatusEnum.PASSED,
         testItemRepository.findById(updatedItem.get().getParentId()).get().getItemResults()
             .getStatus());
 
     Launch launch = launchRepository.findById(updatedItem.get().getLaunchId()).get();
-    assertEquals(StatusEnum.FAILED, launch.getStatus());
+    assertEquals(StatusEnum.PASSED, launch.getStatus());
   }
 
   @Sql("/db/test-item/item-change-status-from-failed.sql")