Fix compilation errors

testng-team · Feb 18, 2024 · a091f0d · a091f0d
1 parent e5591a5
commit a091f0d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/testng-core/src/main/java/org/testng/internal/TestListenerHelper.java b/testng-core/src/main/java/org/testng/internal/TestListenerHelper.java
@@ -10,6 +10,7 @@
 import org.testng.ITestNGMethod;
 import org.testng.ITestObjectFactory;
 import org.testng.ITestResult;
+import org.testng.ListenerComparator;
 import org.testng.TestNGException;
 import org.testng.annotations.IListenersAnnotation;
 import org.testng.collections.Lists;
@@ -25,9 +26,12 @@ public static void runPreConfigurationListeners(
       ITestResult tr,
       ITestNGMethod tm,
       List<IConfigurationListener> listeners,
-      IConfigurationListener internal) {
+      IConfigurationListener internal,
+      ListenerComparator comparator) {
     internal.beforeConfiguration(tr);
-    for (IConfigurationListener icl : listeners) {
+    List<IConfigurationListener> original = ListenerOrderDeterminer.order(listeners, comparator);
+
+    for (IConfigurationListener icl : original) {
       icl.beforeConfiguration(tr);
       try {
         icl.beforeConfiguration(tr, tm);
@@ -41,9 +45,10 @@ public static void runPostConfigurationListeners(
       ITestResult tr,
       ITestNGMethod tm,
       List<IConfigurationListener> listeners,
-      IConfigurationListener internal) {
+      IConfigurationListener internal,
+      ListenerComparator comparator) {
     List<IConfigurationListener> listenersreversed =
-        ListenerOrderDeterminer.reversedOrder(listeners);
+        ListenerOrderDeterminer.reversedOrder(listeners, comparator);
     listenersreversed.add(internal);
     for (IConfigurationListener icl : listenersreversed) {
       switch (tr.getStatus()) {

diff --git a/testng-core/src/main/java/org/testng/internal/invokers/ConfigInvoker.java b/testng-core/src/main/java/org/testng/internal/invokers/ConfigInvoker.java
@@ -1,6 +1,5 @@
 package org.testng.internal.invokers;
 
-import static org.testng.ListenerComparator.sort;
 import static org.testng.internal.invokers.InvokedMethodListenerMethod.AFTER_INVOCATION;
 import static org.testng.internal.invokers.InvokedMethodListenerMethod.BEFORE_INVOCATION;
 import static org.testng.internal.invokers.Invoker.SAME_CLASS;
@@ -9,7 +8,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -23,6 +21,7 @@
 import org.testng.ITestContext;
 import org.testng.ITestNGMethod;
 import org.testng.ITestResult;
+import org.testng.ListenerComparator;
 import org.testng.Reporter;
 import org.testng.SuiteRunState;
 import org.testng.TestNGException;
@@ -440,14 +439,21 @@ private IConfigurable computeConfigurableInstance(
   }
 
   private void runConfigurationListeners(ITestResult tr, ITestNGMethod tm, boolean before) {
-    List<IConfigurationListener> original =
-        sort(m_notifier.getConfigurationListeners(), m_configuration.getListenerComparator());
+    ListenerComparator comparator = m_configuration.getListenerComparator();
     if (before) {
       TestListenerHelper.runPreConfigurationListeners(
-          tr, tm, original, internalConfigurationListener);
+          tr,
+          tm,
+          m_notifier.getConfigurationListeners(),
+          internalConfigurationListener,
+          comparator);
     } else {
       TestListenerHelper.runPostConfigurationListeners(
-          tr, tm, original, internalConfigurationListener);
+          tr,
+          tm,
+          m_notifier.getConfigurationListeners(),
+          internalConfigurationListener,
+          comparator);
     }
   }