[webbeans-commits] Webbeans SVN: r1641 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/implementation/initializer and 12 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Sun Feb 22 14:14:51 EST 2009
Author: pete.muir at jboss.org
Date: 2009-02-22 14:14:50 -0500 (Sun, 22 Feb 2009)
New Revision: 1641
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/StaticInitializerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Minor improvements to mappings
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -20,7 +20,7 @@
public class TooManyDeployElementsTest
{
- @Test(groups="underInvestigation") @SpecAssertion(section = "2.5.5", id = "e")
+ @Test(groups="underInvestigation") @SpecAssertion(section = "2.5.6", id = "e")
public void testTooManyDeployElements()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/EjbInitializerMethodTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -1,6 +1,7 @@
package org.jboss.jsr299.tck.unit.implementation.initializer;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.jboss.jsr299.tck.impl.packaging.IntegrationTest;
@@ -15,7 +16,10 @@
{
@Test(groups = { "initializerMethod", "ejb3" })
- @SpecAssertion(section = "3.9", id = "c")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.9", id = "e"),
+ @SpecAssertion(section = "3.9", id = "c")
+ })
public void testInitializerMethodNotABusinessMethod()
{
AndalusianChicken.nonBusinessMethodCalled = false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -55,9 +55,12 @@
}
@Test(groups = { "initializerMethod" })
- @SpecAssertions( {
+ @SpecAssertions({
@SpecAssertion(section = "3.9", id = "g"),
- @SpecAssertion(section = "5.3", id = "b") })
+ @SpecAssertion(section = "5.3", id = "b"),
+ @SpecAssertion(section = "3.9.1", id = "a"),
+ @SpecAssertion(section = "3.9.3", id = "a")
+ })
public void testMultipleInitializerMethodsAreCalled()
{
ChickenHutch chickenHutch = getCurrentManager().getInstanceByType(ChickenHutch.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/StaticInitializerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -14,7 +14,7 @@
{
@Test(groups = "initializerMethod")
- @SpecAssertion(section = "3.9", id = "a")
+ @SpecAssertion(section = "3.9", id = "aa")
public void testStaticInitializerMethodNotAllowed()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -93,7 +93,11 @@
}
@Test(groups = { "producerField", "deployment" })
- @SpecAssertion(section = "3.5", id = "j")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.5", id = "j"),
+ @SpecAssertion(section = "3.5", id = "c"),
+ @SpecAssertion(section = "3.5.2", id ="a")
+ })
public void testBeanDeclaresMultipleProducerFields()
{
deployBeans(OtherSpiderProducer.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -35,7 +35,10 @@
}
@Test(groups = { "producerField" })
- @SpecAssertion(section = "6.8", id = "h")
+ @SpecAssertions({
+ @SpecAssertion(section = "6.8", id = "h"),
+ @SpecAssertion(section = "3.5", id = "b")
+ })
public void testProducerStaticFieldBean()
{
deployBeans(StaticTarantulaProducer.class, TarantulaConsumer.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -164,7 +164,7 @@
@SpecAssertions({
@SpecAssertion(section = "3.4.2", id = "bb"),
@SpecAssertion(section = "2.6.1", id = "d"),
- @SpecAssertion(section = "2.4.12", id = "a")
+ @SpecAssertion(section = "3.4.12", id = "a")
})
public void testDefaultNamedMethod() throws Exception
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -61,17 +61,19 @@
}
@Test(groups = { "producerMethod", "broken" })
- @SpecAssertions( { @SpecAssertion(section = "3.4", id = "e"),
- @SpecAssertion(section = "B.1", id = "unknown"),
- @SpecAssertion(section = "7.3", id = "unknown") })
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4", id = "e"),
+ @SpecAssertion(section = "7.3", id = "unknown")
+ })
public void testProducerMethodReturnsNullIsDependent() throws Exception
{
assert getCurrentManager().getInstanceByType(Spider.class, new AnnotationLiteral<Null>() {}) == null;
}
@Test(groups = "producerMethod", expectedExceptions = IllegalProductException.class)
- @SpecAssertions( { @SpecAssertion(section = "3.4", id = "f"),
- @SpecAssertion(section = "B.1", id = "unknown") })
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4", id = "f")
+ })
public void testProducerMethodReturnsNullIsNotDependent() throws Exception
{
assert getCurrentManager().resolveByType(Spider.class, new AnnotationLiteral<Request>() {}).size() == 1;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -118,7 +118,10 @@
}
@Test(groups = "injection")
- @SpecAssertion(section = "6.4", id = "e")
+ @SpecAssertions({
+ @SpecAssertion(section = "6.4", id = "e"),
+ @SpecAssertion(section = "3.8.1", id = "a")
+ })
public void testCreateInjectsFieldsDeclaredInJava()
{
assert getCurrentManager().resolveByType(TunaFarm.class).size() == 1;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -1,6 +1,7 @@
package org.jboss.jsr299.tck.unit.lookup.byname;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.testng.annotations.Test;
@@ -18,4 +19,27 @@
{
assert false;
}
+
+
+ @Test(groups = { "resolution", "el" })
+ @SpecAssertions({
+ @SpecAssertion(section = "5.10", id = "d"),
+ @SpecAssertion(section = "5.10", id = "c")
+ })
+ public void testGetInstanceByName() throws Exception
+ {
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ assert getCurrentManager().resolveByName("nonexistant").size() == 0;
+ assert getCurrentManager().getInstanceByName("nonexistant") == null;
+ assert getCurrentManager().getInstanceByName("salmon") instanceof Salmon;
+ }
+
+ }.run();
+ }
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -1,7 +1,6 @@
package org.jboss.jsr299.tck.unit.lookup.byname;
import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
@@ -17,41 +16,7 @@
public class ResolutionByNameTest extends AbstractDeclarativeTest
{
- @Test(groups = { "resolution", "el" })
- @SpecAssertions({
- @SpecAssertion(section = "5.10", id = "d"),
- @SpecAssertion(section = "5.10", id = "c")
- })
- public void testELResolver() throws Exception
- {
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- assert getCurrentManager().resolveByName("nonexistant").size() == 0;
- assert getCurrentManager().getInstanceByName("nonexistant") == null;
- assert getCurrentManager().getInstanceByName("salmon") instanceof Salmon;
- }
-
- }.run();
- }
-
- /**
- * The following algorithm must be used by the container when resolving a
- * bean by name:
- *
- * The container identifies the set of matching enabled beans which have
- * the given name.
- *
- * Next, the container examines the deployment types of the matching beans,
- * as defined in Section 2.5.7, "Deployment type precedence", and returns the
- * set of beans with the highest precedence deployment type that occurs in
- * the set. If there are no matching beans, an empty set is returned.
- * @throws Exception
- */
- @Test(groups = { "resolution", "el" })
+ @Test(groups = { "resolution" })
@SpecAssertion(section = "5.11", id = "c")
public void testOnlyHighestPrecedenceResolved() throws Exception
{
@@ -63,7 +28,8 @@
@Override
protected void execute() throws Exception
{
- assert getCurrentManager().getInstanceByName("whitefish") instanceof Plaice;
+ assert getCurrentManager().resolveByName("whitefish").size() == 1;
+ assert getCurrentManager().resolveByName("whitefish").iterator().next().getTypes().contains(Plaice.class);
}
}.run();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -57,7 +57,7 @@
}
@Test
- @SpecAssertion(section = "review", id = "review")
+ @SpecAssertion(section = "5.4.2", id = "a")
public void testClientProxyInvocation()
{
Bean<TunedTuna> tunaBean = getCurrentManager().resolveByType(TunedTuna.class).iterator().next();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -9,14 +9,14 @@
import org.testng.annotations.Test;
@Artifact
-// TODO This test can be fixed by specifying the exception that is expected as below
@ExpectedDeploymentException(UnproxyableDependencyException.class)
public class UnproxyableTest extends AbstractDeclarativeTest
{
@Test
- @SpecAssertion(section = "5.4.1", id = "e")
+ @SpecAssertion(section = "5.4.1", id = "ba")
public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean()
{
+ assert false;
}
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.unit.lookup.injection;
+
+import javax.inject.Current;
+
+class BeanWithFinalBoundField_Broken
+{
+
+ @Current public final Tuna tuna = null;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithFinalBoundField_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.unit.lookup.injection;
+
+import javax.inject.Current;
+
+class BeanWithStaticBoundField_Broken
+{
+
+ @Current public static Tuna tuna;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/BeanWithStaticBoundField_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -99,5 +99,22 @@
{
assert false;
}
+
+ @Test(groups = {"injection", "underInvestigation"})
+ @SpecAssertion(section = "3.8", id = "aa")
+ public void testInjectingStaticField()
+ {
+ assert getCurrentManager().resolveByType(BeanWithStaticBoundField_Broken.class).size() == 1;
+ assert getCurrentManager().getInstanceByType(BeanWithStaticBoundField_Broken.class).tuna == null;
+ }
+
+ @Test(groups = {"injection", "underInvestigation"})
+ @SpecAssertion(section = "3.8", id = "ab")
+ public void testInjectingFinalField()
+ {
+ assert getCurrentManager().resolveByType(BeanWithFinalBoundField_Broken.class).size() == 1;
+ assert getCurrentManager().getInstanceByType(BeanWithFinalBoundField_Broken.class).tuna == null;
+ }
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -274,7 +274,10 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6.1", id = "zc")
+ @SpecAssertions({
+ @SpecAssertion(section = "5.6.1", id = "zc"),
+ @SpecAssertion(section = "5.6.1", id = "ab")
+ })
public void testApiTypeInjectionPoint()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -295,7 +298,10 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6.1", id = "zd")
+ @SpecAssertions({
+ @SpecAssertion(section = "5.6.1", id = "zd"),
+ @SpecAssertion(section = "5.6.1", id = "a")
+ })
public void testCurrentBinding()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-02-22 19:14:50 UTC (rev 1641)
@@ -69,7 +69,10 @@
}
@Test(groups="resolution")
- @SpecAssertion(section="5.9", id = "a")
+ @SpecAssertions({
+ @SpecAssertion(section="5.9", id = "a"),
+ @SpecAssertion(section = "5.9", id ="fa")
+ })
public void testResolveByType() throws Exception
{
@@ -102,9 +105,10 @@
@Test(groups="injection")
@SpecAssertions({
- @SpecAssertion(section = "2.3.5", id = "b"),
- @SpecAssertion(section = "5.9", id = "gb"),
- @SpecAssertion(section = "2.3.3", id = "d")
+ @SpecAssertion(section = "2.3.5", id = "b" ),
+ @SpecAssertion(section = "5.9", id = "gb"),
+ @SpecAssertion(section = "2.3.3", id = "d" ),
+ @SpecAssertion(section = "5.9.2", id = "a" )
})
public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean()
{
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-22 17:14:04 UTC (rev 1640)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-22 19:14:50 UTC (rev 1641)
@@ -1556,8 +1556,9 @@
<text>If a producer field return type contains a type variable, a DefinitionException is thrown by the container at deployment time</text>
</assertion>
- <assertion id="i">
+ <assertion id="i" testable="false">
<text>The application may access producer fields directly. However, if the application accesses a producer field directly, the returned object is not bound to any context; and its lifecycle is not managed by the container</text>
+ <note>This is a statement of intent</note>
</assertion>
<assertion id="j">
@@ -1678,8 +1679,9 @@
<text>A resource may not declare a bean name</text>
</assertion>
- <assertion id="m">
+ <assertion id="m" testable="false">
<text>Resources are always declared using XML</text>
+ <note>This is a statement of intent</note>
</assertion>
</section>
@@ -1931,16 +1933,14 @@
<section id="3.8" title="Injected fields">
- <assertion id="a">
- <text>An injected field is a non-static, non-final field of a bean class.</text>
+ <assertion id="aa">
+ <text>An injected field is a non-static~, non-final~ field of a bean class.</text>
</assertion>
- <assertion id="a">
- <text>An injected field is a non-static, non-final field of a bean class.</text>
+ <assertion id="aa">
+ <text>An injected field is a ~non-static, ~non-final field of a bean class.</text>
</assertion>
-
-
<assertion id="b">
<text>An injected field is a non-static, non-final field of a servlet.</text>
<note>Test needs to check that static and final fields aren't injected and also that no exception is thrown when you have them</note>
@@ -2006,11 +2006,11 @@
</section>
<section id="3.9" title="Initializer methods">
- <assertion id="a">
+ <assertion id="aa">
<text>An initializer method is a non-static method of a bean class.</text>
</assertion>
- <assertion id="a">
+ <assertion id="ab">
<text>An initializer method is a non-static method of a servlet.</text>
</assertion>
@@ -2038,8 +2038,9 @@
<text>A bean class may declare multiple (or zero) initializer methods</text>
</assertion>
- <assertion id="h">
+ <assertion id="h" testable="false">
<text>The application may call initializer methods directly, but then no parameters will be passed to the method by the container</text>
+ <note>This is a statement of intent</note>
</assertion>
<assertion id="i">
@@ -2126,8 +2127,9 @@
</section>
<section id="3.11" title="The Bean object for a bean">
- <assertion id="a">
+ <assertion id="a" testable="false">
<text>Concrete subclasses of Bean must implement the operations defined by the Contextual interface defined in Section 6.1, "The Contextual interface".</text>
+ <note>This is asserted by the JLS</note>
</assertion>
<assertion id="b">
@@ -2385,6 +2387,7 @@
<assertion id="b">
<text>The container is required to support circularities in the bean dependency graph</text>
+ <note>The RI has unit tests for this atm</note>
</assertion>
</section>
@@ -2392,6 +2395,7 @@
<assertion id="a">
<text>The container must validate all injection points of all enabled beans at deployment time to ensure that there are no unsatisfied or ambiguous dependencies. If an unsatisfied or ambiguous dependency exists, an UnsatisfiedDependencyException
or AmbiguousDependencyException is thrown by the container at deployment time, as defined in Section 5.7.1, "Resolving dependencies".</text>
+ <note>These need expanding out - one for each assertion that results in an exception in 5.7.1</note>
</assertion>
</section>
@@ -2399,10 +2403,10 @@
<assertion id="aa">
- <text>If necessary, the container performs boxing when it injects a value to a field or parameter of primitive or wrapper type.</text>
+ <text>If necessary, the container performs boxing ~or unboxing~ when it injects a value to a field or parameter of primitive or wrapper type.</text>
</assertion>
<assertion id="ab">
- <text>If necessary, the container performs boxing or unboxing when it injects a value to a field or parameter of primitive or wrapper type.</text>
+ <text>If necessary, the container performs ~boxing or~ unboxing when it injects a value to a field or parameter of primitive or wrapper type.</text>
</assertion>
<assertion id="a">
@@ -2444,24 +2448,24 @@
<section id="5.4.1" title="Unproxyable bean types">
<assertion id="a">
- <text>Classes without a non-private constructor with no parameters cannot be proxied by the container</text>
+ <text>Classes without a non-private constructor with no parameters cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time.</text>
</assertion>
- <assertion id="b">
- <text>Classes which are declared final or have final methods cannot be proxied by the container</text>
+ <assertion id="ba">
+ <text>Classes which are declared final ~or have final methods~ cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time</text>
</assertion>
+ <assertion id="bb">
+ <text>Classes which ~are declared final or ~have final methods cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time</text>
+ </assertion>
+
<assertion id="c">
- <text>Primitive types cannot be proxied by the container</text>
+ <text>Primitive types cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time</text>
</assertion>
<assertion id="d">
- <text>Array types cannot be proxied by the container</text>
+ <text>Array types cannot be proxied by the container. If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time</text>
</assertion>
-
- <assertion id="e">
- <text>If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope, an UnproxyableDependencyException is thrown by the container at deployment time</text>
- </assertion>
</section>
<section id="5.4.2" title="Client proxy invocation">
@@ -2687,8 +2691,9 @@
<text>If the Bean instance represents a bean with a pseudo-scope, as defined in Section 8.2, "Normal scopes and pseudo-scopes", Manager.getInstance() must obtain the context object by calling Manager.getContext(), passing the bean scope, then obtain an instance of the bean by calling Context.get(), passing the Bean instance representing the bean and an instance of CreationalContext</text>
</assertion>
- <assertion id="g">
+ <assertion id="g" testable="false">
<text>The Manager.getInstanceByType() methods obtain a contextual instance of a bean</text>
+ <note>A statement of intent</note>
</assertion>
<assertion id="h">
@@ -2937,13 +2942,8 @@
<text>The Manager.getInstanceByName() method must throw an AmbiguousDependencyException if Manager.resolveByName() returned more than one bean</text>
</assertion>
- <assertion id="e">
- <text>The Manager.getInstanceByName() method must obtain an instance of the bean by calling Manager.getInstance(), passing the Bean instance representing the bean if exactly one bean was returned by Manager.resolveByName()</text>
- </assertion>
-
<assertion id="f">
- <text>For each distinct name that appears in the EL expression, getInstanceByName() must be called at most once</text>
- <note>This is surely part of e?!</note>
+ <text>The Manager.getInstanceByName() method must obtain an instance of the bean by calling Manager.getInstance(), passing the Bean instance representing the bean if exactly one bean was returned by Manager.resolveByName(). For each distinct name that appears in the EL expression, getInstanceByName() must be called at most once</text>
</assertion>
<assertion id="g">
More information about the weld-commits
mailing list