Merge pull request #2732 from bj-9527/github2729

beforeConfiguration() listener method should be invoked for skipped configurations as well

CHANGES.txt

@@ -1,5 +1,6 @@
 Current
 7.6.0
+Fixed: GITHUB-2729: beforeConfiguration() listener method should be invoked for skipped configurations as well(Nan Liang)
 Fixed: assertEqualsNoOrder for Collection and Iterators size check was missing (Adam Kaczmarek)
 Fixed: GITHUB-2709: Testnames not working together with suites in suite (Martin Aldrin)
 Fixed: GITHUB-2704: IHookable and IConfigurable callback discrepancy (Krishnan Mahadevan)

testng-core/src/main/java/org/testng/internal/invokers/ConfigInvoker.java

@@ -277,6 +277,7 @@ public void invokeConfigurations(ConfigMethodArguments arguments) {
             && !alwaysRun) {
           log(3, "Skipping " + Utils.detailedMethodName(tm, true));
           InvokedMethod invokedMethod = new InvokedMethod(System.currentTimeMillis(), testResult);
+          runConfigurationListeners(testResult, arguments.getTestMethod(), true /* before */);
           runInvokedMethodListeners(BEFORE_INVOCATION, invokedMethod, testResult);
           testResult.setEndMillis(testResult.getStartMillis());
           testResult.setStatus(ITestResult.SKIP);

testng-core/src/test/java/test/configuration/ConfigurationListenerTest.java

@@ -4,6 +4,8 @@
 import org.testng.TestNG;
 import org.testng.annotations.Test;
 import test.SimpleBaseTest;
+import test.configuration.issue2729.BeforeConfigSampleListener;
+import test.configuration.issue2729.BeforeConfigTestSample;
 
 public class ConfigurationListenerTest extends SimpleBaseTest {
 
@@ -14,4 +16,11 @@ public void listenerShouldBeCalled() {
     tng.run();
     Assert.assertTrue(ConfigurationListenerSampleTest.m_passed);
   }
+
+  @Test(description = "github 2729")
+  public void beforeConfigShouldExecutedForSkippedConfig() {
+    TestNG tng = create(BeforeConfigTestSample.class);
+    tng.run();
+    Assert.assertEquals(BeforeConfigSampleListener.count, 2);
+  }
 }

testng-core/src/test/java/test/configuration/issue2729/BeforeConfigSampleListener.java

@@ -0,0 +1,16 @@
+package test.configuration.issue2729;
+
+import org.testng.IConfigurationListener;
+import org.testng.IInvokedMethodListener;
+import org.testng.ITestListener;
+import org.testng.ITestResult;
+
+public class BeforeConfigSampleListener
+    implements ITestListener, IInvokedMethodListener, IConfigurationListener {
+  public static int count = 0;
+
+  @Override
+  public void beforeConfiguration(ITestResult testResult) {
+    count++;
+  }
+}

testng-core/src/test/java/test/configuration/issue2729/BeforeConfigTestSample.java

@@ -0,0 +1,20 @@
+package test.configuration.issue2729;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+@Listeners({BeforeConfigSampleListener.class})
+public class BeforeConfigTestSample {
+  @BeforeClass
+  public void beforeClass() {
+    int i = 5 / 0;
+  }
+
+  @BeforeMethod
+  public void beforeMethod() {}
+
+  @Test
+  public void sampleTest() {}
+}

testng-core/src/test/java/test/listeners/ConfigurationListenerTest.java

@@ -56,6 +56,6 @@ public void shouldFail() {
 
   @Test
   public void shouldSkip() {
-    runTest(ConfigurationListenerSkipSampleTest.class, 1 + 5 + 7); // fail + skip
+    runTest(ConfigurationListenerSkipSampleTest.class, 1 + 1 + 5 + 7); // fail + skip
   }
 }

testng-core/src/test/java/test/listeners/ordering/ListenerInvocationDefaultBehaviorTest.java

@@ -129,6 +129,7 @@ public void testOrderHasOnlyFailedAndSkippedConfigAndSkippedTestMethod() {
             IINVOKEDMETHODLISTENER_AFTER_INVOCATION,
             IINVOKEDMETHODLISTENER_AFTER_INVOCATION_WITH_CONTEXT,
             ICONFIGURATIONLISTENER_ON_CONFIGURATION_FAILURE,
+            ICONFIGURATIONLISTENER_BEFORE_CONFIGURATION,
             IINVOKEDMETHODLISTENER_BEFORE_INVOCATION,
             IINVOKEDMETHODLISTENER_BEFORE_INVOCATION_WITH_CONTEXT,
             IINVOKEDMETHODLISTENER_AFTER_INVOCATION,

testng-core/src/test/java/test/listeners/ordering/ListenerInvocationListenerInvocationDisabledBehaviorTest.java

@@ -126,6 +126,7 @@ public void testOrderHasOnlyFailedAndSkippedConfigAndSkippedTestMethod() {
             IINVOKEDMETHODLISTENER_AFTER_INVOCATION,
             IINVOKEDMETHODLISTENER_AFTER_INVOCATION_WITH_CONTEXT,
             ICONFIGURATIONLISTENER_ON_CONFIGURATION_FAILURE,
+            ICONFIGURATIONLISTENER_BEFORE_CONFIGURATION,
             IINVOKEDMETHODLISTENER_BEFORE_INVOCATION,
             IINVOKEDMETHODLISTENER_BEFORE_INVOCATION_WITH_CONTEXT,
             IINVOKEDMETHODLISTENER_AFTER_INVOCATION,