fix tests related to PDE bundle

ops4j · Nov 2, 2024 · feb27de · feb27de
1 parent 6318cab
commit feb27de
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/containers/pax-exam-container-forked/pom.xml b/containers/pax-exam-container-forked/pom.xml
@@ -148,6 +148,7 @@
                                     <outputDirectory>${project.build.directory}/bundles</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
+                            <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
                     <execution>

diff --git a/...-container-forked/src/test/java/org/ops4j/pax/exam/forked/ForkedFrameworkFactoryTest.java b/...-container-forked/src/test/java/org/ops4j/pax/exam/forked/ForkedFrameworkFactoryTest.java
@@ -32,7 +32,6 @@
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
@@ -68,7 +67,6 @@ public void afterTest() throws IOException {
     }
 
     @Test
-    @Ignore // pde bundle is outdated (Bundle-RequiredExecutionEnvironment: JavaSE-1.6)
     public void forkEquinox() throws BundleException, IOException, InterruptedException,
         NotBoundException, URISyntaxException {
         ServiceLoader<FrameworkFactory> loader = ServiceLoader.load(FrameworkFactory.class);
@@ -83,10 +81,10 @@ public void forkEquinox() throws BundleException, IOException, InterruptedExcept
         framework.start();
 
         long bundleId = framework
-            .installBundle("file:target/bundles/regression-pde-bundle-2.3.0.jar");
+            .installBundle("file:target/bundles/pax-exam-sample9-pde.jar");
         framework.startBundle(bundleId);
 
-        framework.callService("(objectClass=org.ops4j.pax.exam.regression.pde.HelloService)",
+        framework.callService("(objectClass=org.ops4j.pax.exam.sample9.pde.HelloService)",
             "getMessage");
 
         Thread.sleep(3000);

diff --git a/...s/pax-exam-container-forked/src/test/java/org/ops4j/pax/exam/forked/ReferenceJarTest.java b/...s/pax-exam-container-forked/src/test/java/org/ops4j/pax/exam/forked/ReferenceJarTest.java
@@ -24,7 +24,6 @@
 
 import javax.inject.Inject;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -49,7 +48,6 @@ public Option[] config() {
     }
 
     @Test
-    @Ignore // pde bundle is outdated (Bundle-RequiredExecutionEnvironment: JavaSE-1.6)
     public void getHelloService() {
         Object service = ServiceLookup.getService(bc,
             "org.ops4j.pax.exam.regression.pde.HelloService");

diff --git a/samples/pax-exam-sample9-pde/META-INF/MANIFEST.MF b/samples/pax-exam-sample9-pde/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.ops4j.pax.exam.sample9.pde
 Bundle-Version: 3.1.0
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="[1.5.0,2)"
 Export-Package: org.ops4j.pax.exam.sample9.pde
 Bundle-Activator: org.ops4j.pax.exam.sample9.pde.impl.Activator
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=11))"