use testng from TestingOptions

ops4j · Mar 25, 2024 · f385749 · f385749
1 parent 1e0ab70
commit f385749
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/...sion-testng-perclass/src/test/java/org/ops4j/pax/exam/testng/perclass/CalculatorTest.java b/...sion-testng-perclass/src/test/java/org/ops4j/pax/exam/testng/perclass/CalculatorTest.java
@@ -20,6 +20,7 @@
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.options.libraries.TestingOptions.testng;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
@@ -45,7 +46,7 @@ public Option[] config() {
 
  mavenBundle("org.ops4j.pax.exam.samples", "pax-exam-sample8-ds", "4.2.0"),
  mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.2"),
- mavenBundle("org.testng", "testng", "6.9.10"),
+ testng(),
  systemProperty("osgi.console").value("6666"));
  }
 

diff --git a/...ion-testng/src/test/java/org/ops4j/pax/exam/testng/inject/InjectConfigurationFactory.java b/...ion-testng/src/test/java/org/ops4j/pax/exam/testng/inject/InjectConfigurationFactory.java
@@ -22,6 +22,7 @@
 import static org.ops4j.pax.exam.CoreOptions.propagateSystemProperty;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static org.ops4j.pax.exam.CoreOptions.url;
+import static org.ops4j.pax.exam.options.libraries.TestingOptions.testng;
 
 import org.ops4j.pax.exam.ConfigurationFactory;
 import org.ops4j.pax.exam.Option;
@@ -33,7 +34,7 @@ public class InjectConfigurationFactory implements ConfigurationFactory {
  public Option[] createConfiguration() {
  return options(
  propagateSystemProperty("pax.exam.regression.rmi"),
- mavenBundle("org.testng", "testng", "6.9.10"),
+ testng(),
  url("reference:file:" + PathUtils.getBaseDir() + "/target/pax-exam-sample9-pde/"),
 
  systemProperty("osgi.console").value("6666"));

diff --git a/...src/it/regression-testng/src/test/java/org/ops4j/pax/exam/testng/test/TestNGExamTest.java b/...src/it/regression-testng/src/test/java/org/ops4j/pax/exam/testng/test/TestNGExamTest.java
@@ -21,6 +21,7 @@
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.options.libraries.TestingOptions.testng;
 import static org.testng.Assert.assertNotNull;
 
 import javax.inject.Inject;
@@ -42,7 +43,7 @@ public class TestNGExamTest {
  public Option[] config() {
  return options(
 
- mavenBundle("org.testng", "testng", "6.9.10"),
+ testng(),
  systemProperty("osgi.console").value("6666"));
  }