From 391e25959098f2afa0718c109a5989f7541cd29c Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 29 Sep 2025 20:40:57 +0300 Subject: [PATCH 1/2] Fix tests --- .../epam/reportportal/junit/utils/TestUtils.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/epam/reportportal/junit/utils/TestUtils.java b/src/test/java/com/epam/reportportal/junit/utils/TestUtils.java index 2dd5fd1..a1d19cf 100644 --- a/src/test/java/com/epam/reportportal/junit/utils/TestUtils.java +++ b/src/test/java/com/epam/reportportal/junit/utils/TestUtils.java @@ -17,17 +17,16 @@ package com.epam.reportportal.junit.utils; import com.epam.reportportal.listeners.ListenerParameters; +import com.epam.reportportal.service.Launch; import com.epam.reportportal.service.ReportPortalClient; import com.epam.reportportal.util.test.CommonUtils; import com.epam.reportportal.utils.http.HttpRequestUtils; -import com.epam.ta.reportportal.ws.model.BatchSaveOperatingRS; -import com.epam.ta.reportportal.ws.model.Constants; -import com.epam.ta.reportportal.ws.model.EntryCreatedAsyncRS; -import com.epam.ta.reportportal.ws.model.OperationCompletionRS; +import com.epam.ta.reportportal.ws.model.*; import com.epam.ta.reportportal.ws.model.item.ItemCreatedRS; import com.epam.ta.reportportal.ws.model.launch.StartLaunchRS; import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import com.fasterxml.jackson.core.type.TypeReference; +import com.nordstrom.automation.junit.JUnitWatcher; import io.reactivex.Maybe; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -39,6 +38,7 @@ import org.mockito.stubbing.Answer; import java.io.IOException; +import java.time.Instant; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -57,7 +57,11 @@ private TestUtils() { } public static Result runClasses(final Class... testClasses) { - return JUnitCore.runClasses(testClasses); + Result results = JUnitCore.runClasses(testClasses); + FinishExecutionRQ finish = new FinishExecutionRQ(); + finish.setEndTime(Instant.now()); + ofNullable(Launch.currentLaunch()).ifPresent(l->l.finish(finish)); + return results; } public static void mockLaunch(@Nonnull final ReportPortalClient client, @Nullable final String launchUuid, From 0e0a952f3a5d33bcb96e16e3a524d17ba88d3aa3 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 29 Sep 2025 20:41:26 +0300 Subject: [PATCH 2/2] Fix a warning --- src/test/java/com/epam/reportportal/junit/utils/TestUtils.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/com/epam/reportportal/junit/utils/TestUtils.java b/src/test/java/com/epam/reportportal/junit/utils/TestUtils.java index a1d19cf..2e70cb1 100644 --- a/src/test/java/com/epam/reportportal/junit/utils/TestUtils.java +++ b/src/test/java/com/epam/reportportal/junit/utils/TestUtils.java @@ -26,7 +26,6 @@ import com.epam.ta.reportportal.ws.model.launch.StartLaunchRS; import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import com.fasterxml.jackson.core.type.TypeReference; -import com.nordstrom.automation.junit.JUnitWatcher; import io.reactivex.Maybe; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -60,7 +59,7 @@ public static Result runClasses(final Class... testClasses) { Result results = JUnitCore.runClasses(testClasses); FinishExecutionRQ finish = new FinishExecutionRQ(); finish.setEndTime(Instant.now()); - ofNullable(Launch.currentLaunch()).ifPresent(l->l.finish(finish)); + ofNullable(Launch.currentLaunch()).ifPresent(l -> l.finish(finish)); return results; }