test: improve osgi tests

Author: vlsi

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

@@ -21,7 +21,23 @@ public static ModifiableCompositeOption defaultTestngOsgiOptions() {
         systemProperty("org.ops4j.pax.url.mvn.localRepository")
             .value(System.getProperty("testng.org.ops4j.pax.url.mvn.localRepository")),
         mavenBundle("org.testng", "testng").versionAsInProject(),
+        mavenBundle("org.jcommander", "jcommander").versionAsInProject(),
         mavenBundle("org.assertj", "assertj-core").versionAsInProject(),
+        mavenBundle("net.bytebuddy", "byte-buddy").versionAsInProject(),
+        mavenBundle("com.google.inject", "guice").versionAsInProject(),
+        mavenBundle("org.yaml", "snakeyaml").versionAsInProject(),
+        mavenBundle("com.google.guava", "guava").versionAsInProject(),
+        mavenBundle("com.google.guava", "failureaccess").versionAsInProject(),
+        mavenBundle("com.google.guava", "listenablefuture").versionAsInProject(),
+        mavenBundle("com.google.code.findbugs", "jsr305").versionAsInProject(),
+        mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.aopalliance")
+            .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

@@ -4,14 +4,20 @@
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.testng.test.osgi.DefaultTestngOsgiOptions.defaultTestngOsgiOptions;
 
+import java.io.ByteArrayInputStream;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerMethod;
 import org.ops4j.pax.exam.testng.listener.PaxExam;
+import org.testng.IModuleFactory;
+import org.testng.TestNG;
 import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
+import org.testng.internal.YamlParser;
+import org.testng.xml.XmlSuite;
 
 /**
  * The purpose of the class is to ensure {@code postgresql} bundle activation does not fail in case
@@ -38,4 +44,23 @@ 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() {
+    assertThat(IModuleFactory.class.getMethods()).isNotEmpty();
+  }
+
+  @Test
+  public void jcommanderLoads() {
+    assertThat(TestNG.class.getFields()).isNotEmpty();
+  }
+
+  @Test
+  public void yamlLoads() {
+    YamlParser parser = new YamlParser();
+    ByteArrayInputStream input =
+        new ByteArrayInputStream("name: My_Suite\n".getBytes(StandardCharsets.UTF_8));
+    XmlSuite suite = parser.parse("test.yml", input, false);
+    assertThat(suite).extracting("name").isEqualTo("My_Suite");
+  }
 }

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

@@ -16,21 +16,40 @@ val testngRepository by configurations.creating {
 dependencies {
     testngRepository(projects.testng)
 
-    testImplementation(projects.testng)
+    testImplementation(projects.testng) {
+        capabilities {
+            requireFeature("guice")
+        }
+    }
+    testImplementation(projects.testng) {
+        capabilities {
+            requireFeature("yaml")
+        }
+    }
 
     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.servicemix.bundles:org.apache.servicemix.bundles.aopalliance:1.0_6") {
+        because("Guice requires org.aopalliance.intercept package in osgi, however, aopalliance:aopalliance has no osgi headers")
+    }
+    testRuntimeOnly("com.google.errorprone:error_prone_annotations:2.36.0") {
+        because("It is needed for Guava, only recent version of error_prone_annotations have osgi headers")
+    }
+    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 +102,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

@@ -51,11 +51,12 @@ tasks.mergedJar {
             "Bundle-Description" to project.description,
             "Bundle-Version" to project.version.toString().removeSuffix("-SNAPSHOT"),
             "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,
-                org.yaml.*;version="[1.6,2.0)";resolution:=optional,
-                *;resolution:=optional
+                com.beust.jcommander;version="1.7.0",
+                org.slf4j;version="2.0",
+                com.google.inject;version="1.2.0";resolution:=optional,
+                org.yaml.snakeyaml;version="1.6";resolution:=optional,
+                org.yaml.snakeyaml.nodes;version="1.6";resolution:=optional,
+                org.yaml.snakeyaml.constructor;version="1.6";resolution:=optional
             """.trimIndent().replace("\n", ""),
             "Export-Package" to """
                 org.testng