svn commit: r1631117 - in /tomee/tomee/trunk/tck/cdi-embedded: ./ src/test/java/org/apache/openejb/tck/cdi/embedded/ src/test/resources/ src/test/resources/META-INF/

[rm...@apache.org]

Author: rmannibucau
Date: Sat Oct 11 20:45:28 2014
New Revision: 1631117

URL: http://svn.apache.org/r1631117
Log:
using OWB for what is possible to get CDI 1.1 SPI implementations

Removed:
    tomee/tomee/trunk/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ContextsImpl.java
    tomee/tomee/trunk/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ELImpl.java
Modified:
    tomee/tomee/trunk/tck/cdi-embedded/pom.xml
    tomee/tomee/trunk/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java
    tomee/tomee/trunk/tck/cdi-embedded/src/test/resources/META-INF/cdi-tck.properties
    tomee/tomee/trunk/tck/cdi-embedded/src/test/resources/failing.xml

Modified: tomee/tomee/trunk/tck/cdi-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/cdi-embedded/pom.xml?rev=1631117&r1=1631116&r2=1631117&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/cdi-embedded/pom.xml (original)
+++ tomee/tomee/trunk/tck/cdi-embedded/pom.xml Sat Oct 11 20:45:28 2014
@@ -53,6 +53,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.openwebbeans</groupId>
+      <artifactId>openwebbeans-porting</artifactId>
+      <version>${org.apache.openwebbeans.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.cdi.tck</groupId>
       <artifactId>cdi-tck-impl</artifactId>
       <version>1.2.2.Final</version>

Modified: tomee/tomee/trunk/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java?rev=1631117&r1=1631116&r2=1631117&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java (original)
+++ tomee/tomee/trunk/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/BeansImpl.java Sat Oct 11 20:45:28 2014
@@ -29,9 +29,9 @@ import java.io.ObjectOutputStream;
 /**
 * @version $Rev$ $Date$
 */
-public class BeansImpl implements Beans {
+public class BeansImpl extends org.apache.webbeans.test.tck.BeansImpl {
     public boolean isProxy(final Object instance) {
-        return instance instanceof IntraVmProxy || instance.getClass().getName().contains("$Owb");
+        return instance instanceof IntraVmProxy || super.isProxy(instance);
     }
 
     @Override

Modified: tomee/tomee/trunk/tck/cdi-embedded/src/test/resources/META-INF/cdi-tck.properties
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/cdi-embedded/src/test/resources/META-INF/cdi-tck.properties?rev=1631117&r1=1631116&r2=1631117&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/cdi-embedded/src/test/resources/META-INF/cdi-tck.properties (original)
+++ tomee/tomee/trunk/tck/cdi-embedded/src/test/resources/META-INF/cdi-tck.properties Sat Oct 11 20:45:28 2014
@@ -20,5 +20,5 @@ org.jboss.cdi.tck.testJmsConnectionFacto
 org.jboss.cdi.tck.testJmsQueue = openejb:Resource/queue
 org.jboss.cdi.tck.testJmsTopic = openejb:Resource/topic
 org.jboss.cdi.tck.spi.Beans = org.apache.openejb.tck.cdi.embedded.BeansImpl
-org.jboss.cdi.tck.spi.Contexts = org.apache.openejb.tck.cdi.embedded.ContextsImpl
-org.jboss.cdi.tck.spi.EL = org.apache.openejb.tck.cdi.embedded.ELImpl
+org.jboss.cdi.tck.spi.Contexts = org.apache.webbeans.test.tck.ContextsImpl
+org.jboss.cdi.tck.spi.EL = org.apache.webbeans.test.tck.ELImpl

Modified: tomee/tomee/trunk/tck/cdi-embedded/src/test/resources/failing.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/cdi-embedded/src/test/resources/failing.xml?rev=1631117&r1=1631116&r2=1631117&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/cdi-embedded/src/test/resources/failing.xml (original)
+++ tomee/tomee/trunk/tck/cdi-embedded/src/test/resources/failing.xml Sat Oct 11 20:45:28 2014
@@ -18,7 +18,7 @@
 <suite name="CDI TCK" verbose="0">
   <test name="CDI TCK">
     <classes>
-      <class name="org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct.ConstructorInterceptionTest"/>
+      <class name="org.jboss.cdi.tck.tests.decorators.definition.broken.nonExistantClassInBeansXml.NonExistantDecoratorClassInBeansXmlTest"/>
     </classes>
   </test>
 </suite>