#599 - Migration to TestNG version 7.9.0

opengeospatial · Jan 2, 2024 · 11aa22f · 11aa22f
1 parent d0e7a04
commit 11aa22f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -227,7 +227,7 @@
       <dependency>
         <groupId>org.testng</groupId>
         <artifactId>testng</artifactId>
-        <version>6.9.10</version>
+        <version>7.9.0</version>
       </dependency>
       <dependency>
         <groupId>jakarta.ws.rs</groupId>

diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/BasicXMLReporter.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/BasicXMLReporter.java
@@ -10,7 +10,6 @@
 import java.util.List;
 import org.testng.IReporter;
 import org.testng.ISuite;
-import org.testng.ReporterConfig;
 import org.testng.reporters.XMLReporter;
 import org.testng.reporters.XMLReporterConfig;
 import org.testng.xml.XmlSuite;
@@ -25,7 +24,7 @@
  */
 public final class BasicXMLReporter implements IReporter {
 
-    private XMLReporter reporter;
+    private final XMLReporter reporter;
 
     public BasicXMLReporter() {
         this.reporter = createCustomXMLReporter();
@@ -45,15 +44,11 @@ public void generateReport(List<XmlSuite> xmlSuites, List<ISuite> suites,
      *         test results. The document element is &lt;testng-results&gt;.
      */
     XMLReporter createCustomXMLReporter() {
-        // config data syntax: "class-name:prop1=val1,prop2=val2"
-        StringBuilder reporterConfig = new StringBuilder(
-                XMLReporter.class.getName() + ":");
-        reporterConfig.append("stackTraceOutputMethod=").append(
-                XMLReporterConfig.STACKTRACE_NONE);
-        reporterConfig.append(",").append("generateTestResultAttributes=true");
-        reporterConfig.append(",").append("generateGroupsAttribute=true");
-        ReporterConfig reporterConf = ReporterConfig.deserialize(reporterConfig
-                .toString());
-        return (XMLReporter) reporterConf.newReporterInstance();
+        XMLReporter customReporter = new XMLReporter();
+        XMLReporterConfig config = customReporter.getConfig();
+        config.setStackTraceOutput(XMLReporterConfig.StackTraceLevels.NONE);
+        config.setGenerateTestResultAttributes(true);
+        config.setGenerateGroupsAttribute(true);
+        return customReporter;
     }
 }
diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/TestNGExecutor.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/TestNGExecutor.java
@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -35,7 +34,6 @@
 import javax.xml.transform.sax.SAXSource;
 
 import org.apache.jena.rdf.model.Model;
-import org.testng.IReporter;
 import org.testng.TestNG;
 import org.testng.xml.XmlSuite;
 import org.w3c.dom.Document;
@@ -57,7 +55,7 @@ public class TestNGExecutor implements TestRunExecutor {
 
     private static final List<String> SUPPORTED_MEDIA_TYPES = Arrays.asList( "application/xml", "application/zip", "application/rdf+xml" );
 
-    private boolean useDefaultListeners;
+    private final boolean useDefaultListeners;
 
     private File outputDir;
 
@@ -165,7 +163,7 @@ public Source execute(Document testRunArgs) {
         AlterSuiteParametersListener listener = new AlterSuiteParametersListener();
         listener.setTestRunArgs(testRunArgs);
         listener.setTestRunId(runId);
-        driver.addAlterSuiteListener(listener);
+        driver.addListener(listener);
         try {
             driver.run();
 		} catch (Exception e) {

diff --git a/...engine-spi/src/test/java/com/occamlab/te/spi/executors/testng/VerifyBasicXMLReporter.java b/...engine-spi/src/test/java/com/occamlab/te/spi/executors/testng/VerifyBasicXMLReporter.java
@@ -32,8 +32,10 @@ public void setUp() {
     public void createCustomXMLReporter() {
         BasicXMLReporter iut = new BasicXMLReporter();
         XMLReporter result = iut.createCustomXMLReporter();
-        Assert.assertEquals("Unexpected stackTraceOutputMethod", XMLReporterConfig.STACKTRACE_NONE,
-                result.getStackTraceOutputMethod());
-        Assert.assertNull("Expected null outputDirectory", result.getOutputDirectory());
+        Assert.assertEquals("Unexpected configuration of stackTraceOutput", XMLReporterConfig.StackTraceLevels.NONE,
+                result.getConfig().getStackTraceOutput());
+        Assert.assertTrue("Unexpected configuration of generateTestResultAttributes", result.getConfig().isGenerateTestResultAttributes());
+        Assert.assertTrue("Unexpected configuration of generateGroupsAttribute", result.getConfig().isGenerateGroupsAttribute());
+        Assert.assertNull("Expected null outputDirectory", result.getConfig().getOutputDirectory());
     }
 }