From d2558b7ddf682e41bc829d69bbdafa4927c23887 Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@redhat.com>
Date: Wed, 4 May 2016 15:07:00 +0200
Subject: [PATCH] DELTASPIKE-1141 modify FutureableTest and LockedTest to
 contain beans.xml with relevant interceptors.

---
 deltaspike/core/impl/pom.xml                      |  7 +++++++
 .../test/core/impl/future/FutureableTest.java     | 11 ++++++++++-
 .../test/core/impl/lock/LockedTest.java           | 15 ++++++++++++---
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/deltaspike/core/impl/pom.xml b/deltaspike/core/impl/pom.xml
index 67d38315e..e3fefaa22 100644
--- a/deltaspike/core/impl/pom.xml
+++ b/deltaspike/core/impl/pom.xml
@@ -67,6 +67,13 @@
             <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>test</scope>
         </dependency>
+        
+        <!-- Allows to create beans.xml files with certain content -->        
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+            <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java
index 53dd1b39f..5dec0a7a0 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java
@@ -29,20 +29,29 @@
 import org.junit.runner.RunWith;
 
 import javax.inject.Inject;
+
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import org.apache.deltaspike.core.impl.future.FutureableInterceptor;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.descriptor.api.Descriptors;
+import org.jboss.shrinkwrap.descriptor.api.beans10.BeansDescriptor;
+
 @RunWith(Arquillian.class)
 public class FutureableTest {
     @Deployment
     public static WebArchive deploy()
     {
+        // create beans.xml with added interceptor
+        BeansDescriptor beans = Descriptors.create(BeansDescriptor.class);
+        beans.getOrCreateInterceptors().clazz(FutureableInterceptor.class.getName());
         JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "FutureableTest.jar")
                 .addPackage(Service.class.getPackage().getName())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsManifestResource(new StringAsset(beans.exportAsString()), "beans.xml");
 
         return ShrinkWrap.create(WebArchive.class, "FutureableTest.war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java
index c0f43ce1b..a86943843 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/lock/LockedTest.java
@@ -29,6 +29,7 @@
 import org.junit.runner.RunWith;
 
 import javax.inject.Inject;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -37,16 +38,24 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+import org.apache.deltaspike.core.impl.lock.LockedInterceptor;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.descriptor.api.Descriptors;
+import org.jboss.shrinkwrap.descriptor.api.beans10.BeansDescriptor;
+
 @RunWith(Arquillian.class)
 public class LockedTest {
     @Deployment
     public static WebArchive deploy()
     {
-        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "FutureableTest.jar")
+        // create beans.xml with added interceptor
+        BeansDescriptor beans = Descriptors.create(BeansDescriptor.class);
+        beans.getOrCreateInterceptors().clazz(LockedInterceptor.class.getName());
+        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "LockedTest.jar")
                 .addPackage(Service.class.getPackage().getName())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsManifestResource(new StringAsset(beans.exportAsString()), "beans.xml");
 
-        return ShrinkWrap.create(WebArchive.class, "FutureableTest.war")
+        return ShrinkWrap.create(WebArchive.class, "LockedTest.war")
                 .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
                 .addAsLibraries(testJar)
                 .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");