deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject [2/2] git commit: DELTASPIKE-482 TomEE requires explicit listing of CDI enricher.
Date Sun, 29 Dec 2013 19:41:57 GMT
DELTASPIKE-482 TomEE requires explicit listing of CDI enricher.


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/bcc29d01
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/bcc29d01
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/bcc29d01

Branch: refs/heads/master
Commit: bcc29d014164335388d9797b8278d883546cac0d
Parents: 0f39021
Author: John D. Ament <john.d.ament@gmail.com>
Authored: Sun Dec 29 14:41:18 2013 -0500
Committer: John D. Ament <john.d.ament@gmail.com>
Committed: Sun Dec 29 14:41:18 2013 -0500

----------------------------------------------------------------------
 .../test/core/impl/resourceloader/ClasspathWebProfileTest.java | 2 --
 deltaspike/parent/code/pom.xml                                 | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bcc29d01/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
index 50bead2..1fb20f4 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/resourceloader/ClasspathWebProfileTest.java
@@ -87,7 +87,6 @@ public class ClasspathWebProfileTest
     public void testAmbiguousFileLookup(@ExternalResource(storage=ClasspathStorage.class,
             location="META-INF/beans.xml") InputStream inputStream)
     {
-        Assume.assumeTrue(CdiContainerUnderTest.isNotTomEE()); // don't run in TomEE until
TOMEE-1101 is fixed.
         Assert.assertNull(inputStream); // for some reason, this works, exception no longer
thrown.
     }
 
@@ -95,7 +94,6 @@ public class ClasspathWebProfileTest
     public void testSuccessfulAmbiguousLookup(@ExternalResource(storage = ClasspathStorage.class,
             location="META-INF/beans.xml") List<InputStream> inputStreams)
     {
-        Assume.assumeTrue(CdiContainerUnderTest.isNotTomEE()); // don't run in TomEE until
TOMEE-1101 is fixed.
         Assert.assertTrue(inputStreams.size() > 1); //the count is different on as7 compared
to the standalone setup
     }
 

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bcc29d01/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index a2fa4f6..ee8ef4c 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -355,6 +355,12 @@
                     <type>zip</type>
                 </dependency>
                 <dependency>
+                    <groupId>org.jboss.arquillian.testenricher</groupId>
+                    <artifactId>arquillian-testenricher-cdi</artifactId>
+                    <version>${arquillian.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>arquillian-tomee-remote</artifactId>
                 </dependency>


Mime
View raw message