[webbeans-commits] Webbeans SVN: r3784 - in ri/trunk: spi/src/main/java/org/jboss/webbeans/bootstrap/api and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-09-25 12:25:33 -0400 (Fri, 25 Sep 2009)
New Revision: 3784
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Lifecycle.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java
Log:
Add isXXXActive methods
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java 2009-09-25 14:10:58 UTC (rev 3783)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java 2009-09-25 16:25:33 UTC (rev 3784)
@@ -41,11 +41,11 @@
public static LogProvider log = Logging.getLogProvider(ContextLifecycle.class);
- public final ApplicationContext applicationContext;
- public final SessionContext sessionContext;
- public final ConversationContext conversationContext;
- public final RequestContext requestContext;
- public final DependentContext dependentContext;
+ private final ApplicationContext applicationContext;
+ private final SessionContext sessionContext;
+ private final ConversationContext conversationContext;
+ private final RequestContext requestContext;
+ private final DependentContext dependentContext;
public ContextLifecycle(ApplicationContext applicationContext, SessionContext sessionContext, ConversationContext conversationContext, RequestContext requestContext, DependentContext dependentContext)
{
@@ -92,9 +92,24 @@
public boolean isRequestActive()
{
- return requestContext.isActive() && dependentContext.isActive();
+ return applicationContext.isActive() && requestContext.isActive() && dependentContext.isActive();
}
+ public boolean isApplicationActive()
+ {
+ return applicationContext.isActive() && dependentContext.isActive();
+ }
+
+ public boolean isConversationActive()
+ {
+ return applicationContext.isActive() && sessionContext.isActive() && conversationContext.isActive() && dependentContext.isActive();
+ }
+
+ public boolean isSessionActive()
+ {
+ return applicationContext.isActive() && sessionContext.isActive() && dependentContext.isActive();
+ }
+
public void beginApplication(BeanStore applicationBeanStore)
{
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Lifecycle.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Lifecycle.java 2009-09-25 14:10:58 UTC (rev 3783)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Lifecycle.java 2009-09-25 16:25:33 UTC (rev 3784)
@@ -24,6 +24,12 @@
public void endRequest(String id, BeanStore requestBeanStore);
public boolean isRequestActive();
+
+ public boolean isSessionActive();
+
+ public boolean isApplicationActive();
+
+ public boolean isConversationActive();
public void beginApplication(BeanStore applicationBeanStore);
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java 2009-09-25 14:10:58 UTC (rev 3783)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java 2009-09-25 16:25:33 UTC (rev 3784)
@@ -84,6 +84,21 @@
{
return delegate().isRequestActive();
}
+
+ public boolean isApplicationActive()
+ {
+ return delegate().isApplicationActive();
+ }
+
+ public boolean isConversationActive()
+ {
+ return delegate().isConversationActive();
+ }
+
+ public boolean isSessionActive()
+ {
+ return delegate().isSessionActive();
+ }
public void restoreSession(String id, BeanStore sessionBeanStore)
{
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3783 - in examples/tags/1.0.0.PREVIEW4: jsf2 and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-09-25 10:10:58 -0400 (Fri, 25 Sep 2009)
New Revision: 3783
Modified:
examples/tags/1.0.0.PREVIEW4/jsf2/pom.xml
examples/tags/1.0.0.PREVIEW4/pom.xml
Log:
update pom versions
Modified: examples/tags/1.0.0.PREVIEW4/jsf2/pom.xml
===================================================================
--- examples/tags/1.0.0.PREVIEW4/jsf2/pom.xml 2009-09-25 14:06:40 UTC (rev 3782)
+++ examples/tags/1.0.0.PREVIEW4/jsf2/pom.xml 2009-09-25 14:10:58 UTC (rev 3783)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.webbeans.examples</groupId>
<artifactId>webbeans-examples-parent</artifactId>
- <version>1.0.0.PREVIEW3</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<groupId>org.jboss.webbeans.examples</groupId>
Modified: examples/tags/1.0.0.PREVIEW4/pom.xml
===================================================================
--- examples/tags/1.0.0.PREVIEW4/pom.xml 2009-09-25 14:06:40 UTC (rev 3782)
+++ examples/tags/1.0.0.PREVIEW4/pom.xml 2009-09-25 14:10:58 UTC (rev 3783)
@@ -4,12 +4,12 @@
<parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-version-matrix</artifactId>
- <version>1.0.0.PREVIEW3</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<groupId>org.jboss.webbeans.examples</groupId>
<artifactId>webbeans-examples-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.PREVIEW3</version>
+ <version>1.0.0.PREVIEW4</version>
<name>Web Beans Examples</name>
<description>
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3782 - examples/tags.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-09-25 10:06:40 -0400 (Fri, 25 Sep 2009)
New Revision: 3782
Added:
examples/tags/1.0.0.PREVIEW4/
Log:
1.0.0.PREVIEW4
Copied: examples/tags/1.0.0.PREVIEW4 (from rev 3781, examples/tags/1.0.0.PREVIEW3)
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3781 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/application/ejb and 147 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-09-24 22:31:37 -0400 (Thu, 24 Sep 2009)
New Revision: 3781
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/AnyInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java
Log:
remaining PFD2 test mappings
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -18,7 +18,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@@ -45,7 +45,7 @@
@SpecAssertion(section = "2.4.1", id = "ab"),
@SpecAssertion(section = "2.4.1", id = "ac"),
@SpecAssertion(section = "2.4.1", id = "ca"),
- @SpecAssertion(section = "11.3.15", id = "a")
+ @SpecAssertion(section = "11.3.14", id = "a")
})
public void testBuiltInContexts()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/DestroyedInstanceReturnedByGetTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -13,7 +13,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DestroyedInstanceReturnedByGetTest extends AbstractJSR299Test
{
@Test(groups = { "contexts" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetFromContextualTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,7 +14,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class GetFromContextualTest extends AbstractJSR299Test
{
@Test(groups = { "contexts" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetOnInactiveContextTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class GetOnInactiveContextTest extends AbstractJSR299Test
{
@Test(groups = { "contexts" }, expectedExceptions = { ContextNotActiveException.class })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/GetWithNoCreationalContextTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class GetWithNoCreationalContextTest extends AbstractJSR299Test
{
@Test(groups = { "contexts" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -17,7 +17,7 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EJBApplicationContextTest extends AbstractJSR299Test
{
@Test(groups = { "rewrite", "contexts", "webservice", "integration", "jboss-as-broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -13,7 +13,7 @@
* @author Nicklas Karlsson
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ConversationBeginTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -13,7 +13,7 @@
* @author Nicklas Karlsson
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ConversationEndTest extends AbstractJSR299Test
{
@Override
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -13,7 +13,7 @@
* @author Nicklas Karlsson
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ConversationIdSetByApplicationTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,7 +14,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ConversationIdSetByContainerTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -13,7 +13,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ConversationTimeoutTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -33,7 +33,7 @@
@Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml"),
@Resource(destination="rain.jspx", source="rain.jsf")
})
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ClientConversationContextTest extends AbstractConversationTest
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -20,7 +20,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DependentContextTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -27,7 +27,7 @@
@Artifact
@BeansXml("beans.xml")
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PassivatingContextTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingBeanConstructor/DecoratorWithNonPassivatingBeanConstructorTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class DecoratorWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInitializerMethod/DecoratorWithNonPassivatingInitializerMethodTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class DecoratorWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/decoratorWithNonPassivatingInjectedField/DecoratorWithNonPassivatingInjectedFieldTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class DecoratorWithNonPassivatingInjectedFieldTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -16,7 +16,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(IllegalProductException.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanWithIllegalDependencyTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "integration"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean/EnterpriseBeanWithIllegalDependencyTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -16,7 +16,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(IllegalProductException.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanWithIllegalDependencyTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "integration"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingConstructorFieldInDecorator/EnterpriseBeanWithNonPassivatingFieldInDecoratorTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingFieldInDecoratorTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingDecorator/EnterpriseBeanWithNonPassivatingDecoratorTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonSerializableIntializerMethod/EnterpriseBeanWithNonSerializableIntializerMethodTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanWithNonSerializableIntializerMethodTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInjectedField/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ManagedBeanWithNonSerializableInterceptorClassTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerField/NonPassivationCapableProducerFieldTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -17,7 +17,7 @@
*/
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@ExpectedDeploymentException(DeploymentError.class)
public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInjcetedField/PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PassivatingManagedBeanWithNonPassivatingInjcetedFieldTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingProducerMethodWithNonPassivatingParameter/PassivatingProducerMethodWithNonPassivatingParameterTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PassivatingProducerMethodWithNonPassivatingParameterTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/unserializableSimpleInjectedIntoPassivatingEnterpriseBean/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SessionContextTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -19,7 +19,7 @@
@Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"),
@Resource(destination="SimplePage.html", source="SimplePage.html")
})
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SessionContextTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "servlet", "integration" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -40,17 +40,17 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DecoratorDefinitionTest extends AbstractJSR299Test
{
@Test
@SpecAssertions
({
- @SpecAssertion(section="8.1", id="d"),
- @SpecAssertion(section="8.1.1", id="a"),
- @SpecAssertion(section="8.1.3", id="c"),
- @SpecAssertion(section="8.3", id="aa"),
- @SpecAssertion(section="11.1.1", id="a"),
+ @SpecAssertion(section = "8.1", id = "d"),
+ @SpecAssertion(section = "8.1.1", id = "a"),
+ @SpecAssertion(section = "8.1.3", id = "c"),
+ @SpecAssertion(section = "8.3", id = "aa"),
+ @SpecAssertion(section = "11.1.1", id = "a"),
@SpecAssertion(section = "12.3", id = "kc")
})
@@ -73,11 +73,11 @@
@Test
@SpecAssertions
({
- @SpecAssertion(section="8.1", id="b"),
- @SpecAssertion(section="8.1", id="c"),
- @SpecAssertion(section="11.1.1", id="b"),
- @SpecAssertion(section="11.3.12", id="a"),
- @SpecAssertion(section="11.3.12", id="b")
+ @SpecAssertion(section = "8.1", id = "b"),
+ @SpecAssertion(section = "8.1", id = "c"),
+ @SpecAssertion(section = "11.1.1", id = "b"),
+ @SpecAssertion(section = "11.3.11", id = "a"),
+ @SpecAssertion(section = "11.3.11", id = "b")
})
public void testDecoratedTypes()
{
@@ -123,7 +123,7 @@
@SpecAssertions({
@SpecAssertion(section="8.2", id="b"),
@SpecAssertion(section="8.3", id="aa"),
- @SpecAssertion(section="11.3.12", id="a")
+ @SpecAssertion(section="11.3.11", id="a")
})
public void testDecoratorOrdering()
{
@@ -153,7 +153,7 @@
}
@Test(expectedExceptions = IllegalArgumentException.class)
- @SpecAssertion(section="11.3.12", id="c")
+ @SpecAssertion(section="11.3.11", id="c")
public void testDuplicateBindingsOnResolveDecoratorsFails()
{
Annotation binding = new AnnotationLiteral<Meta>() {};
@@ -161,7 +161,7 @@
}
@Test(expectedExceptions = IllegalArgumentException.class)
- @SpecAssertion(section="11.3.12", id="d")
+ @SpecAssertion(section="11.3.11", id="d")
public void testNonBindingsOnResolveDecoratorsFails()
{
Annotation binding = new AnnotationLiteral<NonMeta>() {};
@@ -169,7 +169,7 @@
}
@Test(expectedExceptions = IllegalArgumentException.class)
- @SpecAssertion(section="11.3.12", id="e")
+ @SpecAssertion(section="11.3.11", id="e")
public void testEmptyTypeSetOnResolveDecoratorsFails()
{
Annotation binding = new AnnotationLiteral<NonMeta>() {};
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -16,7 +16,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DecoratorListedTwiceInBeansXmlTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -32,7 +32,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class FinalBeanClassTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -32,7 +32,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class MultipleDelegateInjectionPointsTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -32,7 +32,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NoDelegateInjectionPointsTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NonExistantDecoratorClassInBeansXmlTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DelegateInjectionPointTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DelegateInjectionPointTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DecoratorInvocationTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -31,7 +31,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@IntegrationTest
public class EJBDecoratorInvocationTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/DecoratorInvocationTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DecoratorInvocationTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/DecoratorInvocationTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -33,7 +33,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DecoratorInvocationTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -20,7 +20,7 @@
* @author Pete Muir
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class BeanDefinitionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -27,7 +27,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@@ -44,7 +44,7 @@
}
@Test(groups = { "ri-broken" })
- @SpecAssertion(section = "5.2", id = "k")
+ @SpecAssertion(section = "5.2.1", id = "k")
// WBRI-328
public void testGetStereotypesCalled()
{
@@ -52,7 +52,7 @@
}
@Test
- @SpecAssertion(section = "5.2", id = "k")
+ @SpecAssertion(section = "5.2.1", id = "k")
public void testIsPolicyCalled()
{
assert CatBean.bean.isPolicyCalled();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class GenericManagedBeanTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -18,7 +18,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class BindingDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -24,7 +24,7 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBindingDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NameDefinitionTest extends AbstractJSR299Test
{
@@ -30,7 +30,7 @@
@Test
@SpecAssertions({
@SpecAssertion(section= "2.5.2", id = "a"),
- @SpecAssertion(section = "3.1.6", id = "a"),
+ @SpecAssertion(section = "3.1.5", id = "a"),
@SpecAssertion(section = "2.5.1", id = "d")
})
public void testDefaultNamed()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -19,7 +19,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ScopeDefinitionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class TooManyScopesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -12,7 +12,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseScopeDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -19,7 +19,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class StereotypeDefinitionTest extends AbstractJSR299Test
{
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NonEmptyNamedTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class IncompatibleStereotypesTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class TooManyScopeTypesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/defaultNamed/DefaultNamedTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -8,7 +8,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DefaultNamedTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -15,7 +15,7 @@
@IntegrationTest
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseStereotypeDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -35,7 +35,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class StereotypeInheritenceTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -35,7 +35,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AddDeploymentProblemTest extends AbstractJSR299Test
{
@Test(groups={"rewrite", "jboss-as-broken"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -36,7 +36,7 @@
})
@IntegrationTest
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class BeforeBeanDiscoveryThrowsExceptionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -36,7 +36,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AfterBeanDiscoveryFailureTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/normalScope/AddingNormalScopeTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -37,7 +37,7 @@
})
@IntegrationTest
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AddingNormalScopeTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -32,7 +32,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class UseBeforeValidationTest extends AbstractJSR299Test
{
@Test(groups = {"ri-broken", "rewrite"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -40,7 +40,7 @@
// We put Foo in the ejb jar, but Bar goes in the library
@Classes({LibraryMissingBeansXmlTest.class, Foo.class})
@Test
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@IntegrationTest
public class LibraryMissingBeansXmlTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -47,7 +47,7 @@
// We put Foo in the ejb jar, but Bar goes in the library
@Classes({EarInstalledLibraryTest.class, Foo.class})
@Test
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@Packaging(PackagingType.EAR)
@IntegrationTest
public class EarInstalledLibraryTest extends AbstractJSR299Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -16,7 +16,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EventBindingTypesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -29,7 +29,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ObserverMethodOnIncorrectBeanTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isInitializer/ObserverMethodAnnotatedInitialzerTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -34,7 +34,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ObserverMethodAnnotatedInitialzerTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -32,7 +32,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ObserverMethodAnnotatedProducesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ObserverMethodWithTwoEventParametersTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -12,7 +12,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EventTypesTest extends AbstractJSR299Test
{
@Test(groups = "event")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -29,7 +29,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class FireEventTest extends AbstractJSR299Test
{
private static final String BEAN_MANAGER_FIRE_EVENT_METHOD_NAME = "fireEvent";
@@ -37,8 +37,8 @@
@Test(groups = { "events" })
@SpecAssertions({
// these two assertions combine to create a logical, testable assertion
- @SpecAssertion(section = "11.3.10", id = "a"),
- @SpecAssertion(section = "11.3.10", id = "b")
+ @SpecAssertion(section = "11.3.9", id = "a"),
+ @SpecAssertion(section = "11.3.9", id = "b")
})
public void testBeanManagerInterfaceForFireEventMethod() throws Exception
{
@@ -46,7 +46,7 @@
}
@Test(groups = { "events" })
- @SpecAssertion(section = "11.3.10", id = "a")
+ @SpecAssertion(section = "11.3.9", id = "a")
public void testBeanManagerFireEvent()
{
Billing billing = getInstanceByType(Billing.class);
@@ -61,14 +61,14 @@
}
@Test(groups = { "events"}, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertion(section = "11.3.10", id = "c")
+ @SpecAssertion(section = "11.3.9", id = "c")
public void testTypeVariableEventTypeFails() throws Exception
{
getCurrentManager().fireEvent(new Foo<String>());
}
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertion(section = "11.3.10", id = "d")
+ @SpecAssertion(section = "11.3.9", id = "d")
public void testDuplicateBindingsToFireEventFails() throws Exception
{
getCurrentManager().fireEvent(new Object(), new AnnotationLiteral<Lifted>() {}, new AnnotationLiteral<Lifted>() {});
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -15,7 +15,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ObserverTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -21,7 +21,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseEventInheritenceTest extends AbstractJSR299Test
{
@Test(groups = { "events", "inheritance" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -16,7 +16,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ResolveEventObserversTest extends AbstractJSR299Test
{
private static final String BEAN_MANAGER_RESOLVE_OBSERVERS_METHOD_NAME = "resolveObserverMethods";
@@ -84,8 +84,8 @@
@Test(groups = { "events" })
@SpecAssertions({
// these two assertions combine to create a logical, testable assertion
- @SpecAssertion(section = "11.3.11", id = "a"),
- @SpecAssertion(section = "11.3.11", id = "b")
+ @SpecAssertion(section = "11.3.10", id = "a"),
+ @SpecAssertion(section = "11.3.10", id = "b")
})
public void testBeanManagerResolveObserversSignature() throws Exception
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -7,7 +7,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ResolveEnterpriseEventObserverTest extends AbstractJSR299Test
{
@Test(groups = { "events", "ejb" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -30,7 +30,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ObserverExceptionRethrownTest extends AbstractJSR299Test
{
@Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -41,7 +41,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class TransactionalObserversTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -35,7 +35,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ObserverMethodWithParametertizedTypeTest extends AbstractJSR299Test
{
@Test(groups = { "events"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -15,7 +15,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SelectEventTest extends AbstractJSR299Test
{
@Test(groups = "events")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -38,7 +38,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProcessAnnotatedTypeTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -35,7 +35,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProcessInjectionTargetEventThrowsExceptionTest extends AbstractJSR299Test
{
@Test(groups="ri-broken")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -62,11 +62,11 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class BeanManagerTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
- @SpecAssertion(section = "11.3.7", id = "a")
+ @SpecAssertion(section = "11.3.6", id = "a")
//WBRI-328
public void testGetPassivationCapableBeanById()
{
@@ -77,7 +77,7 @@
}
@Test
- @SpecAssertion(section = "11.3.8", id = "a")
+ @SpecAssertion(section = "11.3.7", id = "a")
public void testAmbiguousDependencyResolved()
{
Set<Bean<?>> beans = new HashSet<Bean<?>>();
@@ -87,7 +87,7 @@
}
@Test(expectedExceptions = AmbiguousResolutionException.class)
- @SpecAssertion(section = "11.3.8", id = "b")
+ @SpecAssertion(section = "11.3.7", id = "b")
public void testAmbiguousDependencyNotResolved()
{
Set<Bean<?>> beans = new HashSet<Bean<?>>();
@@ -98,8 +98,8 @@
@Test(expectedExceptions = InjectionException.class)
@SpecAssertions({
- @SpecAssertion(section = "11.3.9", id = "a"),
- @SpecAssertion(section = "11.3.9", id = "b")
+ @SpecAssertion(section = "11.3.8", id = "a"),
+ @SpecAssertion(section = "11.3.8", id = "b")
})
public void testValidateThrowsException()
{
@@ -110,7 +110,7 @@
}
@Test(groups="rewrite")
- @SpecAssertion(section = "11.3.14", id = "aa")
+ @SpecAssertion(section = "11.3.13", id = "aa")
// Should also check a custom bindingtype
public void testDetermineBindingType()
{
@@ -122,7 +122,7 @@
@Test(groups="rewrite")
// Should also check a custom scope
- @SpecAssertion(section = "11.3.14", id = "ab")
+ @SpecAssertion(section = "11.3.13", id = "ab")
public void testDetermineScopeType()
{
assert getCurrentManager().isScope(ApplicationScoped.class);
@@ -132,7 +132,7 @@
}
@Test(groups="rewrite")
- @SpecAssertion(section = "11.3.14", id = "ac")
+ @SpecAssertion(section = "11.3.13", id = "ac")
// Should also check a custom stereotype
public void testDetermineStereotype()
{
@@ -145,7 +145,7 @@
@Test(groups = {"ri-broken", "rewrite"})
// WBRI-59
// Should also check a custom interceptor binding type
- @SpecAssertion(section = "11.3.14", id = "ad")
+ @SpecAssertion(section = "11.3.13", id = "ad")
public void testDetermineInterceptorBindingType()
{
assert getCurrentManager().isInterceptorBindingType(Transactional.class);
@@ -155,7 +155,7 @@
}
@Test(groups = { "rewrite"})
- @SpecAssertion(section = "11.3.14", id = "ae")
+ @SpecAssertion(section = "11.3.13", id = "ae")
// Should also check a custom sterotype
public void testGetMetaAnnotationsForStereotype()
{
@@ -186,7 +186,7 @@
}
@Test(groups = {"ri-broken", "rewrite"})
- @SpecAssertion(section = "11.3.14", id = "af")
+ @SpecAssertion(section = "11.3.13", id = "af")
// WBRI-59
// Should also check a custom defined interceptor binding
public void testGetMetaAnnotationsForInterceptorBindingType()
@@ -200,7 +200,7 @@
}
@Test(groups = {"rewrite"})
- @SpecAssertion(section = "11.3.14", id = "ag")
+ @SpecAssertion(section = "11.3.13", id = "ag")
// Should also check a custom defined scope
public void testgetScope()
{
@@ -212,7 +212,7 @@
}
@Test
- @SpecAssertion(section = "11.3.16", id = "a")
+ @SpecAssertion(section = "11.3.15", id = "a")
public void testGetELResolver()
{
assert getCurrentManager().getELResolver() != null;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -37,7 +37,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProcessObserverMethodEventTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -39,7 +39,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProcessObserverMethodErrorTest
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/builtin/BuiltInBeansTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -27,7 +27,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class BuiltInBeansTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -16,7 +16,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DisposalMethodDefinitionTest extends AbstractJSR299Test
{
private static final Annotation DEADLIEST_LITERAL = new AnnotationLiteral<Deadliest>() {};
@@ -67,7 +67,7 @@
@Test(groups = { "disposalMethod" })
@SpecAssertions({
@SpecAssertion(section = "3.3.8", id = "a"),
- @SpecAssertion(section = "3.9", id = "a")
+ @SpecAssertion(section = "3.10", id = "a")
})
public void testDisposalMethodParametersGetInjected() throws Exception
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class MultipleDisposeParametersDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/observesUnallowed/ObserverParameterUnallowedDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SingletonWithRequestScopeTest extends AbstractJSR299Test
{
@Test(groups = { "jboss-as-broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SingletonWithSessionScopeTest extends AbstractJSR299Test
{
@Test(groups = { "jboss-as-broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class StatelessWithApplicationScopeTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class StatelessWithRequestScopeTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -24,7 +24,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanDefinitionTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -36,7 +36,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanLifecycleTest extends AbstractJSR299Test
{
@@ -147,7 +147,7 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle", "integration" })
- @SpecAssertion(section = "3.8.2", id = "b")
+ @SpecAssertion(section = "3.9.2", id = "b")
public void testInitializerMethodsCalledWithCurrentParameterValues()
{
AlteStadt alteStadt = getInstanceByType(AlteStadt.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -18,12 +18,12 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NewEnterpriseBeanICTest extends AbstractJSR299Test
{
@Test(groups = { "new", "ri-broken" })
- @SpecAssertion(section = "3.10", id = "l")
+ @SpecAssertion(section = "3.12", id = "l")
public void testNewBeanHasSameConstructor()
{
ExplicitConstructor bean = getInstanceByType(ExplicitConstructor.class);
@@ -35,7 +35,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "m")
+ @SpecAssertion(section = "3.12", id = "m")
public void testNewBeanHasSameInitializers()
{
InitializerSimpleBeanLocal bean = getInstanceByType(InitializerSimpleBeanLocal.class);
@@ -51,7 +51,7 @@
* @throws Exception
*/
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "v")
+ @SpecAssertion(section = "3.12", id = "v")
public void testNewBeanHasNoProducerMethods() throws Exception
{
FoxLocal fox = getInstanceByType(FoxLocal.class);
@@ -63,7 +63,7 @@
}
@Test(groups = { "new", "disposal" })
- @SpecAssertion(section = "3.10", id = "x")
+ @SpecAssertion(section = "3.12", id = "x")
public void testNewBeanHasNoDisposalMethods() throws Exception
{
FoxLocal fox = getInstanceByType(FoxLocal.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InitializerMethodAnnotatedProducesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -10,11 +10,11 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ParameterAnnotatedObservesTest extends AbstractJSR299Test
{
@Test(groups = "initializerMethod")
- @SpecAssertion(section = "3.8.1", id = "da")
+ @SpecAssertion(section = "3.9.1", id = "da")
public void testInitializerMethodHasParameterAnnotatedObserves()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/ParameterizedReturnTypeWithWildcardTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ParameterizedReturnTypeWithWildcardTest extends AbstractJSR299Test
{
@Test(groups = "producerField")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -17,7 +17,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseProducerFieldDefinitionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -12,7 +12,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProducerFieldLifecycleTest extends AbstractJSR299Test
{
@@ -49,7 +49,7 @@
@Test(groups = { "producerField", "specialization" })
@SpecAssertions({
- @SpecAssertion(section = "4.3.2", id = "b"),
+ // @SpecAssertion(section = "4.3.2", id = "b"), removed
@SpecAssertion(section="4.3", id="cb")
})
public void testSpecializedBeanAlwaysUsed() throws Exception
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ParameterAnnotatedObservesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -12,14 +12,14 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ParameterizedTypeWithWildcardTest extends AbstractJSR299Test
{
@Test(groups = "producerMethod")
@SpecAssertions({
@SpecAssertion(section = "3.3", id = "ha"),
- @SpecAssertion(section="2.2.1", id="lb")
+ @SpecAssertion(section = "2.2.1", id="lb")
})
public void testParameterizedReturnTypeWithWildcard() throws Exception
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -21,7 +21,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProducerMethodDefinitionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -19,7 +19,7 @@
@Artifact
@BeansXml("beans.xml")
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseProducerMethodDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -23,7 +23,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProducerMethodLifecycleTest extends AbstractJSR299Test
{
private AnnotationLiteral<Pet> PET_LITERAL = new AnnotationLiteral<Pet>() {};
@@ -73,7 +73,7 @@
@Test(groups = { "producerMethod" })
@SpecAssertions({
- @SpecAssertion(section = "4.3.2", id = "ab"),
+ //@SpecAssertion(section = "4.3.2", id = "ab"), removed from spec
@SpecAssertion(section = "5.6.6", id = "c"),
@SpecAssertion(section="4.3", id="cb")
})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SimpleBeanDefinitionTest extends AbstractJSR299Test
{
@@ -81,7 +81,7 @@
}
@Test
- @SpecAssertion(section = "3.1.4.1", id = "a")
+ @SpecAssertion(section = "3.7.1", id = "a")
public void testInitializerAnnotatedConstructor() throws Exception
{
Sheep.constructedCorrectly = false;
@@ -91,9 +91,9 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.1.4.1", id = "ba"),
+ @SpecAssertion(section = "3.7.1", id = "ba"),
@SpecAssertion(section = "3.1.3", id = "a"),
- @SpecAssertion(section = "3.1.4", id = "a")
+ @SpecAssertion(section = "3.7", id = "a")
})
public void testEmptyConstructorUsed()
{
@@ -103,7 +103,7 @@
}
@Test
- @SpecAssertion(section = "3.1.4.1", id = "a")
+ @SpecAssertion(section = "3.7.1", id = "a")
public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception
{
getInstanceByType(Turkey.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,11 +11,11 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ConstructorHasObservesParameterTest extends AbstractJSR299Test
{
@Test(groups = { "observerMethod" })
- @SpecAssertion(section = "3.1.4.1", id = "ea")
+ @SpecAssertion(section = "3.7.1", id = "ea")
public void testConstructorHasObservesParameter()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/dependentWithPublicField/DependentWithPublicFieldTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DependentWithPublicFieldTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,12 +11,12 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class TooManyInitializerAnnotatedConstructorsTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "3.1.4.1", id = "ca")
+ @SpecAssertion(section = "3.7.1", id = "ca")
public void testTooManyInitializerAnnotatedConstructor()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -20,7 +20,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NewSimpleBeanTest extends AbstractJSR299Test
{
@@ -30,7 +30,7 @@
@Test(groups = { "new" })
@SpecAssertions({
- @SpecAssertion(section = "3.10", id = "p")
+ @SpecAssertion(section = "3.12", id = "p")
})
public void testNewBeanIsDependentScoped()
{
@@ -41,7 +41,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "r")
+ @SpecAssertion(section = "3.12", id = "r")
public void testNewBeanHasOnlyNewBinding()
{
Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, ExplicitContructorSimpleBean.NEW);
@@ -52,7 +52,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "s")
+ @SpecAssertion(section = "3.12", id = "s")
public void testNewBeanHasNoBeanELName()
{
Set<Bean<ExplicitContructorSimpleBean>> beans = getBeans(ExplicitContructorSimpleBean.class, ExplicitContructorSimpleBean.NEW);
@@ -62,7 +62,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "t")
+ @SpecAssertion(section = "3.12", id = "t")
public void testNewBeanHasNoStereotypes()
{
Bean<Fox> foxBean = getBeans(Fox.class).iterator().next();
@@ -74,7 +74,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "u")
+ @SpecAssertion(section = "3.12", id = "u")
public void testNewBeanHasNoObservers()
{
// As long as only one observer exists here, we know it is not from the @New bean
@@ -82,7 +82,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "w")
+ @SpecAssertion(section = "3.12", id = "w")
public void testNewBeanHasNoProducerFields() throws Exception
{
Fox fox = getInstanceByType(Fox.class);
@@ -93,7 +93,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "v")
+ @SpecAssertion(section = "3.12", id = "v")
public void testNewBeanHasNoProducerMethods() throws Exception
{
Fox fox = getInstanceByType(Fox.class);
@@ -105,7 +105,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "x")
+ @SpecAssertion(section = "3.12", id = "x")
public void testNewBeanHasNoDisposerMethods() throws Exception
{
Fox fox = getInstanceByType(Fox.class);
@@ -119,7 +119,7 @@
}
@Test
- @SpecAssertion(section = "3.10", id = "d")
+ @SpecAssertion(section = "3.12", id = "d")
public void testForEachSimpleBeanANewBeanExists()
{
assert getCurrentManager().getBeans(Order.class).size() == 1;
@@ -141,7 +141,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "f")
+ @SpecAssertion(section = "3.12", id = "f")
public void testNewBeanHasSameConstructor()
{
ExplicitContructorSimpleBean.setConstructorCalls(0);
@@ -152,7 +152,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "g")
+ @SpecAssertion(section = "3.12", id = "g")
public void testNewBeanHasSameInitializers()
{
InitializerSimpleBean.setInitializerCalls(0);
@@ -164,7 +164,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "h")
+ @SpecAssertion(section = "3.12", id = "h")
public void testNewBeanHasSameInjectedFields()
{
Bean<InitializerSimpleBean> simpleBean = getBeans(InitializerSimpleBean.class).iterator().next();
@@ -174,7 +174,7 @@
}
@Test
- @SpecAssertion(section="3.10", id="z")
+ @SpecAssertion(section="3.12", id="z")
public void testNewBeanWithNoMemberValue()
{
assert getInstanceByType(NewLionConsumer.class).getLion() instanceof Lion;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -40,7 +40,7 @@
@Packaging(PackagingType.EAR)
@IntegrationTest
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EjbInjectionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -29,14 +29,14 @@
@Resource(source = "persistence.xml", destination = "WEB-INF/classes/META-INF/persistence.xml")
//@PersistenceXml("persistence.xml")
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PersistenceContextInjectionTest extends AbstractJSR299Test
{
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@SpecAssertions( {
@SpecAssertion(section = "3.5.1", id = "cc"),
- @SpecAssertion(section="7.3.6", id="lb"),
- @SpecAssertion(section="7.3.6", id="mc")
+ @SpecAssertion(section = "7.3.6", id = "lb"),
+ @SpecAssertion(section = "7.3.6", id = "mc")
})
public void testInjectionOfPersistenceContext()
{
@@ -50,8 +50,8 @@
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@SpecAssertions( {
@SpecAssertion(section = "3.5.1", id = "dd"),
- @SpecAssertion(section="7.3.6", id="lc"),
- @SpecAssertion(section="7.3.6", id="me")
+ @SpecAssertion(section = "7.3.6", id = "lc"),
+ @SpecAssertion(section = "7.3.6", id = "me")
})
public void testInjectionOfPersistenceUnit()
{
@@ -64,7 +64,7 @@
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@SpecAssertions( {
- @SpecAssertion(section="7.3.6", id="md")
+ @SpecAssertion(section = "7.3.6", id = "md")
})
public void testPassivationOfPersistenceContext() throws Exception
{
@@ -78,7 +78,7 @@
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@SpecAssertions( {
- @SpecAssertion(section="7.3.6", id="nb")
+ @SpecAssertion(section="7.3.6", id = "nb")
})
public void testDestructionOfPersistenceContext() throws Exception
{
@@ -93,8 +93,8 @@
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@SpecAssertions( {
- @SpecAssertion(section="7.3.6", id="lc"),
- @SpecAssertion(section="7.3.6", id="mf")
+ @SpecAssertion(section = "7.3.6", id = "lc"),
+ @SpecAssertion(section = "7.3.6", id = "mf")
})
public void testPassivationOfPersistenceUnit() throws Exception
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -20,7 +20,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanSpecializationIntegrationTest extends AbstractJSR299Test
{
@@ -38,8 +38,8 @@
}
- @Test
- @SpecAssertion(section="4.3.2", id = "aa")
+ //@Test
+ //@SpecAssertion(section="4.3.2", id = "aa") removed from spec
public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception
{
assert getBeans(Waste.class).size() == 1;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -20,7 +20,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanSpecializationTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DirectlyExtendsSimpleBeanTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,7 +14,7 @@
@ExpectedDeploymentException(DefinitionError.class)
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ImplementsInterfaceAndExtendsNothingTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -16,7 +16,7 @@
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test
{
/**
@@ -26,8 +26,8 @@
* @see TwoSpecializingBeansForOneSpecializedTest#testTwoBeansSpecializeTheSameBean()
*
*/
- @Test
- @SpecAssertion(section = "4.3.3", id = "c")
+ //@Test
+ //@SpecAssertion(section = "4.3.3", id = "c") removed from spec
public void testTwoBeansSpecializeTheSameBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -16,7 +16,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProducerMethodSpecializationTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/indirectOverride/IndirectOverrideTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class IndirectOverrideTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class TwoBeansSpecializeTheSameBeanTest extends AbstractJSR299Test
{
@@ -21,8 +21,8 @@
* @see org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest#testTwoBeansSpecializeTheSameBean()
* @see TwoSpecializingBeansForOneSpecializedTest#testTwoBeansSpecializeTheSameBean()
*/
- @Test
- @SpecAssertion(section = "4.3.3", id = "c")
+ //@Test
+ //@SpecAssertion(section = "4.3.3", id = "c") removed from spec
public void testTwoBeansSpecializeTheSameBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -17,7 +17,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SimpleBeanSpecializationTest extends AbstractJSR299Test
{
@@ -31,7 +31,7 @@
@SpecAssertion(section = "4.3.1", id = "ia"),
@SpecAssertion(section = "4.3.1", id = "ib"),
@SpecAssertion(section = "4.3.1", id = "j"),
- @SpecAssertion(section = "3.1.5", id = "aa")
+ @SpecAssertion(section = "3.1.4", id = "aa")
})
public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
{
@@ -45,7 +45,7 @@
@Test
@SpecAssertions( {
@SpecAssertion(section = "4.3.1", id = "k"),
- @SpecAssertion(section = "3.1.5", id = "aa")
+ @SpecAssertion(section = "3.1.4", id = "aa")
})
public void testSpecializingBeanHasNameOfSpecializedBean()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -14,11 +14,11 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SpecializingBeanExtendsEnterpriseBeanTest extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
- @SpecAssertion(section = "3.1.5", id = "aa")
+ @SpecAssertion(section = "3.1.4", id = "aa")
public void testSpecializingClassDirectlyExtendsEnterpriseBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnly.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,11 +11,11 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SpecializingBeanImplementsInterfaceOnly extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
- @SpecAssertion(section = "3.1.5", id = "da")
+ @SpecAssertion(section = "3.1.4", id = "da")
public void testSpecializingClassImplementsInterfaceAndExtendsNothing()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -47,7 +47,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InterceptorDefinitionTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
@@ -115,7 +115,7 @@
@Test(groups = "ri-broken")
@SpecAssertions({
- @SpecAssertion(section = "11.3.13", id = "a")
+ @SpecAssertion(section = "11.3.12", id = "a")
})
// WBRI-59
public void testResolveInterceptorsReturnsOrderedList()
@@ -136,7 +136,7 @@
@Test(groups = "ri-broken")
@SpecAssertions({
- @SpecAssertion(section = "11.3.13", id = "b")
+ @SpecAssertion(section = "11.3.12", id = "b")
})
// WBRI-59
public void testSameBindingTypesToResolveInterceptorsFails()
@@ -147,7 +147,7 @@
@Test(groups = "ri-broken")
@SpecAssertions({
- @SpecAssertion(section = "11.3.13", id = "c")
+ @SpecAssertion(section = "11.3.12", id = "c")
})
// WBRI-59
public void testNoBindingTypesToResolveInterceptorsFails()
@@ -157,7 +157,7 @@
@Test(groups = "ri-broken")
@SpecAssertions({
- @SpecAssertion(section = "11.3.13", id = "d")
+ @SpecAssertion(section = "11.3.12", id = "d")
})
// WBRI-59
public void testNonBindingTypeToResolveInterceptorsFails()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class InterceptorCanNotBeDecoratorTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec = "cdi", version="1.0.20090625")
+@SpecVersion(spec = "cdi", version="PFD2")
@BeansXml("beans.xml")
public class NonExistantClassInBeansXmlTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec = "cdi", version="1.0.20090625")
+@SpecVersion(spec = "cdi", version="PFD2")
@BeansXml("beans.xml")
public class NonInterceptorClassInBeansXmlTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec = "cdi", version="1.0.20090625")
+@SpecVersion(spec = "cdi", version="PFD2")
@BeansXml("beans.xml")
public class SameClassListedTwiceInBeansXmlTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -13,7 +13,7 @@
@IntegrationTest
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SessionBeanInterceptorDefinitionTest extends AbstractJSR299Test
{
@Test(groups="ri-broken")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -7,7 +7,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InterceptorCalledBeforeDecoratorTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorNotListedInBeansXml/InterceptorNotListedInBeansXmlNotEnabledTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -8,7 +8,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class InterceptorNotListedInBeansXmlNotEnabledTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class MultipleInterceptorBindingsTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class BindingAnnotationWithMemberTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class BindingAnnotationWithMemberTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -30,7 +30,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ResolutionByNameTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -27,7 +27,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DuplicateNameResolutionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -23,7 +23,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class CircularDependencyTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -29,7 +29,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ClientProxyTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -30,7 +30,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ArrayTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class FinalClassTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class UnproxyableTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class UnsatisfiedDependencyTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -40,7 +40,7 @@
* @author Jozef Hartinger
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DynamicLookupTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -28,7 +28,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ResolutionByNameTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -9,7 +9,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InjectionTest extends AbstractJSR299Test
{
@Test(groups = { "injection", "producerMethod" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/AnyInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/AnyInjectionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/any/AnyInjectionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -23,7 +23,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AnyInjectionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -29,7 +29,7 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SessionBeanInjectionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -30,7 +30,7 @@
@Artifact
@IntegrationTest(runLocally = true)
@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InjectionIntoWebServiceEndPointTest extends AbstractJSR299Test
{
@WebServiceRef(wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.con...")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -46,7 +46,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InjectionPointTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -36,7 +36,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AmbiguousInjectableReferenceTest extends AbstractJSR299Test
{
@SuppressWarnings("unchecked")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -11,7 +11,7 @@
@Artifact
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ManagerTest extends AbstractJSR299Test
{
@Test(groups = { "manager", "ejb3", "integration", "jboss-as-broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/primitive/PrimitiveInjectionPointTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PrimitiveInjectionPointTest extends AbstractJSR299Test
{
@Test(groups={"resolution", "producerMethod"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class TypeVariableInjectionPointTest extends AbstractJSR299Test
{
@Test(groups = { "resolution"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -31,7 +31,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AssignabilityOfRawAndParameterizedTypesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/NoClassWithSpecifiedNameTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -28,12 +28,12 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NoClassWithSpecifiedNameTest extends AbstractJSR299Test
{
@Test(groups = { "policy" })
- @SpecAssertion(section="5.2", id="h")
+ @SpecAssertion(section="5.2.1", id="h")
public void test()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-09-25 01:08:37 UTC (rev 3780)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-09-25 02:31:37 UTC (rev 3781)
@@ -28,7 +28,7 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ClassIsNotPolicyTest extends AbstractJSR299Test
{
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3780 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/application and 103 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-09-24 21:08:37 -0400 (Thu, 24 Sep 2009)
New Revision: 3780
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java
Log:
update test mappings to PFD2
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -22,7 +22,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NormalContextTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -22,7 +22,7 @@
@Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"),
@Resource(destination="SimplePage.html", source="SimplePage.html")
})
-@SpecVersion(spec = "cdi", version="1.0.20090625")
+@SpecVersion(spec = "cdi", version="PFD2")
public class ApplicationContextTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/ApplicationContextSharedTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -17,7 +17,7 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ApplicationContextSharedTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -17,7 +17,7 @@
* @author Nicklas Karlsson
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ConversationContextTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -24,7 +24,7 @@
@Resource(destination="clouds.jspx", source="clouds.jsf"),
@Resource(destination="cloud.jspx", source="cloud.jsf")
})
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InvalidatingSessionDestroysConversationTest extends AbstractConversationTest
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -29,7 +29,7 @@
@Resource(destination="thunder.jspx", source="thunder.jsf"),
@Resource(destination="lightening.jspx", source="lightening.jsf")
})
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class LongRunningConversationPropagatedByFacesContextTest extends AbstractConversationTest
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -29,7 +29,7 @@
@Resource(destination="clouds.jspx", source="clouds.jsf"),
@Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml")
})
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ManualCidPropagationTest extends AbstractConversationTest
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -32,7 +32,7 @@
@IntegrationTest
@Packaging(PackagingType.EAR)
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DependentContextEjbTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInDecorator/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -13,7 +13,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/finalProducerFieldNotPassivationCapable/NonPassivationCapableProducerFieldTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -17,7 +17,7 @@
*/
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@ExpectedDeploymentException(DeploymentError.class)
public class NonPassivationCapableProducerFieldTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonPassivatingDecorator/ManagedBeanWithNonPassivatingDecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class ManagedBeanWithNonPassivatingDecoratorTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableManagedBeanHasPassivatingScope/NonPassivationManagedBeanHasPassivatingScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -17,7 +17,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NonPassivationManagedBeanHasPassivatingScopeTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivationCapableProducerMethod/NonPassivationCapableProducerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -17,7 +17,7 @@
*/
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@ExpectedDeploymentException(DeploymentError.class)
public class NonPassivationCapableProducerMethodTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingBeanConstructor/PassivatingManagedBeanWithNonPassivatingBeanConstructorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PassivatingManagedBeanWithNonPassivatingBeanConstructorTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivatingManagedBeanWithNonPassivatingInitializerMethod/PassivatingManagedBeanWithNonPassivatingInitializerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PassivatingManagedBeanWithNonPassivatingInitializerMethodTest extends AbstractJSR299Test
{
@Test(groups = { "contexts", "passivation" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -19,7 +19,7 @@
@Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"),
@Resource(destination="SimplePage.html", source="SimplePage.html")
})
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class RequestContextTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -17,7 +17,7 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EJBRequestContextTest extends AbstractJSR299Test
{
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -31,7 +31,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnabledDecoratorNotADecoratorTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -32,7 +32,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class FinalBeanMethodTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -14,7 +14,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NonDecoratorWithDecoratesTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -32,7 +32,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NotAllDecoratedTypesImplementedTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/broken/delegateProducerMethod/DelegateInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -32,7 +32,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@ExpectedDeploymentException(DefinitionError.class)
public class DelegateInjectionPointTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -30,7 +30,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DelegateFieldInjectionPointTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class StereoTypeWithBindingTypesTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -35,7 +35,7 @@
*/
@Artifact
@Test
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
@Resources({
@Resource(source="javax.enterprise.inject.spi.Extension.DeploymentTest", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -37,7 +37,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension.ExtensionsTest", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ExtensionsTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -26,7 +26,7 @@
// Must be an integration test as it needs a resource copied to a folder
@IntegrationTest
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AddDefinitionErrorTest extends AbstractJSR299Test
{
@Test(groups={"jboss-as-broken", "rewrite"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -17,7 +17,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test
{
@Test(groups={"jboss-as-broken", "rewrite"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -34,7 +34,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test
{
@Test(groups={"jboss-as-broken", "rewrite"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringBeanDiscovery/DeploymentFailureTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -14,7 +14,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DeploymentFailureTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/passivatingScope/AddingPassivatingScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -36,7 +36,7 @@
})
@IntegrationTest
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AddingPassivatingScopeTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -43,7 +43,7 @@
// We put Foo in the ejb jar, but Bar goes in the library
@Classes({LibraryInEarTest.class, Foo.class})
@Test
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@IntegrationTest
@Packaging(PackagingType.EAR)
public class LibraryInEarTest extends AbstractJSR299Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -41,7 +41,7 @@
// We put Foo in the ejb jar, but Bar goes in the library
@Classes({LibraryInWarTest.class, Foo.class})
@Test
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@IntegrationTest
public class LibraryInWarTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -45,7 +45,7 @@
// We put Foo in the ejb jar, but Bar goes in the library
@Classes({WarInstalledLibraryTest.class, Foo.class})
@Test
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@IntegrationTest
public class WarInstalledLibraryTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -22,7 +22,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EventTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
@@ -30,7 +30,7 @@
@SpecAssertion(section = "10.4.3", id = "a"),
@SpecAssertion(section = "5.6.8", id = "c"),
@SpecAssertion(section = "2.3.5", id = "ca"),
- @SpecAssertion(section = "3.9", id = "a")
+ @SpecAssertion(section = "3.10", id = "a")
})
public void testObserverMethodReceivesInjectionsOnNonObservesParameters()
{
@@ -64,7 +64,7 @@
@Test(groups = { "events" })
@SpecAssertions({
- @SpecAssertion(section = "4.3.2", id = "d"),
+ //@SpecAssertion(section = "4.3.2", id = "d"),
@SpecAssertion(section="4.3", id="cb"),
@SpecAssertion(section = "5.6.8", id = "ba")
})
@@ -76,7 +76,7 @@
}
@Test(groups = { "events" }, expectedExceptions = IllegalArgumentException.class)
- @SpecAssertion(section = "11.3.11", id = "c")
+ @SpecAssertion(section = "11.3.10", id = "c")
public <T> void testEventObjectContainsTypeVariablesWhenResolvingFails()
{
eventObjectContainsTypeVariables(new ArrayList<T>());
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DependentIsConditionalObserverTest extends AbstractJSR299Test
{
// WBRI-315
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -34,7 +34,7 @@
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ObserverMethodAnnotatedDisposesTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -36,7 +36,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EJBObserverMethodNotBusinessMethodTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -7,11 +7,11 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NonBindingTypePassedToFireTest extends AbstractJSR299Test
{
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertion(section = "11.3.10", id = "e")
+ @SpecAssertion(section = "11.3.9", id = "e")
public void testExceptionThrownIfNonBindingTypePassedToFire() throws Exception
{
OwlFinch_Broken bean = getInstanceByType(OwlFinch_Broken.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -22,7 +22,7 @@
* @author Dan Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ImplicitEventTest extends AbstractJSR299Test
{
private static final TypeLiteral<Event<StudentRegisteredEvent>> STUDENT_REGISTERED_EVENT_LITERAL = new TypeLiteral<Event<StudentRegisteredEvent>>() {};
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ObserverExceptionAbortsProcessingTest extends AbstractJSR299Test
{
public static class AnEventType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -31,7 +31,7 @@
* @author David Allen
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class CheckedExceptionWrappedTest extends AbstractJSR299Test
{
@Test(groups = { "events" }, expectedExceptions = { ObserverException.class })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -13,7 +13,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ConditionalObserverTest extends AbstractJSR299Test
{
@Test(groups = { "events" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DuplicateBindingTypesWhenResolvingTest extends AbstractJSR299Test
{
public static class AnEventType
@@ -27,7 +27,7 @@
}
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertion(section = "11.3.11", id = "d")
+ @SpecAssertion(section = "11.3.10", id = "d")
public void testDuplicateBindingTypesWhenResolvingFails()
{
getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeABinding(), new BindingTypeABinding());
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -10,7 +10,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ResolvingChecksBindingTypeMembersTest extends AbstractJSR299Test
{
public static class AnEventType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NonBindingTypesWhenResolvingTest extends AbstractJSR299Test
{
public static class AnEventType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class CheckTypeParametersWhenResolvingObserversTest extends AbstractJSR299Test
{
public static class CharacterList extends ArrayList<Character>
@@ -53,7 +53,7 @@
@Test(groups = { "events" })
@SpecAssertions({
@SpecAssertion(section = "10.4.1", id = "a"),
- @SpecAssertion(section = "11.3.11", id = "a")
+ @SpecAssertion(section = "11.3.10", id = "a")
})
public void testResolvingChecksTypeParameters()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ChecksEventTypeWhenResolvingTest extends AbstractJSR299Test
{
public static class AnEventType
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/AlternativeMetaDataTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -37,7 +37,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AlternativeMetaDataTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -40,7 +40,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProcessAnnotatedTypeEventThrowsExceptionTest extends AbstractJSR299Test
{
@Test(groups="ri-broken")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/BeanByTypeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -39,7 +39,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class BeanByTypeTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -40,7 +40,7 @@
@Resource(source="javax.enterprise.inject.spi.Extension", destination="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension")
})
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProcessObserverMethodExceptionTest
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -29,7 +29,7 @@
})
// Must be an integration test as it needs a resource copied to a folder
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
// TODO All tests fall under WBRI-345 for now, please create new issues for any failing tests after WBRI-345 is done
public class ProducerTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -25,7 +25,7 @@
// Must be an integration test as it needs a resource copied to a folder
@IntegrationTest
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InjectionTargetDefinitionErrorTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -13,7 +13,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -16,7 +16,7 @@
@ExpectedDeploymentException(DefinitionError.class)
@IntegrationTest
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DisposalMethodOnSessionBean extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -14,7 +14,7 @@
@ExpectedDeploymentException(DefinitionError.class)
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SingletonWithConversationScopeTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class StatelessWithConversationScopeTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class StatelessWithSessionScopeTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -39,7 +39,7 @@
@Packaging(PackagingType.EAR)
@IntegrationTest
@EjbJarXml("ejb-jar.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanViaXmlTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -22,7 +22,7 @@
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NewEnterpriseBeanTest extends AbstractJSR299Test
{
private Bean<WrappedEnterpriseBeanLocal> newEnterpriseBean;
@@ -30,7 +30,7 @@
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "p")
+ @SpecAssertion(section = "3.12", id = "p")
public void testNewBeanIsDependentScoped()
{
Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, WrappedEnterpriseBeanLocal.NEW);
@@ -40,7 +40,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "r")
+ @SpecAssertion(section = "3.12", id = "r")
public void testNewBeanIsHasOnlyNewBinding()
{
Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, WrappedEnterpriseBeanLocal.NEW);
@@ -51,7 +51,7 @@
}
@Test(groups = { "new" })
- @SpecAssertion(section = "3.10", id = "s")
+ @SpecAssertion(section = "3.12", id = "s")
public void testNewBeanHasNoBeanELName()
{
Set<Bean<WrappedEnterpriseBeanLocal>> beans = getBeans(WrappedEnterpriseBeanLocal.class, WrappedEnterpriseBeanLocal.NEW);
@@ -61,7 +61,7 @@
}
@Test(groups = { "new"})
- @SpecAssertion(section = "3.10", id = "t")
+ @SpecAssertion(section = "3.12", id = "t")
public void testNewBeanHasNoStereotypes()
{
Bean<MonkeyLocal> monkeyBean = getBeans(MonkeyLocal.class).iterator().next();
@@ -73,7 +73,7 @@
}
@Test(groups = {"new" })
- @SpecAssertion(section = "3.10", id = "u")
+ @SpecAssertion(section = "3.12", id = "u")
public void testNewBeanHasNoObservers()
{
// Should just be 1 observer from bean, not new bean
@@ -82,7 +82,7 @@
@Test
@SpecAssertions({
- @SpecAssertion(section="3.10", id = "j")
+ @SpecAssertion(section="3.12", id = "j")
})
public void testForEachEnterpriseBeanANewBeanExists()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -20,7 +20,7 @@
@Artifact
@Packaging(EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnterpriseBeanRemoveMethodTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/EjbInitializerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -13,12 +13,12 @@
@Artifact
@Packaging(PackagingType.EAR)
@IntegrationTest
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EjbInitializerMethodTest extends AbstractJSR299Test
{
@Test(groups = { "initializerMethod", "ejb3" })
@SpecAssertions({
- @SpecAssertion(section = "3.8", id = "e")
+ @SpecAssertion(section = "3.9", id = "e")
})
// This DOES NOT TEST initializer methods on Java EE component classes PLM
public void testInitializerMethodNotABusinessMethod()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/InitializerMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,13 +11,13 @@
@Artifact
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InitializerMethodTest extends AbstractJSR299Test
{
@Test(groups = { "initializerMethod" })
@SpecAssertions({
- @SpecAssertion(section = "3.8.2", id = "b"),
+ @SpecAssertion(section = "3.9.2", id = "b"),
@SpecAssertion(section = "2.3.5", id = "b")
})
public void testBindingTypeOnInitializerParameter()
@@ -30,11 +30,11 @@
@Test(groups = { "initializerMethod" })
@SpecAssertions({
- @SpecAssertion(section = "3.8", id = "g"),
- @SpecAssertion(section = "3.8.1", id = "a"),
- @SpecAssertion(section = "3.8.2", id = "aa"),
+ @SpecAssertion(section = "3.9", id = "g"),
+ @SpecAssertion(section = "3.9.1", id = "a"),
+ @SpecAssertion(section = "3.9.2", id = "aa"),
@SpecAssertion(section = "5.6.4", id = "b"),
- @SpecAssertion(section = "3.9", id = "a")
+ @SpecAssertion(section = "3.10", id = "a")
})
public void testMultipleInitializerMethodsAreCalled()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,13 +11,11 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ParameterAnnotatedDisposesTest extends AbstractJSR299Test
-{
-
-
+{
@Test(groups = "initializerMethod")
- @SpecAssertion(section = "3.8.1", id = "ca")
+ @SpecAssertion(section = "3.9.1", id = "ca")
public void testInitializerMethodHasParameterAnnotatedDisposes()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/initializer/staticInitializer/StaticInitializerTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,12 +11,12 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class StaticInitializerTest extends AbstractJSR299Test
{
@Test(groups = "initializerMethod")
- @SpecAssertion(section = "3.8", id = "aa")
+ @SpecAssertion(section = "3.9", id = "aa")
public void testStaticInitializerMethodNotAllowed()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -18,7 +18,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProducerFieldDefinitionTest extends AbstractJSR299Test
{
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
@@ -143,7 +143,7 @@
@Test(groups = "producerField")
@SpecAssertions({
@SpecAssertion(section = "3.4.2", id = "c"),
- @SpecAssertion(section="2.5.1", id = "c")
+ @SpecAssertion(section = "2.5.1", id = "c")
})
public void testNamedField()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -15,7 +15,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ProducerMethodNotBusinessMethodTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/ParameterizedTypeWithTypeParameterTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -12,7 +12,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ParameterizedTypeWithTypeParameterTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -12,12 +12,12 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test
{
@Test(groups = { "disposalMethod" })
@SpecAssertions({
- @SpecAssertion(section = "3.1.4.1", id = "da"),
+ @SpecAssertion(section = "3.7.1", id = "da"),
@SpecAssertion(section = "12.2", id="db"),
@SpecAssertion(section = "12.4", id= "a")
})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -23,7 +23,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SimpleBeanLifecycleTest extends AbstractJSR299Test
{
private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>()
@@ -32,8 +32,8 @@
@Test(groups = "beanConstruction")
@SpecAssertions({
- @SpecAssertion(section = "3.1.4.2", id = "b"),
- @SpecAssertion(section = "3.1.4.2", id = "c"),
+ @SpecAssertion(section = "3.7.2", id = "b"),
+ @SpecAssertion(section = "3.7.2", id = "c"),
@SpecAssertion(section = "2.3.5", id = "d"),
@SpecAssertion(section = "5.6.3", id = "a")
})
@@ -75,7 +75,7 @@
}
@Test
- @SpecAssertion(section = "3.1.4.2", id = "b")
+ @SpecAssertion(section = "3.7.2", id = "b")
public void testBindingTypeAnnotatedConstructor()
{
getInstanceByType(Duck.class);
@@ -84,8 +84,7 @@
@Test(groups = { "specialization" })
@SpecAssertions({
- @SpecAssertion(section = "3.1.5", id = "aa"),
- @SpecAssertion(section = "11.3.6", id = "a")
+ @SpecAssertion(section = "3.1.4", id = "aa")
})
public void testSpecializedBeanExtendsManagedBean()
{
@@ -166,10 +165,10 @@
@Test(groups = "injection")
@SpecAssertions({
@SpecAssertion(section = "7.3.1", id = "aa"),
- @SpecAssertion(section = "3.7.1", id = "a"),
+ @SpecAssertion(section = "3.8.1", id = "a"),
@SpecAssertion(section="2.3.4", id="a"),
- @SpecAssertion(section="3.7", id="aa"),
- @SpecAssertion(section="3.7", id="ab"),
+ @SpecAssertion(section="3.8", id="aa"),
+ @SpecAssertion(section="3.8", id="ab"),
@SpecAssertion(section="12.1", id="bca")
})
public void testCreateInjectsFieldsDeclaredInJava()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(UnproxyableResolutionException.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class UnproxyableManagedBeanTest extends AbstractJSR299Test
{
@Test(groups = { "contexts" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -42,7 +42,7 @@
@IntegrationTest
@Resource(source="web.xml", destination="/WEB-INF/web.xml")
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class EnvInjectionTest extends AbstractJSR299Test
{
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -20,7 +20,7 @@
@Packaging(PackagingType.WAR)
@IntegrationTest
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InjectionOfResourceTest extends AbstractJSR299Test
{
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -14,7 +14,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DirectlyExtendsNothingTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/broken/sameName/SameNameTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -16,7 +16,7 @@
@ExpectedDeploymentException(DefinitionError.class)
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SameNameTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializesStaticMethod/SpecializesStaticMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SpecializesStaticMethodTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SpecializingAndSpecializedBeanHasNameTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,11 +11,11 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SpecializingBeanExtendsNothingTest extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
- @SpecAssertion(section = "3.1.5", id = "da")
+ @SpecAssertion(section = "3.1.4", id = "da")
public void testSpecializingClassDirectlyExtendsNothing()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,11 +11,11 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SpecializingClassExtendsNonSimpleBeanTest extends AbstractJSR299Test
{
@Test(groups = { "specialization" })
- @SpecAssertion(section = "3.1.5", id = "da")
+ @SpecAssertion(section = "3.1.4", id = "da")
public void testSpecializingClassExtendsNonSimpleBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/broken/two/TwoSpecializingBeansForOneSpecializedTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -11,7 +11,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class TwoSpecializingBeansForOneSpecializedTest extends AbstractJSR299Test
{
/**
@@ -21,8 +21,8 @@
* @see org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.twoBeansSpecializeTheSameBean.TwoBeansSpecializeTheSameBeanTest#testTwoBeansSpecializeTheSameBean()
*
*/
- @Test
- @SpecAssertion(section="4.3.3", id = "c")
+ //@Test
+ //@SpecAssertion(section="4.3.3", id = "c") section removed from spec
public void testTwoBeansSpecializeTheSameBean()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/interceptorWithNoBinding/InterceptorWithNoBindingTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -14,7 +14,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InterceptorWithNoBindingTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/InvalidInterceptorBindingAnnotationsTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class InvalidInterceptorBindingAnnotationsTest
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec = "cdi", version="1.0.20090625")
+@SpecVersion(spec = "cdi", version="PFD2")
public class InvalidLifecycleInterceptorTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -9,7 +9,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
@BeansXml("beans.xml")
public class InterceptorOrderTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/duplicatePrefixResolution/DuplicateNamePrefixResolutionTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -27,7 +27,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DuplicateNamePrefixResolutionTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FinalMethodTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class FinalMethodTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -30,7 +30,7 @@
*/
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PrivateConstructorTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class AmbiguousDependencyTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -32,7 +32,7 @@
* Tests for built-in Instance.
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class BuiltinInstanceTest extends AbstractJSR299Test {
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -35,7 +35,7 @@
@Resource(destination = "WEB-INF/faces-config.xml", source = "faces-config.xml"),
@Resource(destination = "JSFTestPage.jsp", source = "JSFTestPage.jsp"),
@Resource(destination = "JSPTestPage.jsp", source = "JSPTestPage.jsp")})
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class IntegrationWithUnifiedELTest extends AbstractJSR299Test
{
@Test(groups = {"el" } )
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -38,7 +38,7 @@
@Resource(destination = "WEB-INF/TestLibrary.tld", source = "TestLibrary.tld"),
@Resource(destination = "TagPage.jsp", source = "TagPage.jsp"),
@Resource(destination = "ManagedBeanTestPage.jsp", source = "ManagedBeanTestPage.jsp")})
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InjectionIntoNonContextualComponentTest extends AbstractJSR299Test
{
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -10,7 +10,7 @@
@Artifact
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NullableBeanTest extends AbstractJSR299Test
{
@Test(groups = { "injection", "producerMethod" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectableReferenceTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -40,7 +40,7 @@
*/
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InjectableReferenceTest extends AbstractJSR299Test
{
@SuppressWarnings("unchecked")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -26,7 +26,7 @@
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NormalScopedBeanWithInjectionPoint extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -36,7 +36,7 @@
*
*/
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class UnsatisfiedInjectableReferenceTest extends AbstractJSR299Test
{
@SuppressWarnings("unchecked")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -15,7 +15,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ManagerTest extends AbstractJSR299Test
{
@Test(groups={"manager", "injection", "deployment"})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -36,7 +36,7 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ResolutionByTypeTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/DecoratorNotResolvedTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -31,7 +31,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class DecoratorNotResolvedTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -31,7 +31,7 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class InterceptorNotResolvedTest extends AbstractJSR299Test
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -33,15 +33,15 @@
@Artifact
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class PolicyAvailabilityTest extends AbstractJSR299Test
{
@Test(groups = {"policy"})
@SpecAssertions( {
@SpecAssertion(section = "5.2", id = "b"),
- @SpecAssertion(section = "5.2", id = "c"),
- @SpecAssertion(section = "5.2", id = "ea"),
+ @SpecAssertion(section = "5.2.1", id = "c"),
+ @SpecAssertion(section = "5.2.1", id = "ea"),
@SpecAssertion(section = "2.6", id = "a"),
@SpecAssertion(section = "2.6.1", id = "a"),
@SpecAssertion(section = "12.3", id = "ka")
@@ -65,7 +65,7 @@
@Test(groups = {"policy"})
@SpecAssertions({
- @SpecAssertion(section = "5.2", id = "g"),
+ @SpecAssertion(section = "5.2.1", id = "g"),
@SpecAssertion(section = "2.6.1", id = "b"),
@SpecAssertion(section = "2.7", id = "aa"),
@SpecAssertion(section = "2.7.1.4", id="a")
@@ -78,7 +78,7 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "5.2", id = "fa"),
+ @SpecAssertion(section = "5.2.1", id = "fa"),
@SpecAssertion(section = "2.6.1", id = "e")
})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -28,12 +28,12 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class NoAnnotationWithSpecifiedNameTest extends AbstractJSR299Test
{
@Test(groups = { "policy"})
- @SpecAssertion(section="5.2", id="i")
+ @SpecAssertion(section="5.2.1", id="i")
public void test()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/ClassIsNotPolicyTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -28,12 +28,12 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class ClassIsNotPolicyTest extends AbstractJSR299Test
{
@Test(groups = { "policy" })
- @SpecAssertion(section="5.2", id="h")
+ @SpecAssertion(section="5.2.1", id="h")
public void test()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/same/type/twice/SameTypeListedTwiceTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -28,12 +28,12 @@
@Artifact
@BeansXml("beans.xml")
@ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SameTypeListedTwiceTest extends AbstractJSR299Test
{
@Test(groups = { "policy" })
- @SpecAssertion(section="5.2", id="j")
+ @SpecAssertion(section="5.2.1", id="j")
public void test()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java 2009-09-24 20:17:43 UTC (rev 3779)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/enterprise/SessionBeanPolicyTest.java 2009-09-25 01:08:37 UTC (rev 3780)
@@ -30,12 +30,12 @@
@Packaging(PackagingType.EAR)
@IntegrationTest
@BeansXml("beans.xml")
-@SpecVersion(spec="cdi", version="1.0.20090625")
+@SpecVersion(spec="cdi", version="PFD2")
public class SessionBeanPolicyTest extends AbstractJSR299Test
{
@Test(groups = { "policy"})
- @SpecAssertion(section = "5.2", id = "eb")
+ @SpecAssertion(section = "5.2.1", id = "eb")
public void testEnabledPolicyAvailable()
{
assert getBeans(EjbInterface.class).size() == 1;
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3779 - examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-09-24 16:17:43 -0400 (Thu, 24 Sep 2009)
New Revision: 3779
Removed:
examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF/beans.xml
Log:
remove beans.xml workaround for WBINT-28
Deleted: examples/trunk/jsf/translator/war/src/main/webapp/WEB-INF/beans.xml
===================================================================
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3778 - examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple.
by webbeans-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-09-24 07:17:35 -0400 (Thu, 24 Sep 2009)
New Revision: 3778
Modified:
examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java
examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java
Log:
Updated to latest changes in SE module
Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java
===================================================================
--- examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java 2009-09-24 10:44:54 UTC (rev 3777)
+++ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java 2009-09-24 11:17:35 UTC (rev 3778)
@@ -22,7 +22,6 @@
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
-
import org.jboss.webbeans.environment.se.bindings.Parameters;
/**
@@ -34,21 +33,24 @@
public class CommandLineArgsValidator
{
- @Inject
- @Parameters
- private List<String> validParams;
- private List<String> errors = new ArrayList<String>();
+ @Inject
+ private @Parameters List<String> validParams;
+ private List<String> errors = new ArrayList<String>();
- @Inject
- public void checkParameters()
- {
- if (validParams.size() != 1)
- {
- errors.add("Please supply just one parameter: your first name");
- validParams = Collections.EMPTY_LIST;
- }
- }
+ public CommandLineArgsValidator()
+ {
+ }
+ @Inject
+ public void checkParameters()
+ {
+ if (validParams.size() != 1)
+ {
+ errors.add( "Please supply just one parameter: your first name" );
+ validParams = Collections.EMPTY_LIST;
+ }
+ }
+
public boolean hasErrors()
{
return !this.errors.isEmpty();
Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java
===================================================================
--- examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java 2009-09-24 10:44:54 UTC (rev 3777)
+++ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java 2009-09-24 11:17:35 UTC (rev 3778)
@@ -16,33 +16,39 @@
*/
package org.jboss.webbeans.environment.se.example.simple;
+import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.inject.Inject;
+import org.jboss.webbeans.environment.se.events.ContainerInitialized;
+import javax.inject.Inject;
/**
* @author Peter Royle
*/
+@ApplicationScoped
public class HelloWorld
{
- @Inject
- CommandLineArgsValidator argsVlidator;
+ @Inject
+ CommandLineArgsValidator argsValidator;
- /**
- * Prints a hello message using the first name.
- *
- * @param firstName The first name.
- */
- public void printHello(@Observes AfterDeploymentValidation after)
- {
- if (!argsVlidator.hasErrors())
- {
- System.out.println("Hello " + argsVlidator.getValidParameters().get(0));
- }
- else
- {
- System.out.println("Please provide just one argument: your first name");
- }
- }
+ public HelloWorld()
+ {
+ }
+
+ /**
+ * Prints a hello message using the first name.
+ * @param firstName The first name.
+ */
+ public void printHello( @Observes ContainerInitialized init )
+ {
+ if (!argsValidator.hasErrors())
+ {
+ System.out.println( "Hello " + argsValidator.getValidParameters().get( 0 ) );
+ } else
+ {
+ System.out.println( "Please provide just one argument: your first name" );
+ }
+ }
+
}
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3777 - in extensions/trunk/se/src: main/java/org/jboss/webbeans/environment/se/events and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-09-24 06:44:54 -0400 (Thu, 24 Sep 2009)
New Revision: 3777
Added:
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/ContainerInitialized.java
extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/InitObserverTestBean.java
Modified:
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java
extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java
extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java
Log:
Added SE-specific application initialisation event - ContainerInitialized.
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-09-23 22:08:02 UTC (rev 3776)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-09-24 10:44:54 UTC (rev 3777)
@@ -24,6 +24,7 @@
import org.jboss.webbeans.context.api.BeanStore;
import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
import org.jboss.webbeans.environment.se.discovery.SEWebBeansDeployment;
+import org.jboss.webbeans.environment.se.events.ContainerInitialized;
import org.jboss.webbeans.environment.se.util.Reflections;
import org.jboss.webbeans.environment.se.util.WebBeansManagerUtils;
import org.jboss.webbeans.manager.api.WebBeansManager;
@@ -73,6 +74,8 @@
WebBeansManagerUtils.getInstanceByType(manager, ShutdownManager.class).setBootstrap(bootstrap);
bootstrap.validateBeans();
bootstrap.endInitialization();
+
+ this.manager.fireEvent(new ContainerInitialized());
return this.manager;
}
Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/ContainerInitialized.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/ContainerInitialized.java (rev 0)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/ContainerInitialized.java 2009-09-24 10:44:54 UTC (rev 3777)
@@ -0,0 +1,28 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.webbeans.environment.se.events;
+
+/**
+ * The event that is fired when the WebBeans CDI container is initialized and
+ * ready for applications to take control, which it may do by observing this
+ * event.
+ *
+ * @author Peter Royle
+ */
+public class ContainerInitialized {
+
+}
Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java 2009-09-23 22:08:02 UTC (rev 3776)
+++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java 2009-09-24 10:44:54 UTC (rev 3777)
@@ -22,6 +22,7 @@
import org.jboss.webbeans.environment.se.StartMain;
import org.jboss.webbeans.environment.se.events.Shutdown;
import org.jboss.webbeans.environment.se.test.beans.CustomEvent;
+import org.jboss.webbeans.environment.se.test.beans.InitObserverTestBean;
import org.jboss.webbeans.environment.se.test.beans.MainTestBean;
import org.jboss.webbeans.environment.se.test.beans.ObserverTestBean;
import org.jboss.webbeans.environment.se.test.beans.ParametersTestBean;
@@ -88,13 +89,17 @@
@Test
public void testObservers()
{
+ InitObserverTestBean.reset();
ObserverTestBean.reset();
-
+
BeanManager manager = new StartMain(ARGS_EMPTY).go();
manager.fireEvent(new CustomEvent());
-
+
Assert.assertTrue(ObserverTestBean.isBuiltInObserved());
Assert.assertTrue(ObserverTestBean.isCustomObserved());
+ Assert.assertTrue(ObserverTestBean.isInitObserved());
+
+ Assert.assertTrue(InitObserverTestBean.isInitObserved());
}
private void shutdownManager(BeanManager manager)
Added: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/InitObserverTestBean.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/InitObserverTestBean.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/InitObserverTestBean.java 2009-09-24 10:44:54 UTC (rev 3777)
@@ -0,0 +1,57 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.webbeans.environment.se.test.beans;
+
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+import org.jboss.webbeans.environment.se.events.ContainerInitialized;
+
+/**
+ * Tests the observing of both built-in and application-specific events.
+ *
+ * @author Peter Royle
+ */
+public class InitObserverTestBean
+{
+
+ private static boolean initObserved = false;
+
+ @Inject MainTestBean bean;
+
+ public InitObserverTestBean()
+ {
+ }
+
+ public void observeInitEvent(@Observes ContainerInitialized event) {
+ initObserved = true;
+ assert this.bean != null;
+ }
+
+ public static void reset()
+ {
+ initObserved = false;
+ }
+
+ /**
+ * @return
+ */
+ public static boolean isInitObserved()
+ {
+ return initObserved;
+ }
+
+}
Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java 2009-09-23 22:08:02 UTC (rev 3776)
+++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java 2009-09-24 10:44:54 UTC (rev 3777)
@@ -16,10 +16,11 @@
*/
package org.jboss.webbeans.environment.se.test.beans;
-import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.Extension;
+import javax.inject.Inject;
+import org.jboss.webbeans.environment.se.events.ContainerInitialized;
/**
* Tests the observing of both built-in and application-specific events.
@@ -31,7 +32,10 @@
private static boolean builtInObserved = false;
private static boolean customObserved = false;
+ private static boolean initObserved = false;
+ @Inject MainTestBean bean;
+
public ObserverTestBean()
{
}
@@ -39,17 +43,26 @@
public void observeBuiltInEvent(@Observes AfterDeploymentValidation after)
{
builtInObserved = true;
+ assert this.bean == null;
}
public void observeCustomEvent(@Observes CustomEvent event)
{
customObserved = true;
+ assert this.bean != null;
}
+
+ public void observeInitEvent(@Observes ContainerInitialized event)
+ {
+ initObserved = true;
+ assert this.bean != null;
+ }
public static void reset()
{
customObserved = false;
builtInObserved = false;
+ initObserved = false;
}
/**
@@ -68,4 +81,12 @@
return customObserved;
}
+ /**
+ * @return
+ */
+ public static boolean isInitObserved()
+ {
+ return initObserved;
+ }
+
}
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3776 - in ri/trunk/tests: src/test/java/org/jboss/webbeans/test/unit/decorator/simple and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-09-23 18:08:02 -0400 (Wed, 23 Sep 2009)
New Revision: 3776
Modified:
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java
ri/trunk/tests/unit-tests.xml
Log:
WBRI-390
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java 2009-09-23 22:00:04 UTC (rev 3775)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator1.java 2009-09-23 22:08:02 UTC (rev 3776)
@@ -53,6 +53,6 @@
public int echo3(int i)
{
echo3 = true;
- return delegate.echo1(i);
+ return delegate.echo3(i);
}
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java 2009-09-23 22:00:04 UTC (rev 3775)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/decorator/simple/SimpleDecorator2.java 2009-09-23 22:08:02 UTC (rev 3776)
@@ -47,12 +47,12 @@
public int echo2(int i)
{
echo2 = true;
- return delegate.echo1(i);
+ return delegate.echo2(i);
}
public int echo3(int i)
{
echo3 = true;
- return delegate.echo1(i);
+ return delegate.echo3(i);
}
}
Modified: ri/trunk/tests/unit-tests.xml
===================================================================
--- ri/trunk/tests/unit-tests.xml 2009-09-23 22:00:04 UTC (rev 3775)
+++ ri/trunk/tests/unit-tests.xml 2009-09-23 22:08:02 UTC (rev 3776)
@@ -56,6 +56,7 @@
<package name="org.jboss.webbeans.test.unit.manager" />
<package name="org.jboss.webbeans.test.unit.noncontextual" />
<package name="org.jboss.webbeans.test.unit.security" />
+ <package name="org.jboss.webbeans.test.unit.decorator.simple" />
</packages>
</test>
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3775 - examples/trunk/jsf/numberguess.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-09-23 18:00:04 -0400 (Wed, 23 Sep 2009)
New Revision: 3775
Modified:
examples/trunk/jsf/numberguess/readme.txt
Log:
update readme
Modified: examples/trunk/jsf/numberguess/readme.txt
===================================================================
--- examples/trunk/jsf/numberguess/readme.txt 2009-09-23 21:56:11 UTC (rev 3774)
+++ examples/trunk/jsf/numberguess/readme.txt 2009-09-23 22:00:04 UTC (rev 3775)
@@ -1,19 +1,27 @@
-Web Beans Numberguess Example (Servlet Container)
-=================================================
+Web Beans Numberguess Example
+==============================
This example demonstrates the use of Web Beans in a Servlet container
-environment (Tomcat 6 / Jetty 6) and in JBoss AS. No alterations are
-expected to be made to the Servlet container. All services are
+(Tomcat 6 / Jetty 6) and in as a non-EJB application JBoss AS. No alterations
+are expeccted to be made to the container. All services are
self-contained within the deployment.
-This example uses a Maven 2 build. Execute the following command to build the
-WAR. The WAR will will be located in the target directory after completion of
-the build.
+This example uses a Maven 2 build, and an ant script to deploy to JBoss AS.
+Execute the following command to build the WAR. The WAR will will be located
+in the target directory after completion of the build.
mvn
Now you're ready to deploy.
+== Deploying to JBoss AS
+
+Make sure you have set the path to JBoss AS in ../../local.build.properties, using
+jboss.home as the key.
+
+Now, type ant restart to deploy the application to JBoss AS. You can access it
+at http://localhost:8080/webbeans-numberguess
+
== Deploying with an embedded servlet container
Run this command to execute the application in an embedded Jetty 6 container:
14 years, 7 months
- 1
- 0