10:09 a.m.
Author: pete.muir(a)jboss.org
Date: 2009-02-20 11:09:48 -0500 (Fri, 20 Feb 2009)
New Revision: 1615
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/RemoveMethodTests.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.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/method/DisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.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/ResolutionByTypeTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Atach lots more assertions
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/RemoveMethodTests.java
===================================================================
---
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/RemoveMethodTests.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/RemoveMethodTests.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -8,17 +8,6 @@
/**
* If the application directly calls an EJB remove method of an instance of a
- * session bean that is a stateful session bean and declares any scope other
- * than @Dependent, an UnsupportedOperationException is thrown.
- */
- @Test(groups = { "enterprisebean", "removemethod",
"lifecycle", "stub" })
- public void
testApplicationCalledRemoveMethodOfStatefulSessionBeanWithNonDependentScopeFails()
- {
- assert false;
- }
-
- /**
- * If the application directly calls an EJB remove method of an instance of a
* session bean that is a stateful session bean and has scope @Dependent then
* no parameters are passed to the method by the container.
*/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.integration.implementation.enterprise;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
@@ -27,7 +27,7 @@
* bean proxy, as defined in Section 3.3.9, "Session bean proxies".
*/
@Test(groups = { "enterpriseBeans", "lifecycle",
"integration", "stub" })
- @SpecAssertion(section = "6.5", id = "unknown")
+ @SpecAssertion(section = "3.3.8", id = "a")
public void testProxyCreated()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -46,7 +46,11 @@
}
@Test
- @SpecAssertion(section = "2", id = "c")
+ @SpecAssertions({
+ @SpecAssertion(section = "2", id = "c"),
+ @SpecAssertion(section = "2.4", id = "a"),
+ @SpecAssertion(section = "3.2.3", id = "ba")
+ })
public void testHasScopeType()
{
assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1;
@@ -54,7 +58,11 @@
}
@Test
- @SpecAssertion(section = "2", id = "d")
+ @SpecAssertions({
+ @SpecAssertion(section = "2", id = "d"),
+ @SpecAssertion(section = "2.5.3", id = "a"),
+ @SpecAssertion(section = "3.2.3", id = "bc")
+ })
public void testHasDeploymentType()
{
assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1;
@@ -79,7 +87,8 @@
@SpecAssertion(section = "2.2", id = "a"),
@SpecAssertion(section = "2.2", id = "d"),
@SpecAssertion(section = "2.2", id = "e"),
- @SpecAssertion(section = "2.2", id = "k")
+ @SpecAssertion(section = "2.2", id = "k"),
+ @SpecAssertion(section = "2.2", id = "l")
})
public void testBeanTypes()
{
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -41,7 +41,7 @@
}
@Test(groups = { "annotationDefinition", "underInvestigation" })
- @SpecAssertion(section = "2.3.2", id = "a")
+ @SpecAssertion(section = "2.3.2", id = "aa")
public void testBindingHasCorrectTarget()
{
// TODO This is only a definition without any real assertion about a given
@@ -50,16 +50,6 @@
assert false;
}
- @Test(groups = { "annotationDefinition", "underInvestigation" })
- @SpecAssertion(section = "2.3.2", id = "a")
- public void testBindingHasCorrectRetention()
- {
- // TODO This is only a definition without any real assertion about a given
- // binding type
- // If there are many binding types, how do we find them?
- assert false;
- }
-
@Test(groups = { "annotationDefinition" })
@SpecAssertion(section = "2.3.2", id = "b")
public void testBindingDeclaresBindingAnnotation()
@@ -77,7 +67,10 @@
}
@Test
- @SpecAssertion(section = "2.3.3", id = "b")
+ @SpecAssertions({
+ @SpecAssertion(section = "2.3.3", id = "b"),
+ @SpecAssertion(section = "3.2.3", id = "be")
+ })
public void testMultipleBindings()
{
Bean<?> model = getCurrentManager().resolveByType(Cod.class, new
ChunkyBinding(true), new WhitefishBinding()).iterator().next();
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -57,17 +57,6 @@
* TODO This text is not really a testable assertion
*/
@Test(groups = { "underInvestigation", "annotationDefinition",
"deploymentType" })
- @SpecAssertion(section = "2.5.2", id = "b")
- public void testDeploymentTypeHasCorrectRetention()
- {
- assert false;
- }
-
- /**
- *
- * TODO This text is not really a testable assertion
- */
- @Test(groups = { "underInvestigation", "annotationDefinition",
"deploymentType" })
@SpecAssertion(section = "2.5.2", id = "c")
public void testDeploymentTypeDeclaresDeploymentTypeAnnotation()
{
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/custom/CustomDeploymentTypeTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -22,7 +22,8 @@
@SuppressWarnings("unchecked")
@Test
@SpecAssertions({
- @SpecAssertion(section = "2.5.6", id = "b")
+ @SpecAssertion(section = "2.5.6", id = "b"),
+ @SpecAssertion(section = "2.5.2", id = "d")
})
public void testCustomDeploymentTypes()
{
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -34,7 +34,12 @@
assert false;
}
- @Test @SpecAssertion(section="2.6.1", id = "a")
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section="2.6.1", id = "a"),
+ @SpecAssertion(section="2", id="e"),
+ @SpecAssertion(section = "3.2.3", id = "bb")
+ })
public void testNonDefaultNamed()
{
Bean<Moose> moose = createSimpleBean(Moose.class);
@@ -79,7 +84,8 @@
@Test
@SpecAssertions({
@SpecAssertion(section= "2.6.3", id = "a"),
- @SpecAssertion(section = "3.2.8", id = "a")
+ @SpecAssertion(section = "3.2.8", id = "a"),
+ @SpecAssertion(section = "2.6.1", id = "d")
})
public void testDefaultNamed()
{
@@ -112,7 +118,8 @@
@Test
@SpecAssertions({
@SpecAssertion(section = "2.6.3", id = "c"),
- @SpecAssertion(section = "2.7", id = "a")
+ @SpecAssertion(section = "2.7", id = "a"),
+ @SpecAssertion(section = "2.7.1.3", id = "b")
})
public void testSterotypeDefaultsName()
{
@@ -120,7 +127,11 @@
assert model.getName().equals("redSnapper");
}
- @Test @SpecAssertion(section="2.6.4", id = "a")
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section="2.6.4", id = "a"),
+ @SpecAssertion(section="2", id="e")
+ })
public void testNotNamedInJava()
{
Bean<SeaBass> model = createSimpleBean(SeaBass.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -27,23 +27,13 @@
}
@Test(groups={"underInvestigation", "annotationDefinition"})
- @SpecAssertion(section="2.4.2", id = "a")
+ @SpecAssertion(section="2.4.2", id = "aa")
public void testScopeTypeHasCorrectTarget()
{
assert false;
}
/**
- * TODO This is not really a testable assertion
- */
- @Test(groups={"underInvestigation", "annotationDefinition"})
- @SpecAssertion(section="2.4.2", id = "a")
- public void testScopeTypeHasCorrectRetention()
- {
- assert false;
- }
-
- /**
* TODO If a scope has no scope type annotation, then it is not a scope and cannot be
tested
*/
@Test(groups={"underInvestigation", "annotationDefinition"})
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -10,9 +10,9 @@
import javax.inject.Production;
import javax.inject.manager.Bean;
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.testng.annotations.Test;
/**
@@ -37,24 +37,13 @@
* here
*/
@Test(groups = { "underInvestigation", "annotationDefinition" })
- @SpecAssertion(section = "2.7.1", id = "a")
+ @SpecAssertion(section = "2.7.1", id = "aa")
public void testHasCorrectTarget()
{
assert false;
}
/**
- * TODO Difficult to test since all user defined stereotypes are not known
- * here
- */
- @Test(groups = { "underInvestigation", "annotationDefinition" },
expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "2.7.1", id = "a")
- public void testHasCorrectRetention()
- {
- assert false;
- }
-
- /**
* TODO If the stereotype does not have a stereotype annotation, then it
* isn't one and is difficult to test
*/
@@ -66,7 +55,10 @@
}
@Test
- @SpecAssertion(section = "2.7.1.1", id = "a")
+ @SpecAssertions({
+ @SpecAssertion(section = "2.7.1.1", id = "a"),
+ @SpecAssertion(section = "2.4.3", id = "c")
+ })
public void testStereotypeWithScopeType()
{
Bean<Moose> moose = createSimpleBean(Moose.class);
@@ -74,7 +66,10 @@
}
@Test
- @SpecAssertion(section = "2.7.1.1", id = "a")
+ @SpecAssertions({
+ @SpecAssertion(section = "2.7.1.1", id = "a"),
+ @SpecAssertion(section="2.4.5", id = "b")
+ })
public void testStereotypeWithoutScopeType()
{
Bean<Reindeer> reindeer = createSimpleBean(Reindeer.class);
@@ -112,7 +107,10 @@
}
@Test(expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "2.7.1.3", id = "a")
+ @SpecAssertions({
+ @SpecAssertion(section = "2.7.1.3", id = "a"),
+ @SpecAssertion(section = "2.6.3", id = "e")
+ })
public void testStereotypeWithNonEmptyNamed()
{
deployBeans(FallowDeer_Broken.class);
@@ -126,8 +124,11 @@
}
@Test
- @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"),
- @SpecAssertion(section = "2.7.4", id = "c") })
+ @SpecAssertions({
+ @SpecAssertion(section = "2.7.2", id = "e"),
+ @SpecAssertion(section = "2.7.4", id = "c"),
+ @SpecAssertion(section = "2.7", id = "d")
+ })
public void testMultipleStereotypes()
{
Bean<HighlandCow> highlandCow = createSimpleBean(HighlandCow.class);
Added:
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
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -0,0 +1,29 @@
+package org.jboss.jsr299.tck.unit.definition.stereotype.tooManyDeployElements;
+
+import javax.inject.DeploymentException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.jboss.jsr299.tck.impl.packaging.IntegrationTest;
+import org.jboss.jsr299.tck.impl.packaging.Resource;
+import org.jboss.jsr299.tck.impl.packaging.Resources;
+import org.testng.annotations.Test;
+
+@Artifact
+@Resources({
+ @Resource(destination="META-INF/beans.xml",
source="default-beans.xml"),
+ @Resource(destination="WEB-INF/beans.xml",
source="default-beans.xml")
+})
+(a)ExpectedDeploymentException(DeploymentException.class)
+@IntegrationTest
+public class TooManyDeployElementsTest
+{
+
+ @Test @SpecAssertion(section = "2.5.5", id = "e")
+ public void testTooManyDeployElements()
+ {
+
+ }
+
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/tooManyDeployElements/TooManyDeployElementsTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -3,6 +3,7 @@
import javax.inject.DefinitionException;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.testng.annotations.Test;
@@ -153,7 +154,10 @@
}
@Test(groups = "enterpriseBeans")
- @SpecAssertion(section = "3.3.3", id = "c")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.3.3", id = "c"),
+ @SpecAssertion(section = "2.2", id = "l")
+ })
public void testObjectIsInAPITypes()
{
assert createEnterpriseBean(Laika.class).getTypes().contains(Object.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -5,24 +5,14 @@
import org.testng.annotations.Test;
/**
- * Sections
*
- * 3.3.5. Web Bean remove methods 3.3.5.1. Declaring a Web Bean remove method
- * using annotations. 3.3.5.2. Declaring a Web Bean remove method using XML
- * 3.3.5.3. Remove method parameters
- *
* @author Nicklas Karlsson
*
* Spec version: PRD2
*/
public class EnterpriseBeanRemoveMethodTest extends AbstractDeclarativeTest
{
-
- /**
- * If the scope is @Dependent, the application may call any EJB remove method
- * of an instance of the enterprise Web Bean, but then no parameters will be
- * passed to the method by the Web Bean manager
- */
+
@Test(groups = { "enterpriseBeans", "removeMethod",
"lifecycle", "stub" })
@SpecAssertion(section = "3.3.1", id = "da")
public void
applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed()
@@ -30,11 +20,6 @@
assert false;
}
- /**
- * If the application directly calls an EJB remove method of an instance of
- * an enterprise Web Bean that is a stateful session bean and declares any
- * scope other than @Dependent, an UnsupportedOperationException is thrown.
- */
@Test(groups = { "enterpriseBeans", "removeMethod",
"lifecycle", "stub" }, expectedExceptions =
UnsupportedOperationException.class)
@SpecAssertion(section = "3.3.1", id = "c")
public void
applicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean()
@@ -42,17 +27,18 @@
assert false;
}
- /**
- * If the application directly calls an EJB remove method of an instance of
- * an enterprise Web Bean that is a stateful session bean and has scope
- * @Dependent, the Web Bean manager ignores the instance when instead of
- * destroying it
- */
@Test(groups = { "enterpriseBeans", "removeMethod",
"lifecycle", "stub" })
@SpecAssertion(section = "3.3.1", id = "db")
public void
applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButInstanceIsNotDestroyed()
{
assert false;
}
+
+ @Test(groups = { "enterprisebean", "removemethod",
"lifecycle", "stub" })
+ @SpecAssertion(section = "3.3.1", id = "b")
+ public void
testApplicationCalledRemoveMethodOfStatefulSessionBeanWithNonDependentScopeFails()
+ {
+ assert false;
+ }
}
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -153,7 +153,7 @@
assert false;
}
- @Test @SpecAssertion(section="3.3.1", id = "a")
+ @Test @SpecAssertion(section="3.3.6", id = "aa")
public void testForEachEnterpriseBeanANewBeanExists()
{
deployBeans(Order.class, Lion.class);
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-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -171,7 +171,10 @@
}
@Test(groups = "producerField")
- @SpecAssertion(section = "3.5.2", id = "f")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.5.2", id = "f"),
+ @SpecAssertion(section="2.3.3", id="c")
+ })
public void testBindingType()
{
deployBeans(TameTarantulaProducer.class);
@@ -207,7 +210,10 @@
}
@Test(groups = "producerField")
- @SpecAssertion(section = "3.5.2", id = "c")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.5.2", id = "c"),
+ @SpecAssertion(section="2.6.1", id = "d")
+ })
public void testNamedField()
{
deployBeans(BlackWidowProducer.class);
@@ -222,7 +228,8 @@
@Test(groups = { "producerField" })
@SpecAssertions({
@SpecAssertion(section = "2.6.3", id = "b"),
- @SpecAssertion(section = "3.5.4", id = "a")
+ @SpecAssertion(section = "3.5.4", id = "a"),
+ @SpecAssertion(section = "2.6.1", id = "d")
})
public void testDefaultNamedField()
{
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -4,6 +4,7 @@
import javax.inject.UnsatisfiedDependencyException;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.testng.annotations.Test;
/**
@@ -19,7 +20,11 @@
* class.
*/
@Test(groups = { "stub", "disposalMethod" })
- @SpecAssertion(section = "3.4.6", id = "a")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4.6", id = "a"),
+ @SpecAssertion(section = "3.4.6", id = "c"),
+ @SpecAssertion(section = "3.4.6", id = "e")
+ })
public void testDisposalMethodCanBeOfSimpleOrSessionBean()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -70,7 +70,7 @@
}
@Test(groups = "producerMethod", expectedExceptions =
DefinitionException.class)
- @SpecAssertion(section = "3.4", id = "g")
+ @SpecAssertion(section = "3.4", id = "i")
public void testParameterizedReturnTypeWithTypeParameter() throws Exception
{
Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class);
@@ -93,7 +93,10 @@
}
@Test(groups = "producerMethod")
- @SpecAssertion(section = "3.4.1", id = "c")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4.1", id = "c"),
+ @SpecAssertion(section="2.2", id = "l")
+ })
public void testApiTypeForClassReturn() throws Exception
{
Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class);
@@ -175,7 +178,10 @@
}
@Test(groups = "producerMethod")
- @SpecAssertion(section = "3.4.2", id = "bc")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4.2", id = "bc"),
+ @SpecAssertion(section = "2.5.3", id = "b")
+ })
public void testDeploymentType() throws Exception
{
Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class);
@@ -186,7 +192,10 @@
}
@Test(groups = "producerMethod")
- @SpecAssertion(section = "3.4.2", id = "bb")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4.2", id = "bb"),
+ @SpecAssertion(section = "2.6.1", id = "b")
+ })
public void testNamedMethod() throws Exception
{
Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class);
@@ -197,7 +206,11 @@
}
@Test(groups = "producerMethod")
- @SpecAssertion(section = "3.4.2", id = "bb")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4.2", id = "bb"),
+ @SpecAssertion(section = "2.6.1", id = "d"),
+ @SpecAssertion(section = "2.4.12", id = "a")
+ })
public void testDefaultNamedMethod() throws Exception
{
Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class);
@@ -229,9 +242,12 @@
// Review 2.2
@Test(groups = "producerMethod")
- @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "b"),
+ @SpecAssertions({
+ @SpecAssertion(section = "2.7.2", id = "b"),
@SpecAssertion(section = "3.4.2", id = "ba"),
- @SpecAssertion(section = "2.4.5", id = "c") })
+ @SpecAssertion(section = "2.4.5", id = "c"),
+ @SpecAssertion(section = "3.4.2", id = "bd")
+ })
public void testStereotypeSpecifiesScope() throws Exception
{
Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class);
@@ -246,9 +262,11 @@
}
@Test(groups = "producerMethod", expectedExceptions =
DefinitionException.class)
- @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "b"),
+ @SpecAssertions({
+ @SpecAssertion(section = "2.7.2", id = "b"),
@SpecAssertion(section = "3.4.2", id = "bc"),
- @SpecAssertion(section = "2.7.4", id = "b") })
+ @SpecAssertion(section = "2.7.4", id = "b")
+ })
public void testStereotypeEnforcesTypes() throws Exception
{
Bean<SpiderProducer_Broken> bean =
createSimpleBean(SpiderProducer_Broken.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -31,7 +31,11 @@
}
@Test(groups = { "producerMethod", "broken" })
- @SpecAssertion(section = "B.1", id = "unknown")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.4", id = "c"),
+ @SpecAssertion(section = "3.4", id = "k"),
+ @SpecAssertion(section = "3.4.2", id = "a")
+ })
public void testProducerMethodBeanCreate() throws Exception
{
Bean<SpiderProducer> spiderProducer =
createSimpleBean(SpiderProducer.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -32,21 +32,30 @@
// *** BEAN CLASS CHECKS ****//
@Test(expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.2.1", id = "ca")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.2.1", id = "ca"),
+ @SpecAssertion(section = "3.2", id = "ca")
+ })
public void testAbstractClassDeclaredInJavaIsNotAllowed()
{
createSimpleBean(Cow_Broken.class);
}
@Test(groups = "innerClass")
- @SpecAssertion(section = "3.2.1", id = "cc")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.2.1", id = "cc"),
+ @SpecAssertion(section = "3.2.1", id = "ba")
+ })
public void testStaticInnerClassDeclaredInJavaAllowed()
{
createSimpleBean(StaticInnerBean_Broken.class);
}
@Test(expectedExceptions = DefinitionException.class, groups =
"innerClass")
- @SpecAssertion(section = "3.2.1", id = "b")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.2.1", id = "b"),
+ @SpecAssertion(section = "3.2", id = "a")
+ })
public void testNonStaticInnerClassDeclaredInJavaNotAllowed()
{
createSimpleBean(InnerBean_Broken.class);
@@ -54,7 +63,10 @@
@SuppressWarnings("unchecked")
@Test(expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.2.1", id = "a")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.2.1", id = "a"),
+ @SpecAssertion(section = "3.2", id = "b")
+ })
public void testParameterizedClassDeclaredInJavaIsNotAllowed()
{
createSimpleBean(ParameterizedBean_Broken.class);
@@ -167,7 +179,9 @@
@Test
@SpecAssertions({
@SpecAssertion(section = "3.2.5", id = "a"),
- @SpecAssertion(section = "3.2.6.1", id = "b")
+ @SpecAssertion(section = "3.2.6.1", id = "b"),
+ @SpecAssertion(section = "3.1", id = "a"),
+ @SpecAssertion(section = "3.2.3", id = "a")
})
public void testEmptyConstructorUsed()
{
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -81,7 +81,12 @@
}
@Test(groups = "beanLifecycle")
- @SpecAssertion(section = "6.2", id = "unknown")
+ @SpecAssertions({
+ @SpecAssertion(section = "6.2", id = "unknown"),
+ @SpecAssertion(section="2", id="g"),
+ @SpecAssertion(section="2.2", id="f"),
+ @SpecAssertion(section="3.2.6", id="a")
+ })
public void testCreateReturnsInstanceOfBean()
{
Bean<RedSnapper> bean = createSimpleBean(RedSnapper.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -10,9 +10,9 @@
import javax.inject.DefinitionException;
import javax.inject.InconsistentSpecializationException;
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.testng.annotations.Test;
/**
@@ -36,7 +36,7 @@
@Test
@SpecAssertions({
@SpecAssertion(section = "4.3.1", id = "c"),
- @SpecAssertion(section = "3.2.7", id = "a")
+ @SpecAssertion(section = "3.3.7", id = "a")
})
public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
{
@@ -50,7 +50,7 @@
@Test
@SpecAssertions({
@SpecAssertion(section = "4.3.1", id = "d"),
- @SpecAssertion(section = "3.2.7", id = "a")
+ @SpecAssertion(section = "3.3.7", id = "a")
})
public void testSpecializingBeanHasNameOfSpecializedBean()
{
@@ -70,7 +70,7 @@
@Test(groups="broken")
@SpecAssertions({
@SpecAssertion(section = "4.3.1", id = "f"),
- @SpecAssertion(section = "3.2.7", id = "b")
+ @SpecAssertion(section = "3.3.7", id = "b")
})
public void testSpecializedBeanNotInstantiated() throws Exception
{
@@ -121,21 +121,21 @@
}
@Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.2.7", id = "d")
+ @SpecAssertion(section="3.3.7", id = "d")
public void testSpecializingClassDirectlyExtendsSimpleBean()
{
deployBeans(Tractor_Broken.class);
}
@Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.2.7", id = "d")
+ @SpecAssertion(section="3.3.7", id = "d")
public void testSpecializingClassDirectlyExtendsNothing()
{
deployBeans(Cow_Broken.class);
}
@Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.2.7", id = "d")
+ @SpecAssertion(section="3.3.7", id = "d")
public void testSpecializingClassImplementsInterfaceAndExtendsNothing()
{
deployBeans(Donkey_Broken.class);
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-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -31,6 +31,7 @@
import javax.inject.manager.InjectionPoint;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.literals.CurrentBinding;
import org.testng.annotations.Test;
@@ -232,7 +233,10 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6.1", id = "za")
+ @SpecAssertions({
+ @SpecAssertion(section = "5.6.1", id = "za"),
+ @SpecAssertion(section = "2.5.1", id="a")
+ })
public void testStandardDeployment() throws Exception
{
deployBeans();
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-20
13:43:37 UTC (rev 1614)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-20
16:09:48 UTC (rev 1615)
@@ -104,7 +104,8 @@
@Test(groups="injection")
@SpecAssertions({
@SpecAssertion(section = "2.3.5", id = "b"),
- @SpecAssertion(section = "5.9.2", id = "gb")
+ @SpecAssertion(section = "5.9", id = "gb"),
+ @SpecAssertion(section = "2.3.3", id = "d")
})
public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean()
{
@@ -138,8 +139,12 @@
assert getCurrentManager().resolveByType(ScottishFish.class, new
AnnotationLiteral<Whitefish>() {}).contains(soleBean);
}
- @Test(groups="resolution")
- @SpecAssertion(section="5.9", id = "fd")
+ @Test(groups="resolution")
+ @SpecAssertions({
+ @SpecAssertion(section="5.9", id = "fd"),
+ @SpecAssertion(section="2.2", id="bb"),
+ @SpecAssertion(section="2.2", id="ba")
+ })
public void testResolveByTypeWithTypeParameter() throws Exception
{
Bean<ScottishFishFarmer> scottishFishFarmerBean =
createSimpleBean(ScottishFishFarmer.class);
Added:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml
===================================================================
---
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml
(rev 0)
+++
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml 2009-02-20
16:09:48 UTC (rev 1615)
@@ -0,0 +1,6 @@
+<Beans xmlns="urn:java:ee">
+ <Deploy>
+ <Standard />
+ <Production />
+ </Deploy>
+</Beans>
Property changes on:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/defintion/stereotype/tooManyDeployElements/default-beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-20 13:43:37 UTC (rev 1614)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-20 16:09:48 UTC (rev 1615)
@@ -42,10 +42,14 @@
<text>A bean may have multiple bean types</text>
</assertion>
- <assertion id="b">
- <text>A bean type may be a parameterized type with an actual type parameter.
For the purposes of the typesafe resolution algorithm defined in Section 5.9,
"Typesafe resolution algorithm", parameterized bean types are considered
identical by the container only if both the type and the type parameters (if any) are
identical</text>
+ <assertion id="ba">
+ <text>A bean type may be a parameterized type with an actual type
parameter.</text>
</assertion>
+ <assertion id="bb">
+ <text>For the purposes of the typesafe resolution algorithm defined in
Section 5.9, "Typesafe resolution algorithm", parameterized bean types are
considered identical by the container only if both the type and the type parameters (if
any) are identical</text>
+ </assertion>
+
<assertion id="c">
<text>Bean types may not declare a type variable. If the type of an injection
point is a parameterized type with a type variable, a DefinitionException is thrown by the
container at deployment time.</text>
</assertion>
@@ -125,8 +129,9 @@
<text>The @BindingType meta-annotation may be omitted, and the binding type
may be declared in beans.xml</text>
</assertion>
- <assertion id="d">
+ <assertion id="d" testable="false">
<text>A binding type may define annotation members</text>
+ <note>This is true by default in the JLS</note>
</assertion>
</section>
@@ -141,7 +146,7 @@
</assertion>
<assertion id="c">
- <text>A bean's bindings are declared by annotating the field with the
binding types</text>
+ <text>A bean's bindings are declared by annotating the producer field
with the binding types</text>
</assertion>
<assertion id="d">
@@ -208,34 +213,38 @@
<text>All beans have a scope</text>
</assertion>
- <assertion id="b">
+ <assertion id="b" testable="false">
<text>A scope type is represented by an annotation type.</text>
+ <note>This is a statement of intent</note>
</assertion>
- <assertion id="c">
+ <assertion id="c" testable="false">
<text>The set of scope types is extensible</text>
+ <note>This is a statement of intent</note>
</assertion>
</section>
<section id="2.4.1" title="Built-in scope types">
- <assertion id="a">
+ <assertion id="a" testable="false">
<text>The @RequestScoped, @ApplicationScoped and @SessionScoped annotations
defined in Section 8.5, "Context management for built-in scopes" represent the
standard scopes defined by the Java Servlets specification</text>
+ <note>This is a statement of intent</note>
</assertion>
- <assertion id="b">
- <text>The @ConversationScoped annotation represents the conversation scope
-defined in Section 8.5.4, "Conversation context lifecycle".</text>
+ <assertion id="b" testable="false">
+ <text>The @ConversationScoped annotation represents the conversation scope
defined in Section 8.5.4, "Conversation context lifecycle".</text>
+ <note>This is a statement of intent</note>
</assertion>
- <assertion id="c">
+ <assertion id="c" testable="false">
<text>The @Dependent pseudo-scope is for dependent objects, as defined in
Section 8.3, "Dependent pseudo-scope"</text>
+ <note>This is a statement of intent</note>
</assertion>
</section>
<section id="2.4.2" title="Defining new scope types">
<assertion id="aa">
- <text>A scope type is a Java annotation defined as @Target({TYPE, METHOD,
FIELD})~ and @Retention(RUNTIME)Z</text>
+ <text>A scope type is a Java annotation defined as @Target({TYPE, METHOD,
FIELD})~ and @Retention(RUNTIME)~</text>
</assertion>
<assertion id="ab" testable="false">
@@ -302,8 +311,9 @@
</section>
<section id="2.5" title="Deployment types">
- <assertion id="a">
+ <assertion id="a" testable="false">
<text>The set of deployment types is extensible</text>
+ <note>This is a statement of intent</note>
</assertion>
</section>
@@ -311,14 +321,16 @@
<assertion id="a">
<text>All standard beans defined by this specification, and provided by the
container, are defined using the @Standard deployment type</text>
+ <note>This is tested in the test for each bean defined. See 5.6.1.za,
5.7.2.ca, 8.5.4.i</note>
</assertion>
<assertion id="b">
<text>No bean may be declared with the @Standard deployment type unless
explicitly required by this specification</text>
</assertion>
- <assertion id="c">
+ <assertion id="c" testable="false">
<text>Application beans may be defined using the @Production deployment
type</text>
+ <note>This is a statement of intent</note>
</assertion>
</section>
@@ -456,7 +468,7 @@
</assertion>
<assertion id="c">
- <text>To specify the name of a bean, the @javax.annotation.Named annotation
is applied to the field.</text>
+ <text>To specify the name of a bean, the @javax.annotation.Named annotation
is applied to the producer field.</text>
</assertion>
<assertion id="d">
@@ -511,8 +523,9 @@
<text>A stereotype may specify that all beans with the stereotype have
defaulted bean names</text>
</assertion>
- <assertion id="b">
+ <assertion id="b" testable="false">
<text>A bean may declare zero stereotypes</text>
+ <note>I can't see how to test this</note>
</assertion>
<assertion id="c">
@@ -686,8 +699,9 @@
</section>
<section id="2.7.5" title="Built-in stereotypes">
- <assertion id="a">
+ <assertion id="a" testable="false">
<text>The built-in @Model stereotype is intended for use with beans that
define the model layer of an MVC web application architecture such as JSF</text>
+ <note>Tested by API signature test</note>
</assertion>
</section>
@@ -701,7 +715,7 @@
<text>The bean class is a concrete class and is not required to implement any
special interface or extend any special superclass</text>
</assertion>
- <assertion id="b">
+ <assertion id="b" testable="false">
<text>If the application calls a producer method directly, instead of letting
the container call it, the returned object is not a contextual instance and the
capabilities listed in Section 2.1, "Functionality provided by the container to the
bean" will not be available to the returned object.</text>
</assertion>
</section>
@@ -715,10 +729,14 @@
<text>The bean class of a simple bean may not be a parameterized
type</text>
</assertion>
- <assertion id="c">
- <text>The bean class of a simple bean may not be an abstract class, unless
the simple bean is a decorator</text>
+ <assertion id="ca">
+ <text>The bean class of a simple bean may not be an abstract class, ~unless
the simple bean is a decorator~</text>
</assertion>
+ <assertion id="cb">
+ <text>The bean class of a simple bean may not be an abstract class, _unless
the simple bean is a decorator_</text>
+ </assertion>
+
<assertion id="d">
<text>If the bean class of a simple bean is annotated with both the
@Interceptor and @Decorator stereotypes, a DefinitionException is thrown by the container
at deployment time.</text>
</assertion>
@@ -819,10 +837,26 @@
<text>A simple bean with a constructor that takes no parameters does not
require any special annotations</text>
</assertion>
- <assertion id="b">
- <text>A bean class may also specify a scope, name, deployment type,
stereotypes and/or bindings</text>
+ <assertion id="ba">
+ <text>A bean class may also specify a scope~, name, deployment type,
stereotypes and/or bindings~</text>
</assertion>
+ <assertion id="bb">
+ <text>A bean class may also specify a ~scope,~ name~, deployment type,
stereotypes and/or bindings~</text>
+ </assertion>
+
+ <assertion id="bc">
+ <text>A bean class may also specify a ~scope, name, ~deployment type~,
stereotypes and/or bindings~</text>
+ </assertion>
+
+ <assertion id="bd">
+ <text>A bean class may also specify ~a scope, name, deployment type,
~stereotypes~ and/or bindings~</text>
+ </assertion>
+
+ <assertion id="be">
+ <text>A bean class may also specify ~a scope, name, deployment type,
stereotypes and/or~ bindings</text>
+ </assertion>
+
<assertion id="c">
<text>A simple bean may extend another simple bean</text>
</assertion>
@@ -880,7 +914,7 @@
</assertion>
<assertion id="bc">
<text>Every class that satisfies the requirements of Section 3.2.1,
"Which Java classes are beans?" is a bean, with scope, deployment type and
bindings defined using annotations.
-Additionally, for each such simple bean, a second simple bean exists which has the same
defined by annotations</text>
+Additionally, for each such simple bean, a second simple bean exists which has the same
injected fields defined by annotations</text>
</assertion>
<assertion id="c">
<text>Every class that satisfies the requirements of Section 3.2.1,
"Which Java classes are beans?" is a bean, with scope, deployment type and
bindings defined using annotations.
@@ -1007,8 +1041,9 @@
</section>
<section id="3.2.8" title="Default name for a simple bean">
- <assertion id="a">
+ <assertion id="a" testable="false">
<text>The default name for a simple bean is the unqualified class name of the
bean class, after converting the first character to lower case</text>
+ <note>This is a reference to the EJB specification</note>
</assertion>
</section>
@@ -1100,10 +1135,26 @@
<text>A session bean does not require any special annotations</text>
</assertion>
- <assertion id="b">
- <text>A bean class may also specify a scope, name, deployment type,
stereotypes and/or bindings</text>
+ <assertion id="ba">
+ <text>A bean class may also specify a scope~, name, deployment type,
stereotypes and/or bindings~</text>
</assertion>
+ <assertion id="bb">
+ <text>A bean class may also specify a ~scope, ~name~, deployment type,
stereotypes and/or bindings~</text>
+ </assertion>
+
+ <assertion id="bc">
+ <text>A bean class may also specify a ~scope, name, ~deployment type~,
stereotypes and/or bindings~</text>
+ </assertion>
+
+ <assertion id="bd">
+ <text>A bean class may also specify a ~scope, name, deployment type,
~stereotypes ~and/or bindings~</text>
+ </assertion>
+
+ <assertion id="be">
+ <text>A bean class may also specify a ~scope, name, deployment type,
stereotypes and/or~ bindings~</text>
+ </assertion>
+
<assertion id="c">
<text>A session bean class may extend another bean class</text>
</assertion>
@@ -1259,7 +1310,7 @@
<text>If a producer method return type contains a type variable, a
DefinitionException is thrown by the container at deployment time</text>
</assertion>
- <assertion id="j">
+ <assertion id="j" testable="false">
<text>The application may call producer methods directly. However, if the
application calls a producer method directly, no parameters will be passed to the producer
method by the container; the returned object is not bound to any context; and its
lifecycle is not managed by the container</text>
</assertion>