Decouple SuiteRunner and TestRunner

Closes #2928

Author: krmahadevan

CHANGES.txt

@@ -1,5 +1,5 @@
 Current
-
+Fixed: GITHUB-2928: The constructor of TestRunner encountered NBC changes in 7.8.0 (Krishnan Mahadevan)
 Fixed: GITHUB-581: Parameters of nested test suites are overridden(Krishnan Mahadevan)
 Fixed: GITHUB-727 : Fixing data races (Krishnan Mahadevan)
 Fixed: GITHUB-2913: Maps containing nulls can be incorrectly considered equal (Alex Heneveld)

testng-core/src/main/java/org/testng/ISuiteRunnerListener.java

@@ -0,0 +1,10 @@
+package org.testng;
+
+public interface ISuiteRunnerListener {
+
+  ITestListener getExitCodeListener();
+
+  void beforeInvocation(IInvokedMethod method, ITestResult testResult);
+
+  void afterInvocation(IInvokedMethod method, ITestResult testResult);
+}

testng-core/src/main/java/org/testng/SuiteRunner.java

@@ -30,7 +30,7 @@
  * <CODE>SuiteRunner</CODE> is responsible for running all the tests included in one suite. The test
  * start is triggered by {@link #run()} method.
  */
-public class SuiteRunner implements ISuite, IInvokedMethodListener {
+public class SuiteRunner implements ISuite, ISuiteRunnerListener {
 
   private static final String DEFAULT_OUTPUT_DIR = "test-output";
 
@@ -257,7 +257,7 @@ public void setReportResults(boolean reportResults) {
     useDefaultListeners = reportResults;
   }
 
-  ITestListener getExitCodeListener() {
+  public ITestListener getExitCodeListener() {
     return exitCodeListener;
   }
 

testng-core/src/main/java/org/testng/TestRunner.java

@@ -178,7 +178,7 @@ protected TestRunner(
       List<IClassListener> classListeners,
       Comparator<ITestNGMethod> comparator,
       DataProviderHolder otherHolder,
-      SuiteRunner suiteRunner) {
+      ISuiteRunnerListener suiteRunner) {
     this.comparator = comparator;
     this.holder.merge(otherHolder);
     init(
@@ -201,7 +201,7 @@ public TestRunner(
       Collection<IInvokedMethodListener> invokedMethodListeners,
       List<IClassListener> classListeners,
       Comparator<ITestNGMethod> comparator,
-      SuiteRunner suiteRunner) {
+      ISuiteRunnerListener suiteRunner) {
     this.comparator = comparator;
     init(
         configuration,
@@ -223,7 +223,7 @@ public TestRunner(
       boolean skipFailedInvocationCounts,
       Collection<IInvokedMethodListener> invokedMethodListeners,
       List<IClassListener> classListeners,
-      SuiteRunner suiteRunner) {
+      ISuiteRunnerListener suiteRunner) {
     this.comparator = Systematiser.getComparator();
     init(
         configuration,
@@ -246,7 +246,7 @@ private void init(
       boolean skipFailedInvocationCounts,
       Collection<IInvokedMethodListener> invokedMethodListeners,
       List<IClassListener> classListeners,
-      SuiteRunner suiteRunner) {
+      ISuiteRunnerListener suiteRunner) {
     m_configuration = configuration;
     m_xmlTest = test;
     m_suite = suite;
@@ -257,8 +257,8 @@ private void init(
     m_objectFactory = suite.getObjectFactory();
     setVerbose(test.getVerbose());
     if (suiteRunner == null) {
-      if (suite instanceof SuiteRunner) {
-        setExitCodeListener(((SuiteRunner) suite).getExitCodeListener());
+      if (suite instanceof ISuiteRunnerListener) {
+        setExitCodeListener(((ISuiteRunnerListener) suite).getExitCodeListener());
       }
     } else {
       setExitCodeListener(suiteRunner.getExitCodeListener());

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

@@ -5,12 +5,12 @@
 import java.util.Set;
 import org.testng.IInvokedMethod;
 import org.testng.IInvokedMethodListener;
+import org.testng.ISuiteRunnerListener;
 import org.testng.ITestContext;
 import org.testng.ITestNGMethod;
 import org.testng.ITestResult;
 import org.testng.SkipException;
 import org.testng.SuiteRunState;
-import org.testng.SuiteRunner;
 import org.testng.collections.Maps;
 import org.testng.internal.IConfiguration;
 import org.testng.internal.ITestResultNotifier;
@@ -34,15 +34,15 @@ class BaseInvoker {
   // Instead we now would be using this special object.
   protected final Object NULL_OBJECT = new Object();
 
-  private final SuiteRunner suiteRunner;
+  private final ISuiteRunnerListener suiteRunner;
 
   public BaseInvoker(
       ITestResultNotifier notifier,
       Collection<IInvokedMethodListener> invokedMethodListeners,
       ITestContext testContext,
       SuiteRunState suiteState,
       IConfiguration configuration,
-      SuiteRunner suiteRunner) {
+      ISuiteRunnerListener suiteRunner) {
     this.m_notifier = notifier;
     this.m_invokedMethodListeners = invokedMethodListeners;
     this.m_testContext = testContext;

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

@@ -16,13 +16,13 @@
 import org.testng.IConfigurable;
 import org.testng.IConfigurationListener;
 import org.testng.IInvokedMethodListener;
+import org.testng.ISuiteRunnerListener;
 import org.testng.ITestClass;
 import org.testng.ITestContext;
 import org.testng.ITestNGMethod;
 import org.testng.ITestResult;
 import org.testng.Reporter;
 import org.testng.SuiteRunState;
-import org.testng.SuiteRunner;
 import org.testng.TestNGException;
 import org.testng.annotations.IConfigurationAnnotation;
 import org.testng.collections.Maps;
@@ -69,7 +69,7 @@ public ConfigInvoker(
       SuiteRunState suiteState,
       IConfiguration configuration,
       IConfigurationListener internalConfigurationListener,
-      SuiteRunner suiteRunner) {
+      ISuiteRunnerListener suiteRunner) {
     super(notifier, invokedMethodListeners, testContext, suiteState, configuration, suiteRunner);
     this.m_continueOnFailedConfiguration =
         testContext.getSuite().getXmlSuite().getConfigFailurePolicy()

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

@@ -8,10 +8,10 @@
 import org.testng.IClassListener;
 import org.testng.IConfigurationListener;
 import org.testng.IInvokedMethodListener;
+import org.testng.ISuiteRunnerListener;
 import org.testng.ITestContext;
 import org.testng.ITestNGMethod;
 import org.testng.SuiteRunState;
-import org.testng.SuiteRunner;
 import org.testng.internal.IConfiguration;
 import org.testng.internal.ITestResultNotifier;
 
@@ -41,7 +41,7 @@ public Invoker(
       List<IClassListener> classListeners,
       DataProviderHolder holder,
       IConfigurationListener internalConfigurationListener,
-      SuiteRunner suiteRunner) {
+      ISuiteRunnerListener suiteRunner) {
     m_configInvoker =
         new ConfigInvoker(
             notifier,

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

@@ -28,6 +28,7 @@
 import org.testng.IInvokedMethodListener;
 import org.testng.IRetryAnalyzer;
 import org.testng.ISuite;
+import org.testng.ISuiteRunnerListener;
 import org.testng.ITestClass;
 import org.testng.ITestContext;
 import org.testng.ITestListener;
@@ -69,7 +70,7 @@ public TestInvoker(
       List<IClassListener> m_classListeners,
       boolean m_skipFailedInvocationCounts,
       ConfigInvoker invoker,
-      SuiteRunner suiteRunner) {
+      ISuiteRunnerListener suiteRunner) {
     super(
         m_notifier,
         m_invokedMethodListeners,