Merge pull request #61 from zebrunner/refactor

reuse if for isRetryFinished
zebrunner · Jun 26, 2024 · 78c954e · 78c954e
2 parents a824a5b + 3e4a91d
commit 78c954e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/com/zebrunner/agent/testng/adapter/TestNGAdapter.java b/src/main/java/com/zebrunner/agent/testng/adapter/TestNGAdapter.java
@@ -133,6 +133,7 @@ private TestInvocationContext buildTestStartInvocationContext(ITestResult testRe
     }
 
     private void setZebrunnerTestIdOnRerun(ITestResult testResult, ITestNGMethod testMethod, TestStartDescriptor testStartDescriptor) {
+        // testMethod is not available for BeforeClass configuration method, so we just skip this logic in such case
         if (RunContextHolder.isRerun() && testMethod != null) {
             ITestContext context = testResult.getTestContext();
             Object[] parameters = testResult.getParameters();

diff --git a/src/main/java/com/zebrunner/agent/testng/listener/RetryService.java b/src/main/java/com/zebrunner/agent/testng/listener/RetryService.java
@@ -12,7 +12,6 @@
 
 import java.util.Arrays;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
@@ -91,9 +90,12 @@ private static RetryItemContext getOrInitRetryItemContext(ITestNGMethod method,
     }
 
     public static boolean isRetryFinished(ITestNGMethod method, ITestContext context) {
+        if (method == null) {
+            // method is not available for BeforeClass configuration method, so we just return true here
+            return true;
+        }
         return getRetryContext(context)
                 .map(RetryContext::getRetryItemContexts)
-                .filter(d -> method != null)
                 .map(retryItemContext -> retryItemContext.get(method.getParameterInvocationCount()))
                 .map(RetryItemContext::isFinished)
                 .orElse(true);