diff --git a/testng-core-api/src/main/java/org/testng/ITestResult.java b/testng-core-api/src/main/java/org/testng/ITestResult.java index 00649a46..fcf97bc3 100644 --- a/testng-core-api/src/main/java/org/testng/ITestResult.java +++ b/testng-core-api/src/main/java/org/testng/ITestResult.java @@ -22,6 +22,10 @@ public interface ITestResult extends IAttributes, Comparable { int SUCCESS_PERCENTAGE_FAILURE = 4; int STARTED = 16; + default int getParameterIndex() { + return -1; + } + /** @return The status of this result, using one of the constants above. */ int getStatus(); diff --git a/testng-core/src/main/java/org/testng/internal/BaseTestMethod.java b/testng-core/src/main/java/org/testng/internal/BaseTestMethod.java index c0ad3379..9ca4c789 100644 --- a/testng-core/src/main/java/org/testng/internal/BaseTestMethod.java +++ b/testng-core/src/main/java/org/testng/internal/BaseTestMethod.java @@ -10,10 +10,8 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Function; import java.util.regex.Pattern; import java.util.stream.Collectors; import org.testng.IClass; @@ -843,13 +841,8 @@ public abstract class BaseTestMethod }); } - private final Map parameters = - new ConcurrentHashMap<>(); - private String parameterId(ITestResult itr) { - IObject.IdentifiableArrayObject parameter = - new IObject.IdentifiableArrayObject(itr.getParameters()); - return parameters.computeIfAbsent(parameter, Function.identity()).getInstanceId(); + return Integer.toString(itr.getParameterIndex()); } private static boolean isNotParameterisedTest(ITestResult tr) { diff --git a/testng-core/src/main/java/org/testng/internal/IObject.java b/testng-core/src/main/java/org/testng/internal/IObject.java index 4389b6ec..04c04946 100644 --- a/testng-core/src/main/java/org/testng/internal/IObject.java +++ b/testng-core/src/main/java/org/testng/internal/IObject.java @@ -1,6 +1,5 @@ package org.testng.internal; -import java.util.Arrays; import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -114,36 +113,4 @@ public interface IObject { return Objects.hash(instanceId); } } - - /** - * A wrapper class that wraps around an array and associates a unique Id that can be used as a key - * for the array. - */ - class IdentifiableArrayObject { - - private final String instanceId = UUID.randomUUID().toString(); - - private final Object[] parameters; - - public IdentifiableArrayObject(Object[] parameters) { - this.parameters = parameters; - } - - public String getInstanceId() { - return instanceId; - } - - @Override - public boolean equals(Object object) { - if (this == object) return true; - if (object == null || getClass() != object.getClass()) return false; - IdentifiableArrayObject that = (IdentifiableArrayObject) object; - return Arrays.equals(parameters, that.parameters); - } - - @Override - public int hashCode() { - return Arrays.hashCode(parameters); - } - } } diff --git a/testng-core/src/main/java/org/testng/internal/invokers/TestInvoker.java b/testng-core/src/main/java/org/testng/internal/invokers/TestInvoker.java index 72db7703..e4bc2664 100644 --- a/testng-core/src/main/java/org/testng/internal/invokers/TestInvoker.java +++ b/testng-core/src/main/java/org/testng/internal/invokers/TestInvoker.java @@ -592,9 +592,8 @@ class TestInvoker extends BaseInvoker implements ITestInvoker { // pass both paramValues and paramIndex to be thread safe in case parallel=true + dataprovider. private ITestResult invokeMethod( TestMethodArguments arguments, XmlSuite suite, FailureContext failureContext) { - TestResult testResult = TestResult.newEmptyTestResult(); - testResult.setParameters(arguments.getParameterValues()); - testResult.setParameterIndex(arguments.getParametersIndex()); + TestResult testResult = + TestResult.newTestResult(arguments.getParameterValues(), arguments.getParametersIndex()); testResult.setHost(m_testContext.getHost()); GroupConfigMethodArguments cfgArgs = diff --git a/testng-runner-api/src/main/java/org/testng/internal/TestResult.java b/testng-runner-api/src/main/java/org/testng/internal/TestResult.java index e48352d8..b06608de 100644 --- a/testng-runner-api/src/main/java/org/testng/internal/TestResult.java +++ b/testng-runner-api/src/main/java/org/testng/internal/TestResult.java @@ -49,6 +49,13 @@ public class TestResult implements ITestResult { return new TestResult(); } + public static TestResult newTestResult(Object[] parameters, int index) { + TestResult result = newEmptyTestResult(); + result.setParameters(parameters); + result.initParameterIndex(index); + return result; + } + public static TestResult newTestResultFor(ITestNGMethod method) { return newContextAwareTestResult(method, null); } @@ -78,10 +85,9 @@ public class TestResult implements ITestResult { public static TestResult newTestResultFrom( TestResult result, ITestNGMethod method, ITestContext ctx, long start) { - TestResult testResult = newEmptyTestResult(); + TestResult testResult = + TestResult.newTestResult(result.getParameters(), result.getParameterIndex()); testResult.setHost(result.getHost()); - testResult.setParameters(result.getParameters()); - testResult.setParameterIndex(result.getParameterIndex()); testResult.init(method, ctx, null, start, 0L); TestResult.copyAttributes(result, testResult); return testResult; @@ -354,10 +360,12 @@ public class TestResult implements ITestResult { m_name = name; } - public void setParameterIndex(int parameterIndex) { - this.parameterIndex = parameterIndex; + private void initParameterIndex(int index) { + this.parameterIndex = index; } + public void setParameterIndex(int parameterIndex) {} + public int getParameterIndex() { return parameterIndex; }