Author: pete.muir(a)jboss.org Date: 2009-07-23 13:11:49 -0400 (Thu, 23 Jul 2009) New Revision: 3162 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java Log: Assign and mark broken tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-07-23 17:10:29 UTC (rev 3161) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-07-23 17:11:49 UTC (rev 3162) @@ -64,7 +64,10 @@ } @Test - @SpecAssertion(section = "2.3.3", id = "a") + @SpecAssertions({ + @SpecAssertion(section = "2.3.3", id = "a"), + @SpecAssertion(section="3.1.3", id="be") + }) public void testBindingsDeclaredInJava() { Bean<Cat> cat = getBeans(Cat.class, new SynchronousBinding()).iterator().next(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-07-23 17:10:29 UTC (rev 3161) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-07-23 17:11:49 UTC (rev 3162) @@ -21,7 +21,7 @@ @SpecAssertions({ @SpecAssertion(section="2.5.1", id = "a"), @SpecAssertion(section="2", id="e"), - @SpecAssertion(section = "3.2.3", id = "bb") + @SpecAssertion(section = "3.1.3", id = "bb") }) public void testNonDefaultNamed() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-23 17:10:29 UTC (rev 3161) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-07-23 17:11:49 UTC (rev 3162) @@ -166,6 +166,7 @@ @Test(groups = { "producerField" }) @SpecAssertions({ + @SpecAssertion(section = "2.5.2", id = "c"), @SpecAssertion(section = "2.5.3", id = "a"), @SpecAssertion(section = "3.4.3", id = "a"), @SpecAssertion(section = "2.5.1", id = "d") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-23 17:10:29 UTC (rev 3161) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-07-23 17:11:49 UTC (rev 3162) @@ -182,6 +182,7 @@ @Test(groups = "producerMethod") @SpecAssertions({ @SpecAssertion(section = "3.3.2", id = "bb"), + @SpecAssertion(section = "2.5.2", id = "b"), @SpecAssertion(section = "2.5.1", id = "d"), @SpecAssertion(section = "3.3.10", id = "a") }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-07-23 17:10:29 UTC (rev 3161) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-07-23 17:11:49 UTC (rev 3162) @@ -103,7 +103,8 @@ @Test @SpecAssertions({ @SpecAssertion(section = "3.1.4.1", id = "ba"), - @SpecAssertion(section = "3.1.3", id = "a") + @SpecAssertion(section = "3.1.3", id = "a"), + @SpecAssertion(section = "3.1.4", id = "a") }) public void testEmptyConstructorUsed() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-07-23 17:10:29 UTC (rev 3161) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-07-23 17:11:49 UTC (rev 3162) @@ -28,7 +28,8 @@ private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {}; - @Test + @Test(groups="broken") + // Needs @Alternatives @SpecAssertions({ @SpecAssertion(section = "4.3", id = "ca") }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-07-23 17:10:29 UTC (rev 3161) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-07-23 17:11:49 UTC (rev 3162) @@ -20,12 +20,15 @@ public class ResolutionByNameTest extends AbstractJSR299Test { - @Test(groups = "ri-broken") - @SpecAssertion(section="5.8", id="c") + @Test + @SpecAssertions({ + @SpecAssertion(section="5.8", id="c"), + @SpecAssertion(section="2.5", id="a") + }) public void testQualifiedNameLookup() { - assert getCurrentConfiguration().getEl().evaluateValueExpression("#{javax.context.conversation}", Conversation.class) != null; - assert getCurrentConfiguration().getEl().evaluateValueExpression("#{javax.context.conversation}", Conversation.class) instanceof Conversation; + assert getCurrentConfiguration().getEl().evaluateValueExpression("#{javax.enterprise.context.conversation}", Conversation.class) != null; + assert getCurrentConfiguration().getEl().evaluateValueExpression("#{javax.enterprise.context.conversation}", Conversation.class) instanceof Conversation; } @Test(groups = "beanLifecycle")