Add TestResult#getTestName() support for @Test(testName)
diff --git a/CHANGES.txt b/CHANGES.txt
index 588fe2e..9640045 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
Current
-Fixed: testName from @Test is now used and available from ITestResult#getName()
+Fixed: testName from @Test is now used and available from ITestResult#getName() and ITestResult#getTestName()
6.9.9:
2015/10/27
diff --git a/src/main/java/org/testng/ITestResult.java b/src/main/java/org/testng/ITestResult.java
index c64ce94..78ba7e4 100755
--- a/src/main/java/org/testng/ITestResult.java
+++ b/src/main/java/org/testng/ITestResult.java
@@ -84,7 +84,7 @@
public Object getInstance();
/**
- * If this result's related instance implements ITest, returns its test name, otherwise returns null.
+ * If this result's related instance implements ITest or use @Test(testName=...), returns its test name, otherwise returns null.
*/
public String getTestName();
diff --git a/src/main/java/org/testng/internal/TestResult.java b/src/main/java/org/testng/internal/TestResult.java
index 73b5f80..9fb5909 100644
--- a/src/main/java/org/testng/internal/TestResult.java
+++ b/src/main/java/org/testng/internal/TestResult.java
@@ -120,7 +120,7 @@
}
/**
- * If this result's related instance implements ITest, returns its test name,
+ * If this result's related instance implements ITest or use @Test(testName=...), returns its test name,
* otherwise returns null.
*/
@Override
@@ -128,6 +128,9 @@
if (m_instance instanceof ITest) {
return ((ITest) m_instance).getTestName();
}
+ if (m_context.getName() != null) {
+ return m_context.getName();
+ }
return null;
}
diff --git a/src/test/java/test/name/NameTest.java b/src/test/java/test/name/NameTest.java
index be7d766..d1cc34e 100644
--- a/src/test/java/test/name/NameTest.java
+++ b/src/test/java/test/name/NameTest.java
@@ -41,6 +41,6 @@
ITestResult result = adapter.getPassedTests().get(0);
Assert.assertEquals(result.getMethod().getMethodName(), "test");
Assert.assertEquals(result.getName(), "NAME");
- Assert.assertEquals(result.getTestName(), null); // TODO should it be NAME too?
+ Assert.assertEquals(result.getTestName(), "NAME");
}
}
