[PAXCDI-191] enable test with wrapped DS Security bundles

Author: hwellmann

itest/src/it/itest-standalone/src/test/java/org/ops4j/pax/cdi/test/SecurityTest.java

@@ -23,11 +23,11 @@
 import static org.ops4j.pax.cdi.test.support.TestConfiguration.workspaceBundle;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
 
 import javax.inject.Inject;
 
 import org.apache.deltaspike.security.api.authorization.AccessDeniedException;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -41,7 +41,6 @@
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-@Ignore
 public class SecurityTest {
 
     @Rule
@@ -62,15 +61,30 @@ public Option[] config() {
             // DeltaSpike bundles
             mavenBundle("org.apache.deltaspike.core", "deltaspike-core-api").versionAsInProject(),
             mavenBundle("org.apache.deltaspike.core", "deltaspike-core-impl").versionAsInProject(),
-            mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-api").versionAsInProject(),
-            mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-impl").versionAsInProject(),
+
+            // Uncomment this section and delete the next after upgrading to DS 1.4.2
+            // mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-api").versionAsInProject(),
+            // mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-impl").versionAsInProject(),
+
+            wrappedBundle(mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-api")
+                .versionAsInProject())
+                .instructions(
+                    "overwrite=merge",
+                    "Bundle-SymbolicName=org.apache.deltaspike.modules.deltaspike-security-module-api"),
+            wrappedBundle(mavenBundle("org.apache.deltaspike.modules", "deltaspike-security-module-impl").versionAsInProject())
+                .instructions(
+                    "overwrite=merge",
+                    "Bundle-SymbolicName=org.apache.deltaspike.modules.deltaspike-security-module-impl",
+                    "Provide-Capability=org.ops4j.pax.cdi.extension;extension=\"deltaspike-security-module-impl\"",
+                    "Require-Capability=org.ops4j.pax.cdi.extension; filter:=\"(extension=pax-cdi-extension)\", "
+                    + "osgi.extender; filter:=\"(osgi.extender=pax.cdi)\""),
 
             // Sample bundles
             workspaceBundle("org.ops4j.pax.cdi.samples", "pax-cdi-sample8"));
     }
 
     @Test
-    public void shouldNotInvokeBlockService() {
+    public void shouldNotInvokeBlockedService() {
         thrown.expect(AccessDeniedException.class);
         securedService.getBlockedResult();
     }