12:42 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-02-19 13:42:22 -0500 (Thu, 19 Feb 2009)
New Revision: 1602
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/type/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.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/defaultDeploymentType/DefaultDeploymentTypeTest.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/implementation/deployment/BeanDeploymentTest.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/NewEnterpriseBeanTest.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/interceptor/InterceptorDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/jms/JmsDefinitionTest.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/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/NewSimpleBeanTest.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/producer/method/ProducerMethodSpecializationTest.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/manager/ManagerTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Map tests which have assertions
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -4,8 +4,8 @@
import javax.inject.IllegalProductException;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
@@ -44,7 +44,7 @@
*/
// TODO requires an EJB instance
@Test(groups = { "contexts", "passivation", "stub",
"integration" })
- @SpecAssertion(section = "8.4", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testStatefulEJBIsSerializedWhenPassivatedByEJBContainer() throws
IOException, ClassNotFoundException
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java 2009-02-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -54,7 +54,7 @@
}
@Test(expectedExceptions = { ContextNotActiveException.class }, groups = {
"manager" })
- @SpecAssertion(section = "8.5", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testGetContextWithNoActiveContextsFails()
{
getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext());
@@ -62,7 +62,7 @@
}
@Test(expectedExceptions = { IllegalArgumentException.class }, groups = {
"manager" })
- @SpecAssertion(section = "8.5", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testGetContextWithTooManyActiveContextsFails()
{
Context firstContext = new DummyContext()
@@ -77,14 +77,14 @@
}
@Test(expectedExceptions = { ContextNotActiveException.class }, groups = {
"manager" })
- @SpecAssertion(section = "8.5", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testGetContextWithNoRegisteredContextsFails()
{
getCurrentManager().getContext(Unregistered.class);
}
@Test(groups = { "manager" })
- @SpecAssertion(section = "8.5", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testGetContextReturnsActiveContext()
{
getCurrentManager().getContext(RequestScoped.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -8,8 +8,8 @@
import javax.context.SessionScoped;
import javax.inject.manager.Bean;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -168,7 +168,7 @@
* thread
*/
@Test(groups = { "contexts", "stub",
"underInvestigation" })
- @SpecAssertion(section = "8.1", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testOnlyOneMappedInstancePerContextualTypePerThread()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -10,8 +10,8 @@
import javax.inject.UnserializableDependencyException;
import javax.inject.manager.Bean;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
@@ -39,14 +39,14 @@
assert !beans.isEmpty();
}
- @Test @SpecAssertion(section="8.4", id = "unknown")
+ @Test @SpecAssertion(section="8.4", id = "ca")
public void testInjectionOfDependentSerializableProductIntoNormalBean()
{
deployBeans(Generator.class, NumberConsumer.class);
getCurrentManager().getInstanceByType(NumberConsumer.class).ping();
}
- @Test @SpecAssertion(section="8.4", id = "outdated")
+ @Test @SpecAssertion(section="8.4", id = "cb")
public void testInjectionOfDependentPrimitiveProductIntoNormalBean()
{
deployBeans(Generator.class, FooConsumer.class);
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -75,7 +75,7 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.2.2", id = "unknown"),
+ @SpecAssertion(section = "3.2.2", id = "a"),
@SpecAssertion(section = "2.2", id = "a"),
@SpecAssertion(section = "2.2", id = "d"),
@SpecAssertion(section = "2.2", id = "e"),
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -206,7 +206,7 @@
}
@Test
- @SpecAssertion(section = "4.1", id = "unknown")
+ @SpecAssertion(section = "4.1", id = "e")
public void testBindingDeclaredInheritedIsInherited() throws Exception
{
Set<? extends Annotation> bindings =
getCurrentManager().resolveByType(BorderCollie.class, new
HairyBinding(false)).iterator().next().getBindings();
@@ -215,7 +215,7 @@
}
@Test
- @SpecAssertion(section = "4.1", id = "unknown")
+ @SpecAssertion(section = "4.1", id = "e")
public void testBindingNotDeclaredInheritedIsNotInherited()
{
Set<? extends Annotation> bindings =
getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getBindings();
@@ -224,7 +224,7 @@
}
@Test
- @SpecAssertion(section = "4.1", id = "unknown")
+ @SpecAssertion(section = "4.1", id = "e")
public void testBindingDeclaredInheritedIsBlockedByIntermediateClass()
{
Set<? extends Annotation> bindings =
getCurrentManager().resolveByType(ClippedBorderCollie.class, new
HairyBinding(true)).iterator().next().getBindings();
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-02-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/defaultDeploymentType/DefaultDeploymentTypeTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -20,7 +20,7 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "2.5.6", id = "unknown")
+ @SpecAssertion(section = "2.5.6", id = "d")
})
public void testDefaultEnabledDeploymentTypes()
{
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -62,26 +62,6 @@
}
@Test(groups={"stub", "webbeansxml"})
- @SpecAssertion(section="2.6.2", id = "unknown")
- public void testXmlNamedOverridesJavaNamed()
- {
- /*Map<Class<? extends Annotation>, Annotation> annotations = new
HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(Named.class, new NamedAnnotationLiteral(){
-
- public String value()
- {
- return "aTrout";
- }
-
- });
- AnnotatedClass<Cod> annotatedItem = new
SimpleAnnotatedClass<Cod>(Cod.class, annotations);*/
- //SimpleBean<Cod> cod = createSimpleBean(Cod.class, annotatedItem, manager);
-
- //assert cod.getName().equals("aTrout");
- assert false;
- }
-
- @Test(groups={"stub", "webbeansxml"})
@SpecAssertions({
@SpecAssertion(section="2.6.2", id = "b"),
@SpecAssertion(section = "2.6.3",id = "b")
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -27,7 +27,7 @@
}
@Test(groups={"underInvestigation", "annotationDefinition"})
- @SpecAssertion(section="2.4.2", id = "unknown")
+ @SpecAssertion(section="2.4.2", id = "a")
public void testScopeTypeHasCorrectTarget()
{
assert false;
@@ -92,7 +92,7 @@
}
@Test(groups={"stub", "webbeansxml"})
- @SpecAssertion(section="2.4.4", id = "review")
+ @SpecAssertion(section="review", id = "review")
public void testScopeMissingInXml()
{
//Map<Class<? extends Annotation>, Annotation> annotations = new
HashMap<Class<? extends Annotation>, Annotation>();
@@ -104,7 +104,7 @@
}
@Test(groups={"stub", "webbeansxml"})
- @SpecAssertion(section="2.4.4", id = "review")
+ @SpecAssertion(section="review", id = "review")
public void testScopeDeclaredInXmlOverridesJava()
{
//Map<Class<? extends Annotation>, Annotation> annotations = new
HashMap<Class<? extends Annotation>, Annotation>();
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/deployment/BeanDeploymentTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/deployment/BeanDeploymentTest.java 2009-02-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/deployment/BeanDeploymentTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -91,7 +91,7 @@
}
@Test(groups={"stub", "specialization"})
- @SpecAssertion(section="3.3.4", id = "review")
+ @SpecAssertion(section="review", id = "review")
public void testOnlySpecializedProducerMethodBeanDeployed()
{
// TODO Placeholder
@@ -99,7 +99,7 @@
}
@Test(groups={"stub", "specialization"})
- @SpecAssertion(section="3.3.4", id = "review")
+ @SpecAssertion(section="review", id = "review")
public void testSpecializedProducerMethodBeanDirectlyOverrides()
{
// TODO Placeholder
@@ -107,7 +107,7 @@
}
@Test(groups={"stub", "specialization"})
- @SpecAssertion(section="3.3.4", id = "review")
+ @SpecAssertion(section="review", id = "review")
public void testSpecializedProducerMethodBeanHasSameBindingAnnotations()
{
// TODO Placeholder
@@ -115,7 +115,7 @@
}
@Test(groups={"stub", "specialization"})
- @SpecAssertion(section="3.3.4", id = "review")
+ @SpecAssertion(section="review", id = "review")
public void testSpecializedProducerMethodBeanHasSameName()
{
// TODO Placeholder
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -72,7 +72,7 @@
}
@Test(groups = { "enterpriseBeans" }, expectedExceptions =
DefinitionException.class)
- @SpecAssertion(section = "3.3", id = "")
+ @SpecAssertion(section = "3.3", id = "d")
public void testSingletonWithSessionScopeFails()
{
deployBeans(IrishTerrier_Broken.class);
@@ -104,7 +104,7 @@
* annotations.
*/
@Test(expectedExceptions = DefinitionException.class, groups = {
"enterpriseBeans", "stub" })
- @SpecAssertion(section = "3.3", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void
testMultipleAnnotationDefinedEnterpriseBeansWithSameImplementationClassFails()
{
// TODO: testable?
@@ -185,7 +185,7 @@
* attribute declares the EJB name of an EJB defined in ejb-jar.xml
*/
@Test(groups = { "enterpriseBeans", "webbeansxml",
"ejbjarxml", "stub" })
- @SpecAssertion(section = "3.3", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testXMLFilesEJBNameUsage()
{
assert false;
@@ -197,7 +197,7 @@
* thrown by the Web Bean manager at initialization time.
*/
@Test(expectedExceptions = DefinitionException.class, groups = {
"enterpriseBeans" })
- @SpecAssertion(section = "3.3", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testMessageDrivenBeansNotOK()
{
deployBeans(Leopard.class);
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -11,8 +11,8 @@
import javax.inject.Standard;
import javax.inject.manager.Bean;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.literals.NewLiteral;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -81,7 +81,7 @@
* is an enterprise Web Bean.
*/
@Test(groups = { "new", "stub", "ejb3" })
- @SpecAssertion(section = "3.3.6", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testNewBeanIsEnterpriseWebBeanIfParameterTypeIsEnterpriseWebBean()
{
assert false;
@@ -174,7 +174,7 @@
* � has no decorators.
*/
@Test(groups = { "new", "broken" })
- @SpecAssertion(section = "3.3.6", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testNewBeanHasNoDecorators()
{
Annotation[] bindingTypes = newEnterpriseBean.getBindings().toArray(new
Annotation[0]);
@@ -190,7 +190,7 @@
* Bean implementation class.
*/
@Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testNewAnnotationMayBeAppliedToField()
{
deployBeans(AnnotatedField.class, WrappedEnterpriseBean.class);
@@ -206,7 +206,7 @@
* Bean implementation class.
*/
@Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testNewAnnotationMayBeAppliedToProducerMethodParameter()
{
deployBeans(AnnotatedProducerParameter.class, WrappedEnterpriseBean.class);
@@ -222,7 +222,7 @@
* Bean implementation class.
*/
@Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testNewAnnotationMayBeAppliedToInitializerMethodParameter()
{
deployBeans(AnnotatedInitializerParameter.class, WrappedEnterpriseBean.class);
@@ -238,7 +238,7 @@
* Bean implementation class.
*/
@Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testNewAnnotationMayBeAppliedToConstructorMethodParameter()
{
deployBeans(AnnotatedConstructorParameter.class, WrappedEnterpriseBean.class);
@@ -253,7 +253,7 @@
* by the container at deployment time.
*/
@Test(groups = { "new" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.3.6", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testNewAnnotationCannotAppearInConjunctionWithOtherBindingType()
{
deployBeans(NewAndOtherBindingType_Broken.class);
@@ -277,7 +277,7 @@
* as a binding type
*/
@Test(groups = { "stub", "new", "webbeansxml" },
expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.3.6", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testNewAnnotationCannotBeExplicitlyDeclared()
{
// This only needs to be tested with XML since the annotation itself
@@ -285,7 +285,7 @@
assert false;
}
- @Test @SpecAssertion(section="3.2.6", id = "review")
+ @Test @SpecAssertion(section="review", id = "review")
public void testForEachEnterpriseBeanANewBeanExists()
{
deployBeans(Order.class, Lion.class);
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -127,7 +127,7 @@
}
@Test(groups = { "stub", "initializerMethod",
"webbeansxml" })
- @SpecAssertion(section = "3.9.2", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testBeanHasAllInitializerMethodsDeclaredInJavaAndXml()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java 2009-02-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -11,13 +11,13 @@
public class InterceptorDefinitionTest
{
- @Test(groups="stub") @SpecAssertion(section="4.2", id =
"unknown")
+ @Test(groups="stub") @SpecAssertion(section="4.2", id =
"c")
public void testNonStaticWithInterceptorBindingInherited()
{
assert false;
}
- @Test(groups="stub") @SpecAssertion(section="4.2", id =
"unknown")
+ @Test(groups="stub") @SpecAssertion(section="4.2", id =
"c")
public void testNonStaticWithInterceptorBindingBlockedByIntermediateClass()
{
assert false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/jms/JmsDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/jms/JmsDefinitionTest.java 2009-02-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/jms/JmsDefinitionTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -1,10 +1,6 @@
package org.jboss.jsr299.tck.unit.implementation.jms;
-import javax.inject.DefinitionException;
-
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.testng.annotations.Test;
/**
*
@@ -14,11 +10,4 @@
public class JmsDefinitionTest extends AbstractDeclarativeTest
{
- @Test(expectedExceptions=DefinitionException.class, groups={"stub",
"jms"})
- @SpecAssertion(section="2.6", id = "unknown")
- public void testJmsEndpointHasName()
- {
- 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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -62,7 +62,7 @@
*/
@Test(groups = { "broken", "producerField",
"enterpriseBeans" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.5", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testProducerFieldIsNotBusinessField() throws Exception
{
deployBeans(VibratingSpiderImpl_Broken.class);
@@ -99,9 +99,10 @@
deployBeans(OtherSpiderProducer.class);
}
+ // Review 3.5
@Test(groups = "producerField")
@SpecAssertions({
- @SpecAssertion(section = "3.5", id = "review"),
+ @SpecAssertion(section = "review", id = "review"),
@SpecAssertion(section = "2.3.1", id = "a")
})
public void testDefaultBindingType()
@@ -234,11 +235,12 @@
assert tarantulaModel.getName().equals("produceTarantula");
}
+ // review 2.2
@Test(groups = "producerField")
@SpecAssertions({
@SpecAssertion(section = "2.7.2", id = "c"),
@SpecAssertion(section = "3.5.2", id = "e"),
- @SpecAssertion(section = "2.2", id = "review")
+ @SpecAssertion(section = "review", id = "review")
})
public void testStereotype()
{
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -8,9 +8,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;
/**
@@ -43,7 +43,7 @@
}
@Test(groups = { "stub", "producerMethod",
"enterpriseBeans" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.4", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testProducerMethodIsNotBusinessMethod() throws Exception
{
assert false;
@@ -137,7 +137,7 @@
@Test(groups = "producerMethod")
@SpecAssertions( { @SpecAssertion(section = "3.4.1", id = "b"),
- @SpecAssertion(section = "2.2", id = "unknown") })
+ @SpecAssertion(section = "2.2", id = "j") })
public void testApiTypeForArrayTypeReturn() throws Exception
{
Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class);
@@ -208,7 +208,7 @@
}
@Test(groups = "producerMethod", expectedExceptions =
DefinitionException.class)
- @SpecAssertion(section = "3.4", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testProducerMethodWithParameterAnnotatedDisposes() throws Exception
{
Bean<SpiderProducer_Broken> bean =
createSimpleBean(SpiderProducer_Broken.class);
@@ -218,7 +218,7 @@
}
@Test(groups = "producerMethod", expectedExceptions =
DefinitionException.class)
- @SpecAssertion(section = "3.4", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testProducerMethodWithParameterAnnotatedObserves() throws Exception
{
Bean<SpiderProducer_Broken> bean =
createSimpleBean(SpiderProducer_Broken.class);
@@ -227,10 +227,11 @@
createProducerMethodBean(method, bean);
}
+ // Review 2.2
@Test(groups = "producerMethod")
@SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "b"),
@SpecAssertion(section = "3.4.2", id = "ba"),
- @SpecAssertion(section = "2.2", id = "review") })
+ @SpecAssertion(section = "review", id = "review") })
public void testStereotypeSpecifiesScope() throws Exception
{
Bean<SpiderProducer> bean = createSimpleBean(SpiderProducer.class);
@@ -247,7 +248,7 @@
@Test(groups = "producerMethod", expectedExceptions =
DefinitionException.class)
@SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "b"),
@SpecAssertion(section = "3.4.2", id = "bc"),
- @SpecAssertion(section = "2.2", id = "review") })
+ @SpecAssertion(section = "review", id = "review") })
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -83,7 +83,7 @@
}
@Test(groups = { "producerMethod", "broken" })
- @SpecAssertions( { @SpecAssertion(section = "3.4", id =
"unknown"), @SpecAssertion(section = "B.1", id = "unknown"),
@SpecAssertion(section = "7.3", id = "unknown") })
+ @SpecAssertions( { @SpecAssertion(section = "3.4", id = "e"),
@SpecAssertion(section = "B.1", id = "unknown"),
@SpecAssertion(section = "7.3", id = "unknown") })
public void testProducerMethodReturnsNullIsDependent() throws Exception
{
Bean<SpiderProducer> spiderProducer =
createSimpleBean(SpiderProducer.class);
@@ -95,7 +95,7 @@
}
@Test(groups = "producerMethod", expectedExceptions =
IllegalProductException.class)
- @SpecAssertions( { @SpecAssertion(section = "3.4", id =
"unknown"), @SpecAssertion(section = "B.1", id = "unknown")
})
+ @SpecAssertions( { @SpecAssertion(section = "3.4", id = "f"),
@SpecAssertion(section = "B.1", id = "unknown") })
public void testProducerMethodReturnsNullIsNotDependent() throws Exception
{
Bean<SpiderProducer_Broken> spiderProducer =
createSimpleBean(SpiderProducer_Broken.class);
@@ -105,6 +105,7 @@
}
@Test(expectedExceptions = CreationException.class)
+ @SpecAssertion(section="6.7", id="unknown")
public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws
Exception
{
deployBeans(LorryProducer_Broken.class);
@@ -120,6 +121,7 @@
}
@Test(expectedExceptions = FooException.class)
+ @SpecAssertion(section="6.7", id="unknown")
public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception
{
deployBeans(ShipProducer_Broken.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -118,74 +118,6 @@
}
/**
- * The @New annotation or <New> element may be applied to any field of a Web
- * Bean implementation class or to any parameter of a producer method,
- * initializer method, disposal method or Web Bean constructor where the type
- * of the field or parameter is a concrete Java type which satisfies the
- * requirements of a simple Web Bean implementation class or enterprise Web
- * Bean implementation class.
- * TODO This is not defined behavior in the spec in section 3.2.5
- */
- @Test(groups = { "new", "underInvestigation" })
- @SpecAssertion(section = "3.2.5", id = "unknown")
- public void testNewAnnotationMayBeAppliedToField()
- {
- deployBeans(AnnotatedField.class, WrappedSimpleBean.class);
- assert getCurrentManager().resolveByType(WrappedSimpleBean.class, new
NewLiteral()).size() == 1;
- }
-
- /**
- * The @New annotation or <New> element may be applied to any field of a Web
- * Bean implementation class or to any parameter of a producer method,
- * initializer method, disposal method or Web Bean constructor where the type
- * of the field or parameter is a concrete Java type which satisfies the
- * requirements of a simple Web Bean implementation class or enterprise Web
- * Bean implementation class.
- * TODO This is not defined behavior in the spec in section 3.2.5
- */
- @Test(groups = { "new" })
- @SpecAssertion(section = "3.2.5", id = "unknown")
- public void testNewAnnotationMayBeAppliedToProducerMethodParameter()
- {
- deployBeans(AnnotatedProducerParameter.class, WrappedSimpleBean.class);
- assert getCurrentManager().resolveByType(WrappedSimpleBean.class, new
NewLiteral()).size() == 1;
- }
-
- /**
- * The @New annotation or <New> element may be applied to any field of a Web
- * Bean implementation class or to any parameter of a producer method,
- * initializer method, disposal method or Web Bean constructor where the type
- * of the field or parameter is a concrete Java type which satisfies the
- * requirements of a simple Web Bean implementation class or enterprise Web
- * Bean implementation class.
- * TODO This is not defined behavior in the spec in section 3.2.5
- */
- @Test(groups = { "new", "underInvestigation" })
- @SpecAssertion(section = "3.2.5", id = "unknown")
- public void testNewAnnotationMayBeAppliedToInitializerMethodParameter()
- {
- deployBeans(AnnotatedInitializerParameter.class, WrappedSimpleBean.class);
- assert getCurrentManager().resolveByType(WrappedSimpleBean.class, new
NewLiteral()).size() == 1;
- }
-
- /**
- * The @New annotation or <New> element may be applied to any field of a Web
- * Bean implementation class or to any parameter of a producer method,
- * initializer method, disposal method or Web Bean constructor where the type
- * of the field or parameter is a concrete Java type which satisfies the
- * requirements of a simple Web Bean implementation class or enterprise Web
- * Bean implementation class.
- * TODO This is not defined behavior in the spec in section 3.2.5
- */
- @Test(groups = { "new" })
- @SpecAssertion(section = "3.2.5", id = "unknown")
- public void testNewAnnotationMayBeAppliedToConstructorMethodParameter()
- {
- deployBeans(AnnotatedConstructorParameter.class, WrappedSimpleBean.class);
- assert getCurrentManager().resolveByType(WrappedSimpleBean.class, new
NewLiteral()).size() == 1;
- }
-
- /**
* If the @New binding type appears in conjunction with some other binding
* type, or is specified for a field or parameter of a type which does not
* satisfy the definition of a simple Web Bean implementation class or
@@ -194,33 +126,18 @@
* TODO This is not defined behavior in the spec in section 3.2.5
*/
@Test(groups = { "new" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "unknown", id = "unknown")
+ @SpecAssertion(section = "review", id = "review")
public void testNewAnnotationCannotAppearInConjunctionWithOtherBindingType()
{
deployBeans(NewAndOtherBindingType_Broken.class);
}
/**
- * If the @New binding type appears in conjunction with some other binding
- * type, or is specified for a field or parameter of a type which does not
- * satisfy the definition of a simple Web Bean implementation class or
- * enterprise Web Bean implementation class, a DefinitionException is thrown
- * by the container at deployment time.
- * TODO This is not defined behavior in the spec in section 3.2.5
- */
- @Test(groups = { "underInvestigation", "new" }, expectedExceptions
= DefinitionException.class)
- @SpecAssertion(section = "3.2.5", id = "unknown")
- public void testNewAnnotationCannotBeAppliedToNonWebBeanImplementationClass()
- {
- assert false;
- }
-
- /**
* No Web Bean defined using annotations or XML may explicitly declare @New
* as a binding type
*/
@Test(groups = { "new" })
- @SpecAssertion(section = "3.2.5", id = "unknown")
+ @SpecAssertion(section = "review", id = "review")
public void testNewAnnotationCannotBeExplicitlyDeclared()
{
// All we can really do is make sure the annotation itself
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -60,19 +60,6 @@
createSimpleBean(ParameterizedBean_Broken.class);
}
- @Test(expectedExceptions = DefinitionException.class, groups = { "stub",
"interceptors", "decorators" })
- @SpecAssertion(section = "3.2.1", id = "unknown")
- public void testClassCannotBeInterceptorAndDecorator()
- {
-
- }
-
- // @Test(groups="stub")
- // public void testEntitiesNotDiscoveredAsSimpleBeans()
- // {
- // assert false;
- // }
-
@Test
@SpecAssertions( {
@SpecAssertion(section = "3.2.1", id = "g"),
@@ -106,33 +93,6 @@
assert getCurrentManager().resolveByType(MockUIComponent.class).size() == 0;
}
- // @Test(groups="stub")
- // public void testEjbsNotDiscoveredAsSimpleBean()
- // {
- // assert false;
- // }
- //
- @Test(groups = { "stub", "producerMethod", "webbeansxml"
})
- @SpecAssertion(section = "3.2.4", id = "unknown")
- public void testBeanDeclaredInXmlIgnoresProducerMethodDeclaredInJava()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "disposalMethod", "webbeansxml"
})
- @SpecAssertion(section = "3.2.4", id = "unknown")
- public void testBeanDeclaredInXmlIgnoresDisposalMethodDeclaredInJava()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "observerMethod", "webbeansxml"
})
- @SpecAssertion(section = "3.2.4", id = "unknown")
- public void testBeanDeclaredInXmlIgnoresObserverMethodDeclaredInJava()
- {
- assert false;
- }
-
@Test(expectedExceptions = DefinitionException.class, groups = { "stub",
"webbeansxml" })
@SpecAssertion(section = "3.2.4", id = "e")
public void testAbstractClassDeclaredInXmlIsNotAllowed()
@@ -292,23 +252,7 @@
}
@Test
- @SpecAssertion(section = "3.2.6.3", id = "unknown")
- public void testBindingTypeAnnotatedConstructor() throws Exception
- {
- deployBeans(Duck.class);
- new RunInDependentContext()
- {
- @Override
- protected void execute() throws Exception
- {
- getCurrentManager().getInstanceByType(Duck.class);
- assert Duck.constructedCorrectly;
- }
- }.run();
- }
-
- @Test
- @SpecAssertion(section = "3.2", id = "unknown")
+ @SpecAssertion(section = "3.2", id = "fa")
public void testDependentScopedBeanCanHavePublicField() throws Exception
{
deployBeans(Tiger.class);
@@ -326,7 +270,7 @@
}
@Test(expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.2", id = "unknown")
+ @SpecAssertion(section = "3.2", id = "fb")
public void testNonDependentScopedBeanCanNotHavePublicField()
{
deployBeans(Leopard_Broken.class);
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -46,6 +46,22 @@
FishPond fishPond = goldfishPondBean.create(new
MockCreationalContext<FishPond>());
assert fishPond.goldfish != null;
}
+
+ @Test
+ @SpecAssertion(section = "3.2.6.3", id = "a")
+ public void testBindingTypeAnnotatedConstructor() throws Exception
+ {
+ deployBeans(Duck.class);
+ new RunInDependentContext()
+ {
+ @Override
+ protected void execute() throws Exception
+ {
+ getCurrentManager().getInstanceByType(Duck.class);
+ assert Duck.constructedCorrectly;
+ }
+ }.run();
+ }
@Test(groups = { "broken", "specialization" })
@SpecAssertion(section = "3.2.7", id = "c")
@@ -238,7 +254,7 @@
* @throws Exception
*/
@Test
- @SpecAssertion(section = "4.2", id = "unknown")
+ @SpecAssertion(section = "4.2", id = "ba")
public void
testSubClassDoesNotInheritPostConstructOnSuperclassBlockedByIntermediateClass() throws
Exception
{
@@ -264,7 +280,7 @@
* @throws Exception
*/
@Test
- @SpecAssertion(section = "4.2", id = "unknown")
+ @SpecAssertion(section = "4.2", id = "bb")
public void
testSubClassDoesNotInheritPreDestroyConstructOnSuperclassBlockedByIntermediateClass()
throws Exception
{
OrderProcessor.preDestroyCalled = false;
@@ -283,6 +299,7 @@
}
@Test(groups = "injection")
+ @SpecAssertion(section = "outdated", id = "outdated")
public void testFieldMissingBindingAnnotationsAreNotInjected()
{
Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class);
@@ -293,6 +310,7 @@
}
@Test(expectedExceptions = CreationException.class)
+ @SpecAssertion(section = "6.5", id = "unknown")
public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws
Exception
{
deployBeans(Lorry_Broken.class);
@@ -308,6 +326,7 @@
}
@Test(expectedExceptions = FooException.class)
+ @SpecAssertion(section = "6.5", id = "unknown")
public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception
{
deployBeans(Van_Broken.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -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;
/**
@@ -94,7 +94,7 @@
}
@Test(expectedExceptions=InconsistentSpecializationException.class)
- @SpecAssertion(section="4.3.1", id = "review")
+ @SpecAssertion(section="review", id = "review")
public void testTwoBeansSpecializeTheSameBean()
{
deployBeans(PictureShop_Broken.class, Bookshop_Broken.class);
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -18,16 +18,16 @@
public class ClientProxyTest extends AbstractDeclarativeTest
{
- @Test(groups = "configuration().getBeans()")
- @SpecAssertion(section = "5.4", id = "unknown")
+ @Test
+ @SpecAssertion(section = "5.4", id = "b")
public void testClientProxyUsedForNormalScope()
{
Tuna tuna = getCurrentManager().getInstanceByType(Tuna.class);
assert getCurrentConfiguration().getBeans().isProxy(tuna);
}
- @Test(groups = "configuration().getBeans()")
- @SpecAssertion(section = "5.4", id = "unknown")
+ @Test
+ @SpecAssertion(section = "5.4", id = "a")
public void testClientProxyNotUsedForPseudoScope() throws Exception
{
new RunInDependentContext()
@@ -44,8 +44,8 @@
}.run();
}
- @Test(groups = "configuration().getBeans()")
- @SpecAssertion(section = "5.4", id = "unknown")
+ @Test
+ @SpecAssertion(section = "5.4", id = "c")
public void testSimpleWebBeanClientProxyIsSerializable() throws IOException,
ClassNotFoundException
{
TunedTuna tuna = getCurrentManager().getInstanceByType(TunedTuna.class);
@@ -56,8 +56,8 @@
assert tuna.getState().equals("tuned");
}
- @Test(groups = "configuration().getBeans()")
- @SpecAssertion(section = "5.4.2", id = "unknown")
+ @Test
+ @SpecAssertion(section = "review", id = "review")
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -5,14 +5,16 @@
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
@Artifact
// TODO This test can be fixed by specifying the exception that is expected as below
+(a)ExpectedDeploymentException(UnproxyableDependencyException.class)
public class UnproxyableTest extends AbstractDeclarativeTest
{
- @Test(groups = { "configuration().getBeans()", "broken" },
expectedExceptions = UnproxyableDependencyException.class)
- @SpecAssertion(section = "5.4.1", id = "unknown")
+ @Test
+ @SpecAssertion(section = "5.4.1", id = "e")
public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean()
{
@SuppressWarnings("unused")
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -30,7 +30,7 @@
}
@Test(groups = { "injection", "producerMethod" })
- @SpecAssertion(section = "5.2", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testInjectionPerformsBoxingIfNecessary() throws Exception
{
Bean<SpiderProducer> spiderProducer =
createSimpleBean(SpiderProducer.class);
@@ -74,7 +74,7 @@
}
@Test(groups = "injection", expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.7", id = "outdated")
+ @SpecAssertion(section = "outdated", id = "outdated")
public void testInjectingStaticField()
{
Bean<BeanWithStaticBoundField_Broken> bean =
createSimpleBean(BeanWithStaticBoundField_Broken.class);
@@ -84,7 +84,7 @@
}
@Test(groups = "injection", expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.7", id = "outdated")
+ @SpecAssertion(section = "outdated", id = "outdated")
public void testInjectingFinalField()
{
Bean<BeanWithFinalBoundField_Broken> bean =
createSimpleBean(BeanWithFinalBoundField_Broken.class);
@@ -93,7 +93,7 @@
bean.create(new MockCreationalContext<BeanWithFinalBoundField_Broken>());
}
- @Test @SpecAssertion(section="4.2", id = "unknown")
+ @Test @SpecAssertion(section="4.2", id = "a")
public void testFieldDeclaredInSuperclassInjected() throws Exception
{
deployBeans(Fox.class, DeluxeHenHouse.class, HenHouse.class);
@@ -139,7 +139,7 @@
}
@Test(groups = { "stub", "injection", "webbeansxml" })
- @SpecAssertion(section = "3.8.2", id = "review")
+ @SpecAssertion(section = "review", id = "review")
public void testInjectFieldsDeclaredInXmlAndJava()
{
assert false;
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-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -232,7 +232,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "za")
+ @SpecAssertion(section = "5.6.1", id = "za")
public void testStandardDeployment() throws Exception
{
deployBeans();
@@ -251,7 +251,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "zb")
+ @SpecAssertion(section = "5.6.1", id = "zb")
public void testDependentScope() throws Exception
{
deployBeans();
@@ -270,7 +270,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "zc")
+ @SpecAssertion(section = "5.6.1", id = "zc")
public void testApiTypeInjectionPoint()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -291,7 +291,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "zd")
+ @SpecAssertion(section = "5.6.1", id = "zd")
public void testCurrentBinding()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java 2009-02-19
17:35:10 UTC (rev 1601)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java 2009-02-19
18:42:22 UTC (rev 1602)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.unit.lookup.manager;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
@@ -12,7 +12,7 @@
public class ManagerTest extends AbstractDeclarativeTest
{
@Test(groups={"manager", "injection", "deployment"})
- @SpecAssertion(section="5.7", id = "unknown")
+ @SpecAssertion(section="5.7.2", id = "a")
public void testInjectingManager() throws Exception
{
deployBeans(FishFarmOffice.class);
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-19 17:35:10 UTC (rev 1601)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-19 18:42:22 UTC (rev 1602)
@@ -691,9 +691,14 @@
<text>Multiple simple beans may share the same bean class. This occurs when
beans are defined using XML. Only one simple bean per bean class may be defined using
annotations.</text>
</assertion>
- <assertion id="f">
- <text>If a simple bean has a public field, it must have scope @Dependent. If
a simple bean with a public field declares any scope other than @Dependent, a
DefinitionException is thrown by the container at deployment time.</text>
+ <assertion id="fa">
+ <text>If a simple bean has a public field, it must have scope
@Dependent.</text>
+ <note>Check that a dependent scoped bean with a public field does
work</note>
</assertion>
+
+ <assertion id="fb">
+ <text>If a simple bean with a public field declares any scope other than
@Dependent, a DefinitionException is thrown by the container at deployment
time.</text>
+ </assertion>
</section>
@@ -713,6 +718,9 @@
<assertion id="cb">
<text>A top-level Java class is not a simple bean if it is an
interface</text>
</assertion>
+ <assertion id="cc">
+ <text>A top-level Java class can be a simple bean if it is static inner
class</text>
+ </assertion>
<assertion id="da">
<text>A top-level abstract Java class is a simple bean if it is annotated
@Decorator.</text>
</assertion>
@@ -873,11 +881,12 @@
<assertion id="k">
<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 no
producer fields</text>
- <assertion id="l">
+ </assertion>
+ <assertion id="l">
<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 no
disposal methods</text>
</assertion>
- </assertion>
+
</section>
<section id="3.2.6" title="Bean constructors">
@@ -2307,12 +2316,16 @@
</assertion>
<assertion id="b">
- <text>All client proxies must be serializable</text>
+ <text>Client proxies are used for normal scoped beans</text>
</assertion>
<assertion id="c">
<text>All client proxies must be serializable</text>
</assertion>
+
+ <assertion id="d">
+ <text>The container must guarantee that when any valid injected reference to
a bean of normal scope is invoked, the invocation is always processed by the current
instance of the injected bean.</text>
+ </assertion>
</section>
<section id="5.4.1" title="Unproxyable bean types">
@@ -2521,9 +2534,25 @@
<section id="5.7.2" title="Obtaining contextual instances">
<assertion id="a">
- <text>The container provides a built-in bean with bean type Manager, scope
@Dependent, deployment type @Standard and binding @Current. Thus, any bean may obtain an
instance of Manager by injecting it</text>
+ <text>Any bean may obtain an instance of Manager by injecting
it</text>
</assertion>
+ <assertion id="aa">
+ <text>The container provides a built-in bean with bean type
Manager</text>
+ </assertion>
+
+ <assertion id="ab">
+ <text>The container provides a built-in bean with scope
@Dependent</text>
+ </assertion>
+
+ <assertion id="ac">
+ <text>The container provides a built-in bean with deployment type
@Standard</text>
+ </assertion>
+
+ <assertion id="ad">
+ <text>The container provides a built-in bean with binding
@Current.</text>
+ </assertion>
+
<assertion id="b">
<text>The application may obtain the Manager object from JNDI. The container
must register an instance of Manager with name java:app/Manager in JNDI at deployment
time</text>
</assertion>
@@ -3310,6 +3339,16 @@
<text>If a producer method or field declares a passivating scope and returns
a non-serializable object at runtime, an IllegalProductException is thrown by the
container</text>
</assertion>
+ <assertion id="ca">
+ <text>Check a producer method which declares a passivating scope and returns
a serializable product works</text>
+ <note>Sanity test</note>
+ </assertion>
+
+ <assertion id="cb">
+ <text>Check a producer method which declares a passivating scope and returns
a primitive product works</text>
+ <note>Sanity test</note>
+ </assertion>
+
<assertion id="d">
<text>The built-in session and conversation scopes are
passivating</text>
</assertion>
@@ -3649,5 +3688,13 @@
</assertion>
</section>
+ <section id="review" title="Tests to review">
+ <assertion id="review" />
+ </section>
+
+ <section id="outdated" title="Tests which seem to be
outdated">
+ <assertion id="outdated" />
+ </section>
+
</specification>