Author: petemuir
Date: 2010-10-30 16:49:37 -0400 (Sat, 30 Oct 2010)
New Revision: 7068
Added:
cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/ejb-jar.xml
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
CDITCK-185
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
===================================================================
---
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2010-10-30
20:42:39 UTC (rev 7067)
+++
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2010-10-30
20:49:37 UTC (rev 7068)
@@ -29,6 +29,7 @@
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
@@ -37,6 +38,7 @@
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
+(a)EjbJarXml("ejb-jar.xml")
public class EnterpriseBeanSpecializationIntegrationTest extends AbstractJSR299Test
{
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
---
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2010-10-30
20:42:39 UTC (rev 7067)
+++
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2010-10-30
20:49:37 UTC (rev 7068)
@@ -30,6 +30,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
@@ -37,6 +38,7 @@
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
@SpecVersion(spec="cdi", version="20091101")
+(a)EjbJarXml("ejb-jar.xml")
public class EnterpriseBeanSpecializationTest extends AbstractJSR299Test
{
Added:
cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/ejb-jar.xml
===================================================================
---
cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/ejb-jar.xml
(rev 0)
+++
cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/ejb-jar.xml 2010-10-30
20:49:37 UTC (rev 7068)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar
xmlns="http://java.sun.com/xml/ns/javaee"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ version="3.1">
+
+</ejb-jar>
\ No newline at end of file
Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-10-30 20:42:39 UTC
(rev 7067)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-10-30 20:49:37 UTC
(rev 7068)
@@ -16,14 +16,6 @@
<classes>
<!-- Issues in the TCK -->
- <!-- CDITCK-185 -->
- <class
name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationTest">
- <methods>
- <exclude
name="testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean" />
- <exclude
name="testSpecializingBeanHasNameOfSpecializedBean"/>
- </methods>
- </class>
-
<!-- CDITCK-184 -->
<class
name="org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest">
<methods>