Upgrade to TestNG 7.5 (#58)

Author: sbabcoc

java8Deps.gradle

@@ -25,7 +25,7 @@ sourceSets {
 
 dependencies {
   constraints {
-    api 'org.testng:testng:7.3.0'
+    api 'org.testng:testng:7.5'
     api 'org.apache.ant:ant:1.10.11'
   }
   api 'org.testng:testng'

pom.xml

@@ -297,7 +297,7 @@
       <id>java8</id>
       <properties>
         <maven.compiler.release>8</maven.compiler.release>
-        <testng.version>7.3.0</testng.version>
+        <testng.version>7.5</testng.version>
         <ant.version>1.10.11</ant.version>
       </properties>
       <dependencyManagement>

src/main-j7/java/com/nordstrom/automation/testng/VersionUtility.java

@@ -1,7 +1,9 @@
 package com.nordstrom.automation.testng;
 
 import org.testng.IRetryAnalyzer;
+import org.testng.ITestNGMethod;
 import org.testng.ITestResult;
+import org.testng.Reporter;
 import org.testng.annotations.ITestAnnotation;
 import org.testng.internal.TestResult;
 
@@ -16,4 +18,11 @@ public static ITestResult newEmptyTestResult() {
         return new TestResult();
     }
 
+    public static Class<? extends IRetryAnalyzer> getRetryAnalyzer() {
+        ITestResult testResult = Reporter.getCurrentTestResult();
+        ITestNGMethod method = testResult.getMethod();
+        IRetryAnalyzer retryAnalyzer = method.getRetryAnalyzer();
+        return (retryAnalyzer != null) ? retryAnalyzer.getClass() : null;
+    }
+    
 }

src/main-j8/java/com/nordstrom/automation/testng/VersionUtility.java

@@ -1,7 +1,9 @@
 package com.nordstrom.automation.testng;
 
 import org.testng.IRetryAnalyzer;
+import org.testng.ITestNGMethod;
 import org.testng.ITestResult;
+import org.testng.Reporter;
 import org.testng.annotations.ITestAnnotation;
 import org.testng.internal.TestResult;
 import org.testng.internal.annotations.DisabledRetryAnalyzer;
@@ -17,4 +19,11 @@ public static ITestResult newEmptyTestResult() {
         return TestResult.newEmptyTestResult();
     }
 
+    public static Class<? extends IRetryAnalyzer> getRetryAnalyzer() {
+        ITestResult testResult = Reporter.getCurrentTestResult();
+        ITestNGMethod method = testResult.getMethod();
+        Class<? extends IRetryAnalyzer> clazz = method.getRetryAnalyzerClass();
+        return (clazz != DisabledRetryAnalyzer.class) ? clazz : null;
+    }
+    
 }

src/test/java/com/nordstrom/automation/testng/RetryAnalyzerCheck.java

@@ -5,9 +5,7 @@
 import static org.testng.Assert.assertNotEquals;
 
 import org.testng.IRetryAnalyzer;
-import org.testng.ITestNGMethod;
 import org.testng.ITestResult;
-import org.testng.Reporter;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -22,36 +20,19 @@ public void beforeClass() {
 
     @Test
     public void retryAnalyzerUnspecified() {
-        unspecified = getRetryAnalyzer();
+        unspecified = VersionUtility.getRetryAnalyzer();
         assertNotEquals(unspecified, Placeholder.class);
     }
 
     @Test(retryAnalyzer = TestAnalyzer.class)
     public void retryAnalyzerIsSpecified() {
-        assertEquals(getRetryAnalyzer(), TestAnalyzer.class);
+        assertEquals(VersionUtility.getRetryAnalyzer(), TestAnalyzer.class);
     }
 
     @Test
     @NoRetry
     public void retryIsDisabledForThisTest() {
-        assertNull(getRetryAnalyzer());
-    }
-    
-    @SuppressWarnings("deprecation")
-    private static Class<? extends IRetryAnalyzer> getRetryAnalyzer() {
-        ITestResult testResult = Reporter.getCurrentTestResult();
-        ITestNGMethod method = testResult.getMethod();
-        IRetryAnalyzer retryAnalyzer = method.getRetryAnalyzer();
-        // if retry analyzer defined
-        if (retryAnalyzer != null) {
-            // get class of retry analyzer
-            Class<? extends IRetryAnalyzer> clazz = retryAnalyzer.getClass();
-            // if not the default retry analyzer injected by TestNG 7+
-            if ( ! "org.testng.internal.annotations.DisabledRetryAnalyzer".equals(clazz.getName())) {
-                return clazz;
-            }
-        }
-        return null;
+        assertNull(VersionUtility.getRetryAnalyzer());
     }
 
     public static class TestAnalyzer implements IRetryAnalyzer {