test: improve osgi tests

Author: vlsi

testng-test-osgi/src/test/java/org/testng/test/osgi/DefaultTestngOsgiOptions.java

@@ -22,6 +22,15 @@ public static ModifiableCompositeOption defaultTestngOsgiOptions() {
             .value(System.getProperty("testng.org.ops4j.pax.url.mvn.localRepository")),
         mavenBundle("org.testng", "testng").versionAsInProject(),
         mavenBundle("org.assertj", "assertj-core").versionAsInProject(),
+        mavenBundle("net.bytebuddy", "byte-buddy").versionAsInProject(),
+        mavenBundle("com.google.inject", "guice").versionAsInProject(),
+        mavenBundle("com.google.guava", "guava").versionAsInProject(),
+        mavenBundle("com.google.guava", "failureaccess").versionAsInProject(),
+        mavenBundle("com.google.guava", "listenablefuture").versionAsInProject(),
+        mavenBundle("org.checkerframework", "checker-qual").versionAsInProject(),
+        mavenBundle("com.google.errorprone", "error_prone_annotations").versionAsInProject(),
+        mavenBundle("com.google.j2objc", "j2objc-annotations").versionAsInProject(),
+        mavenBundle("org.apache.aries.spifly", "org.apache.aries.spifly.dynamic.framework.extension").versionAsInProject(),
         systemProperty("logback.configurationFile")
             .value(System.getProperty("logback.configurationFile")),
         mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(),

testng-test-osgi/src/test/java/org/testng/test/osgi/PlainOsgiTest.java

@@ -38,4 +38,10 @@ public void versionShouldStartWithDigit() throws Exception {
             (v) -> String.valueOf(v).length() > 0 && Character.isDigit(String.valueOf(v).charAt(0)),
             "Version.getVersionString() should start with a digit but was " + version);
   }
+
+  @Test
+  public void guiceModuleFactoryLoads() throws Exception {
+    assertThat(Class.forName("org.testng.IModuleFactory").getMethods())
+        .isNotEmpty();
+  }
 }

testng-test-osgi/testng-test-osgi-build.gradle.kts

@@ -16,21 +16,29 @@ val testngRepository by configurations.creating {
 dependencies {
     testngRepository(projects.testng)
 
-    testImplementation(projects.testng)
+    testImplementation(projects.testng) {
+        capabilities {
+            requireFeature("guice")
+        }
+    }
 
     testImplementation("javax:javaee-api:8.0.1") {
         // The dependency was not obvious, logged https://github.com/cbeust/testng/issues/2578
         because("PaxExam uses javax.transaction.NotSupportedException and other classes")
     }
-    testImplementation("org.ops4j.pax.exam:pax-exam-container-native:4.13.1")
+    testImplementation("org.ops4j.pax.exam:pax-exam-container-native:4.14.0")
     // pax-exam is not yet compatible with junit5
     // see https://github.com/ops4j/org.ops4j.pax.exam2/issues/886
-    testImplementation("org.ops4j.pax.exam:pax-exam-testng:4.13.5")
-    testImplementation("org.ops4j.pax.exam:pax-exam-link-mvn:4.13.5")
+    testImplementation("org.ops4j.pax.exam:pax-exam-testng:4.14.0")
+    testImplementation("org.ops4j.pax.exam:pax-exam-link-mvn:4.14.0")
     testImplementation("org.ops4j.pax.url:pax-url-aether:2.6.12")
     testImplementation("org.apache.felix:org.apache.felix.framework:7.0.5")
     testImplementation("ch.qos.logback:logback-core:1.4.11")
     testImplementation("ch.qos.logback:logback-classic:1.4.11")
+    testRuntimeOnly("org.assertj:assertj-core:3.23.1")
+    testRuntimeOnly("org.apache.aries.spifly:org.apache.aries.spifly.dynamic.framework.extension:1.3.7") {
+        because("slf4j-api 2.0 requires osgi.serviceloader.processor, see https://stackoverflow.com/a/77867804")
+    }
 }
 
 // <editor-fold defaultstate="collapsed" desc="Pass dependency versions to pax-exam container">
@@ -83,5 +91,4 @@ tasks.test {
             "-Dtestng.org.ops4j.pax.url.mvn.localRepository=file:${paxLocalCacheRepository.get().asFile.absolutePath}@id=pax-repo"
         )
     })
-    ignoreFailures = true
 }

testng/testng-build.gradle.kts

@@ -53,7 +53,7 @@ tasks.mergedJar {
             "Import-Package" to """
                 bsh.*;version="[2.0.0,3.0.0)";resolution:=optional,
                 com.beust.jcommander.*;version="[1.7.0,3.0.0)";resolution:=optional,
-                com.google.inject.*;version="[1.2,1.3)";resolution:=optional,
+                com.google.inject;version="5.1.0";resolution:=optional,
                 org.yaml.*;version="[1.6,2.0)";resolution:=optional,
                 *;resolution:=optional
             """.trimIndent().replace("\n", ""),