[webbeans-commits] Webbeans SVN: r2874 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance: specialization/enterprise and 20 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Jun 23 18:35:56 EDT 2009
Author: dallen6
Date: 2009-06-23 18:35:55 -0400 (Tue, 23 Jun 2009)
New Revision: 2874
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/realization/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
Log:
Upgraded all inheritance tests to the 20090519 version of the spec
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -16,7 +16,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact
@Packaging(PackagingType.EAR)
@@ -28,8 +28,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "4.3.1", id = "c"),
- @SpecAssertion(section = "3.3.7", id = "a")
+ @SpecAssertion(section = "4.3.1", id = "j"),
+ @SpecAssertion(section = "3.3.4", id = "aa")
})
public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
{
@@ -42,8 +42,7 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "4.3.1", id = "d"),
- @SpecAssertion(section = "3.3.7", id = "a")
+ @SpecAssertion(section = "4.3.1", id = "k")
})
public void testSpecializingBeanHasNameOfSpecializedBean()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/InvalidEnterpriseBeanSpecializationTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -2,32 +2,29 @@
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
/**
- * Spec version: PRD2
+ * Spec version: 20090519
*/
@Artifact
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
- at ExpectedDeploymentException(DefinitionError.class)
public class InvalidEnterpriseBeanSpecializationTest extends AbstractJSR299Test
{
@Test(groups={"stub", "specialization"})
- @SpecAssertion(section="3.3.7", id = "a")
+ @SpecAssertion(section="3.3.4", id = "e")
public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean()
{
assert false;
}
@Test(groups={"stub", "specialization"})
- @SpecAssertion(section="3.3.7", id = "a")
+ @SpecAssertion(section="3.3.4", id = "f")
public void testSpecializingBeanDoesNotSupportLocalInterfaceView()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -10,6 +10,9 @@
import org.jboss.testharness.impl.packaging.PackagingType;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
@@ -17,8 +20,8 @@
{
- @Test(groups={"specialization"})
- @SpecAssertion(section="3.3.7", id = "d")
+ @Test(groups={"specialization"})
+ @SpecAssertion(section="3.3.4", id = "da")
public void testSpecializingClassDirectlyExtendsNothing()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -10,6 +10,9 @@
import org.jboss.testharness.impl.packaging.PackagingType;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
@@ -18,7 +21,7 @@
@Test(groups={"specialization"})
- @SpecAssertion(section="3.3.7", id = "d")
+ @SpecAssertion(section="3.3.4", id = "da")
public void testSpecializingClassDirectlyExtendsSimpleBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -10,6 +10,9 @@
import org.jboss.testharness.impl.packaging.PackagingType;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@ExpectedDeploymentException(DefinitionError.class)
@Artifact
@Packaging(PackagingType.EAR)
@@ -17,7 +20,7 @@
{
@Test(groups={"specialization"})
- @SpecAssertion(section="3.3.7", id = "d")
+ @SpecAssertion(section="3.3.4", id = "da")
public void testSpecializingClassImplementsInterfaceAndExtendsNothing()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -11,6 +11,9 @@
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
@@ -19,8 +22,8 @@
{
- @Test
- @SpecAssertion(section = "4.3.1", id = "e")
+ @Test
+ @SpecAssertion(section = "4.3.1", id = "l")
public void testSpecializingAndSpecializedBeanHasName()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -1,23 +1,25 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.samePrecedence;
-import javax.inject.InconsistentSpecializationException;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@Packaging(PackagingType.EAR)
- at ExpectedDeploymentException(InconsistentSpecializationException.class)
+ at ExpectedDeploymentException(DeploymentError.class)
public class SamePrecedenceTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section="4.3.3", id = "a")
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section="4.3.3", id = "aa")
public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -1,9 +1,8 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
-import javax.inject.InconsistentSpecializationException;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Packaging;
@@ -11,16 +10,19 @@
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@Packaging(PackagingType.EAR)
- at ExpectedDeploymentException(InconsistentSpecializationException.class)
+ at ExpectedDeploymentException(DeploymentError.class)
@BeansXml("beans.xml")
public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section="4.3.3", id = "a")
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section="4.3.3", id = "ba")
public void testTwoBeansSpecializeTheSameBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -13,7 +13,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: PRD2
+ * Spec version: 20090519
*
*/
@Artifact
@@ -25,34 +25,15 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "4.3.1", id = "c"),
- @SpecAssertion(section = "3.4.5", id = "a")
+ @SpecAssertion(section = "3.4.4", id = "aa")
})
- public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
+ public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean() throws Exception
{
assert getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).size() == 1;
assert getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings().size() == 3;
assert annotationSetMatches( getCurrentManager().getBeans(Product.class, EXPENSIVE_LITERAL).iterator().next().getBindings(), Expensive.class, Sparkly.class, Any.class);
- }
-
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "4.3.1", id = "d"),
- @SpecAssertion(section = "3.4.5", id = "a")
- })
- public void testSpecializingBeanHasNameOfSpecializedBean()
- {
assert getBeans(Product.class, new AnnotationLiteral<Sparkly>(){}).size() == 1;
assert getBeans(Product.class, new AnnotationLiteral<Sparkly>(){}).iterator().next().getName().equals("expensiveGift");
- }
-
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "4.3.1", id = "f"),
- @SpecAssertion(section = "3.4.5", id = "a")
- })
- public void testSpecializedBeanNotInstantiated() throws Exception
- {
new RunInDependentContext()
{
@@ -65,5 +46,5 @@
}.run();
}
-
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/indirectOverride/IndirectOverrideTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -8,13 +8,16 @@
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class IndirectOverrideTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section="3.4.5", id = "c")
+ @Test
+ @SpecAssertion(section="3.4.4", id = "ca")
public void testSpecializedMethodIndirectlyOverridesAnotherProducerMethod()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/lowerprecedence/SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -1,21 +1,23 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.lowerprecedence;
-import javax.inject.InconsistentSpecializationException;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
- at ExpectedDeploymentException(InconsistentSpecializationException.class)
+ at ExpectedDeploymentException(DeploymentError.class)
public class SpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBeanTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section="4.3.1", id = "a")
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section="4.3.3", id = "aa")
public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -8,13 +8,16 @@
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class SpecializesStaticMethodTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section="3.4.5", id = "b")
+ @Test
+ @SpecAssertion(section="3.4.4", id = "ba")
public void testSpecializedStaticMethod()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -8,6 +8,9 @@
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test
@@ -15,7 +18,7 @@
@Test
- @SpecAssertion(section = "4.3.1", id = "d")
+ @SpecAssertion(section = "4.3.1", id = "l")
public void testSpecializingAndSpecializedBeanHasName()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -1,20 +1,22 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.twoBeansSpecializeTheSameBean;
-import javax.inject.InconsistentSpecializationException;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
- at ExpectedDeploymentException(InconsistentSpecializationException.class)
+ at ExpectedDeploymentException(DeploymentError.class)
public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section="4.3.3", id = "a")
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section="4.3.3", id = "ba")
public void testTwoBeansSpecializeTheSameBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -14,7 +14,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: PRD2
+ * Spec version: 20090519
*
*/
@Artifact
@@ -29,8 +29,9 @@
@SuppressWarnings("unchecked")
@Test
@SpecAssertions( {
- @SpecAssertion(section = "4.3.1", id = "c"),
- @SpecAssertion(section = "3.2.7", id = "a")
+ @SpecAssertion(section = "4.3.1", id = "i"),
+ @SpecAssertion(section = "4.3.1", id = "j"),
+ @SpecAssertion(section = "3.2.5", id = "aa")
})
public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
{
@@ -43,8 +44,8 @@
@Test
@SpecAssertions( {
- @SpecAssertion(section = "4.3.1", id = "d"),
- @SpecAssertion(section = "3.2.7", id = "a")
+ @SpecAssertion(section = "4.3.1", id = "k"),
+ @SpecAssertion(section = "3.2.5", id = "aa")
})
public void testSpecializingBeanHasNameOfSpecializedBean()
{
@@ -54,10 +55,6 @@
}
@Test
- @SpecAssertions( {
- @SpecAssertion(section = "4.3.1", id = "f"),
- @SpecAssertion(section = "3.2.7", id = "b")
- })
public void testSpecializedBeanNotInstantiated() throws Exception
{
new RunInDependentContext()
@@ -74,10 +71,11 @@
}
@Test
- @SpecAssertion(section = "4.3.1", id = "g")
+ @SpecAssertions( {
+ @SpecAssertion(section = "4.3.2", id = "a")
+ })
public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception
{
-// deployBeans(Office.class, Building.class);
new RunInDependentContext()
{
@@ -90,5 +88,4 @@
}.run();
}
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -10,13 +10,16 @@
import org.jboss.testharness.impl.packaging.PackagingType;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
- @SpecAssertion(section = "3.2.7", id = "a")
+ @SpecAssertion(section = "3.2.5", id = "aa")
public void testSpecializingClassDirectlyExtendsEnterpriseBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -8,12 +8,15 @@
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class SpecializingAndSpecializedBeanHasNameTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "4.3.1", id = "e")
+ @SpecAssertion(section = "4.3.1", id = "l")
public void testSpecializingAndSpecializedBeanHasName()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -8,12 +8,15 @@
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
- @SpecAssertion(section = "3.2.7", id = "a")
+ @SpecAssertion(section = "3.2.5", id = "da")
public void testSpecializingClassImplementsInterfaceAndExtendsNothing()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -8,12 +8,15 @@
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class SpecializingBeanExtendsNothingTest extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
- @SpecAssertion(section = "3.2.7", id = "a")
+ @SpecAssertion(section = "3.2.5", id = "da")
public void testSpecializingClassDirectlyExtendsNothing()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -8,12 +8,15 @@
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
public class SpecializingClassExtendsNonSimpleBeanTest extends AbstractJSR299Test
{
- @Test(groups = { "specialization", "ri-broken" })
- @SpecAssertion(section = "3.2.7", id = "d")
+ @Test(groups = { "specialization" })
+ @SpecAssertion(section = "3.2.5", id = "da")
public void testSpecializingClassExtendsNonSimpleBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/precedence/SpecializingBeanWithLowerPrecedenceTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -1,19 +1,21 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.precedence;
-import javax.inject.InconsistentSpecializationException;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
- at ExpectedDeploymentException(InconsistentSpecializationException.class)
+ at ExpectedDeploymentException(DeploymentError.class)
public class SpecializingBeanWithLowerPrecedenceTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section="4.3.3", id="a")
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section="4.3.3", id="aa")
public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-06-23 22:16:27 UTC (rev 2873)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-06-23 22:35:55 UTC (rev 2874)
@@ -1,19 +1,21 @@
package org.jboss.jsr299.tck.tests.inheritance.specialization.simple.broken.two;
-import javax.inject.InconsistentSpecializationException;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
+/**
+ * Spec version: 20090519
+ */
@Artifact
- at ExpectedDeploymentException(InconsistentSpecializationException.class)
+ at ExpectedDeploymentException(DeploymentError.class)
public class TwoSpecializingBeansForOneSpecializedTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section="4.3.3", id="a")
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section="4.3.3", id="ba")
public void testTwoBeansSpecializeTheSameBean()
{
assert false;
More information about the weld-commits
mailing list