Fixed: onTestSuccess() was called after @AfterMethod instead of after…

… the test method (test: test.listener.ListenerTest)

CHANGES.txt

@@ -3,6 +3,7 @@ Current:
 Added: New ant task tag:  propertyset (Todd Wells)
 Added: ITestNGListenerFactory
 Added: Passing command line properties via the ant task and doc update (Todd Wells)
+Fixed: onTestSuccess() was called after @AfterMethod instead of after the test method (test: test.listener.ListenerTest)
 Fixed: XML test results contained skipfailedinvocationCounts instead of skipfailedinvocationcounts
 Fixed: Issue4 assertEquals for primitive arrays, Issue34 assertNull javadoc updated
 Fixed: Issue78 NPE with non-public class. Now throws TestNG exception

src/org/testng/internal/Invoker.java

@@ -631,6 +631,10 @@ private ITestResult invokeMethod(Object[] instances,
         tm.addFailedInvocationNumber(parametersIndex);
       }
 
+      //@@
+      if (testResult.getStatus() == ITestResult.SUCCESS) {
+        runTestListeners(testResult);
+      }
       //
       // Increment the invocation count for this method
       //
@@ -1005,7 +1009,6 @@ public List<ITestResult> invokeTestMethods(ITestNGMethod testMethod,
             int parametersIndex = 0;
 
             try {
-//                if (true) { // @@
               List<TestMethodWithDataProviderMethodWorker> workers = Lists.newArrayList();
 
 //                  if (false) { // bag.parameterHolder.origin == ParameterHolder.ORIGIN_DATA_PROVIDER) {
@@ -1341,8 +1344,9 @@ else if(ITestResult.SUCCESS_PERCENTAGE_FAILURE == status) {
         else {
           assert false : "UNKNOWN STATUS:" + status;
         }
-
-        if (triggerListeners) {
+//@@
+//        if (triggerListeners) {
+        if (triggerListeners && status != ITestResult.SUCCESS) {
           runTestListeners(testResult);
         }
       }

test/src/test/listeners/ListenerTest.java

@@ -0,0 +1,23 @@
+package test.listeners;
+
+import java.util.Arrays;
+
+import junit.framework.Assert;
+
+import org.testng.TestNG;
+import org.testng.annotations.Test;
+
+import test.SimpleBaseTest;
+
+public class ListenerTest extends SimpleBaseTest {
+
+  /**
+   * Ensure that if a listener is present, we get test(), onSuccess(), afterMethod()
+   */
+  @Test
+  public void listenerShouldBeCalledBeforeConfiguration() {
+    TestNG tng = create(OrderedListenerSampleTest.class);
+    tng.run();
+    Assert.assertEquals(Arrays.asList(1, 2, 3, 4), SimpleListener.m_list);
+  }
+}

test/src/test/listeners/OrderedListenerSampleTest.java

@@ -0,0 +1,35 @@
+package test.listeners;
+
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+
+import test.SimpleBaseTest;
+
+@Listeners(SimpleListener.class)
+public class OrderedListenerSampleTest extends SimpleBaseTest {
+
+  @BeforeClass
+  public void init() {
+    SimpleListener.m_list = Lists.newArrayList();
+  }
+
+  @BeforeMethod
+  public void bm() {
+    SimpleListener.m_list.add(1);
+  }
+
+  @Test
+  public void f() {
+    SimpleListener.m_list.add(2);
+  }
+
+  @AfterMethod
+  public void am() {
+    SimpleListener.m_list.add(4);
+  }
+}
+

test/src/test/listeners/SimpleListener.java

@@ -0,0 +1,16 @@
+package test.listeners;
+
+import java.util.List;
+
+import org.testng.ITestResult;
+import org.testng.TestListenerAdapter;
+
+public class SimpleListener extends TestListenerAdapter {
+  public static List<Integer> m_list;
+
+  public void onTestSuccess(ITestResult tr) {
+    SimpleListener.m_list.add(3);
+    super.onTestSuccess(tr);
+  }
+
+}