You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/06/17 02:04:06 UTC
[2/2] tomee git commit: activating cdi for webprofile arquillian
tests to avoid to skip plume distrib
activating cdi for webprofile arquillian tests to avoid to skip plume distrib
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4cf313cf
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4cf313cf
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4cf313cf
Branch: refs/heads/master
Commit: 4cf313cf432f98375735b798a5e9fbec9d7f2035
Parents: ac0c779
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Jun 17 02:03:25 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Jun 17 02:03:25 2015 +0200
----------------------------------------------------------------------
.../apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java | 2 ++
.../arquillian/tests/jsf/resource/JSFResourceInjectionTest.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4cf313cf/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java
index 179b03a..07b476a 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jpa/JPAInjectionTest.java
@@ -24,6 +24,7 @@ import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
@@ -56,6 +57,7 @@ public class JPAInjectionTest extends JSFs {
Asset persistenceAsset = new StringAsset(persistenceDescriptor.exportAsString());
return base("jsf-jpa-test.war").addAsWebInfResource(persistenceAsset, "persistence.xml")
.addClasses(DummyManagedBean.class)
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsWebResource(new ClassLoaderAsset(
JPAInjectionTest.class.getPackage().getName().replace('.', '/').concat("/").concat("dummy.xhtml")), "dummy.xhtml");
http://git-wip-us.apache.org/repos/asf/tomee/blob/4cf313cf/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/resource/JSFResourceInjectionTest.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/resource/JSFResourceInjectionTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/resource/JSFResourceInjectionTest.java
index 6ae63d6..009cfce 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/resource/JSFResourceInjectionTest.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/resource/JSFResourceInjectionTest.java
@@ -22,6 +22,7 @@ import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,6 +42,7 @@ public class JSFResourceInjectionTest extends JSFs {
public static WebArchive getArchive() {
return base("jsf-resource-injection-test.war")
.addClass(ResourceManagedBean.class)
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsWebResource(new ClassLoaderAsset(
JSFResourceInjectionTest.class.getPackage()
.getName().replace('.', '/').concat("/resource.xhtml")), "resource.xhtml");