[testng] 203/355: Fix #629

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag OpenBSD
in repository testng.

commit 538674e3ed068d68f3dfb877bdbb6982ff694fef
Author: Julien Herr <julien.herr at alcatel-lucent.com>
Date:   Wed Apr 22 22:54:54 2015 +0200

    Fix #629
---
 src/main/java/org/testng/internal/InvokedMethod.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/testng/internal/InvokedMethod.java b/src/main/java/org/testng/internal/InvokedMethod.java
index 36e15f8..36d4048 100755
--- a/src/main/java/org/testng/internal/InvokedMethod.java
+++ b/src/main/java/org/testng/internal/InvokedMethod.java
@@ -42,7 +42,7 @@ public class InvokedMethod implements Serializable, IInvokedMethod {
    */
   @Override
   public boolean isTestMethod() {
-    return m_isTest;
+    return m_testMethod.isTest();
   }
 
   @Override
@@ -61,7 +61,14 @@ public class InvokedMethod implements Serializable, IInvokedMethod {
    */
   @Override
   public boolean isConfigurationMethod() {
-    return m_isConfigurationMethod;
+    return m_testMethod.isBeforeMethodConfiguration() ||
+           m_testMethod.isAfterMethodConfiguration() ||
+           m_testMethod.isBeforeTestConfiguration() ||
+           m_testMethod.isAfterTestConfiguration() ||
+           m_testMethod.isBeforeClassConfiguration() ||
+           m_testMethod.isAfterClassConfiguration() ||
+           m_testMethod.isBeforeSuiteConfiguration() ||
+           m_testMethod.isAfterSuiteConfiguration();
   }
 
   /* (non-Javadoc)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git