From 00a6fc0c899e3a40a346b06e9aaabdd02da04415 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 30 Oct 2024 17:29:11 +0300 Subject: [PATCH] Minor refactoring --- .../junit5/ReportPortalExtension.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java b/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java index 7b5f716..fced6cc 100644 --- a/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java +++ b/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java @@ -36,7 +36,6 @@ import com.epam.ta.reportportal.ws.model.log.SaveLogRQ; import io.reactivex.Maybe; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.exception.ExceptionUtils; import org.junit.jupiter.api.*; import org.junit.jupiter.api.extension.*; import org.opentest4j.TestAbortedException; @@ -301,6 +300,17 @@ protected ItemStatus getExecutionStatus(@Nonnull final ExtensionContext context, return IS_ASSUMPTION.test(throwable) ? SKIPPED : FAILED; } + /** + * Returns a status of a test based on whether or not it contains an execution exception + * + * @param context JUnit's test context + * @return an {@link ItemStatus} + */ + @Nonnull + protected ItemStatus getExecutionStatus(@Nonnull final ExtensionContext context) { + return context.getExecutionException().map(t -> getExecutionStatus(context, t)).orElse(PASSED); + } + @Override public void interceptDynamicTest(Invocation invocation, DynamicTestInvocationContext invocationContext, ExtensionContext extensionContext) throws Throwable { @@ -335,16 +345,7 @@ public void interceptTestTemplateMethod(Invocation invocation, invocation.proceed(); } - /** - * Returns a status of a test based on whether or not it contains an execution exception - * - * @param context JUnit's test context - * @return an {@link ItemStatus} - */ - @Nonnull - protected ItemStatus getExecutionStatus(@Nonnull final ExtensionContext context) { - return context.getExecutionException().map(t -> getExecutionStatus(context, t)).orElse(PASSED); - } + @Override public void afterTestExecution(ExtensionContext context) { @@ -765,7 +766,7 @@ protected FinishTestItemRQ buildFinishTestRq(@Nonnull ExtensionContext context, if (status != ItemStatus.PASSED && myException.isPresent()) { String description = String.format(DESCRIPTION_TEST_ERROR_FORMAT, createStepDescription(context, STEP), - ExceptionUtils.getStackTrace(myException.get())); + getStackTrace(myException.get())); rq.setDescription(description); } ofNullable(status).ifPresent(s -> rq.setStatus(s.name()));