[webbeans-commits] Webbeans SVN: r3520 - in tck/trunk/impl/src/main: resources and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-08-16 07:35:54 -0400 (Sun, 16 Aug 2009)
New Revision: 3520
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructorSessionBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/SimpleBean.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Added test for constructors on session beans and the corresponding new bean
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructor.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructor.java 2009-08-16 11:35:54 UTC (rev 3520)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
+
+import javax.ejb.Local;
+
+@Local
+public interface ExplicitConstructor
+{
+ public int getConstructorCalls();
+ public void setConstructorCalls(int numCalls);
+
+ public SimpleBean getInjectedSimpleBean();
+ public void setInjectedSimpleBean(SimpleBean injectedSimpleBean);
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructorSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructorSessionBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructorSessionBean.java 2009-08-16 11:35:54 UTC (rev 3520)
@@ -0,0 +1,51 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
+
+import javax.ejb.Stateless;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.New;
+
+import org.jboss.jsr299.tck.literals.NewLiteral;
+
+@Stateless
+public class ExplicitConstructorSessionBean implements ExplicitConstructor
+{
+
+ private static int constructorCalls = 0;
+ private static SimpleBean injectedSimpleBean;
+
+ public static final New NEW = new NewLiteral()
+ {
+
+ public Class<?> value()
+ {
+ return ExplicitConstructorSessionBean.class;
+ }
+ };
+
+ public ExplicitConstructorSessionBean(@Current SimpleBean bean)
+ {
+ constructorCalls++;
+ injectedSimpleBean = bean;
+ }
+
+ public int getConstructorCalls()
+ {
+ return constructorCalls;
+ }
+
+ public void setConstructorCalls(int numCalls)
+ {
+ constructorCalls = numCalls;
+ }
+
+ public SimpleBean getInjectedSimpleBean()
+ {
+ return injectedSimpleBean;
+ }
+
+ public void setInjectedSimpleBean(SimpleBean injectedSimpleBean)
+ {
+ ExplicitConstructorSessionBean.injectedSimpleBean = injectedSimpleBean;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/ExplicitConstructorSessionBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-08-16 10:53:37 UTC (rev 3519)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-08-16 11:35:54 UTC (rev 3520)
@@ -22,6 +22,18 @@
public class NewEnterpriseBeanICTest extends AbstractJSR299Test
{
+ @Test(groups = { "new", "ri-broken" })
+ @SpecAssertion(section = "3.10", id = "l")
+ public void testNewBeanHasSameConstructor()
+ {
+ ExplicitConstructor bean = getInstanceByType(ExplicitConstructor.class);
+ bean.setConstructorCalls(0);
+ ExplicitConstructor newBean = getInstanceByType(ExplicitConstructor.class, ExplicitConstructorSessionBean.NEW);
+ assert bean != newBean;
+ assert bean.getConstructorCalls() == 1;
+ assert bean.getInjectedSimpleBean() != null;
+ }
+
@Test(groups = { "new" })
@SpecAssertion(section = "3.10", id = "m")
public void testNewBeanHasSameInitializers()
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/SimpleBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/SimpleBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/SimpleBean.java 2009-08-16 11:35:54 UTC (rev 3520)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
+
+class SimpleBean
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/SimpleBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-16 10:53:37 UTC (rev 3519)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-16 11:35:54 UTC (rev 3520)
@@ -1325,9 +1325,8 @@
<text>For each session bean, a second bean exists which has the same bean types.</text>
</assertion>
- <assertion id="l" testable="false">
+ <assertion id="l">
<text>For each session bean, a second bean exists which has the same bean constructor.</text>
- <note>This is a by product of the English sentence structure, session beans don't have bean constructors</note>
</assertion>
<assertion id="m">
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3519 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-16 06:53:37 -0400 (Sun, 16 Aug 2009)
New Revision: 3519
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java
Log:
Fix test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java 2009-08-16 10:20:09 UTC (rev 3518)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java 2009-08-16 10:53:37 UTC (rev 3519)
@@ -1,8 +1,10 @@
package org.jboss.jsr299.tck.tests.event.observer;
+import javax.enterprise.context.RequestScoped;
import javax.enterprise.event.Notify;
import javax.enterprise.event.Observes;
+@RequestScoped
class AnotherObserver
{
static boolean wasNotified = false;
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3518 - ri/trunk/impl/src/main/java/org/jboss/webbeans/event and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-16 06:20:09 -0400 (Sun, 16 Aug 2009)
New Revision: 3518
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java
Log:
WBRI-315
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java 2009-08-16 09:59:51 UTC (rev 3517)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java 2009-08-16 10:20:09 UTC (rev 3518)
@@ -24,7 +24,6 @@
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Initializer;
import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.ObserverMethod;
import org.jboss.webbeans.BeanManagerImpl;
import org.jboss.webbeans.bean.AbstractClassBean;
@@ -86,9 +85,10 @@
manager.addBean(bean);
log.debug("Bean: " + bean);
}
- for (ObserverMethod<?, ?> observer : getEnvironment().getObservers())
+ for (ObserverMethodImpl<?, ?> observer : getEnvironment().getObservers())
{
log.debug("Observer : " + observer);
+ observer.initialize();
manager.addObserver(observer);
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-08-16 09:59:51 UTC (rev 3517)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-08-16 10:20:09 UTC (rev 3518)
@@ -26,8 +26,6 @@
import java.util.Map;
import java.util.Set;
-import javax.enterprise.inject.spi.ObserverMethod;
-
import org.jboss.webbeans.BeanManagerImpl;
import org.jboss.webbeans.bean.AbstractClassBean;
import org.jboss.webbeans.bean.DecoratorBean;
@@ -39,6 +37,7 @@
import org.jboss.webbeans.bean.standard.AbstractStandardBean;
import org.jboss.webbeans.bean.standard.ExtensionBean;
import org.jboss.webbeans.ejb.EjbDescriptorCache;
+import org.jboss.webbeans.event.ObserverMethodImpl;
import org.jboss.webbeans.introspector.WBClass;
import org.jboss.webbeans.introspector.WBMethod;
import org.jboss.webbeans.resolution.ResolvableFactory;
@@ -50,7 +49,7 @@
private final Map<WBClass<?>, AbstractClassBean<?>> classBeanMap;
private final Map<WBMethod<?, ?>, ProducerMethodBean<?>> producerMethodBeanMap;
private final Set<RIBean<?>> beans;
- private final Set<ObserverMethod<?, ?>> observers;
+ private final Set<ObserverMethodImpl<?, ?>> observers;
private final List<DisposalMethodBean<?>> allDisposalBeans;
private final Set<DisposalMethodBean<?>> resolvedDisposalBeans;
private final Set<DecoratorBean<?>> decorators;
@@ -65,7 +64,7 @@
this.resolvedDisposalBeans = new HashSet<DisposalMethodBean<?>>();
this.beans = new HashSet<RIBean<?>>();
this.decorators = new HashSet<DecoratorBean<?>>();
- this.observers = new HashSet<ObserverMethod<?, ?>>();
+ this.observers = new HashSet<ObserverMethodImpl<?, ?>>();
this.ejbDescriptors = ejbDescriptors;
this.disposalMethodResolver = new TypeSafeDisposerResolver(manager, allDisposalBeans);
}
@@ -138,7 +137,7 @@
allDisposalBeans.add(bean);
}
- public void addObserver(ObserverMethod<?, ?> observer)
+ public void addObserver(ObserverMethodImpl<?, ?> observer)
{
this.observers.add(observer);
}
@@ -153,7 +152,7 @@
return Collections.unmodifiableSet(decorators);
}
- public Set<ObserverMethod<?, ?>> getObservers()
+ public Set<ObserverMethodImpl<?, ?>> getObservers()
{
return Collections.unmodifiableSet(observers);
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java 2009-08-16 09:59:51 UTC (rev 3517)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java 2009-08-16 10:20:09 UTC (rev 3518)
@@ -53,7 +53,6 @@
{
result = new ObserverMethodImpl<X, T>(method, declaringBean, manager);
}
- result.initialize();
return result;
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java 2009-08-16 09:59:51 UTC (rev 3517)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java 2009-08-16 10:20:09 UTC (rev 3518)
@@ -61,7 +61,7 @@
private final Type eventType;
protected BeanManagerImpl manager;
private final Notify notifyType;
- protected final RIBean<?> observerBean;
+ protected final RIBean<?> declaringBean;
protected final MethodInjectionPoint<?, ?> observerMethod;
protected TransactionPhase transactionPhase;
@@ -70,14 +70,14 @@
* (8.5).
*
* @param observer The observer
- * @param observerBean The observer bean
+ * @param declaringBean The observer bean
* @param manager The Web Beans manager
*/
- protected ObserverMethodImpl(final WBMethod<?, ?> observer, final RIBean<?> observerBean, final BeanManagerImpl manager)
+ protected ObserverMethodImpl(final WBMethod<?, ?> observer, final RIBean<?> declaringBean, final BeanManagerImpl manager)
{
this.manager = manager;
- this.observerBean = observerBean;
- this.observerMethod = MethodInjectionPoint.of(observerBean, observer);
+ this.declaringBean = declaringBean;
+ this.observerMethod = MethodInjectionPoint.of(declaringBean, observer);
this.eventType = observerMethod.getAnnotatedParameters(Observes.class).get(0).getBaseType();
this.bindings = new HashSet<Annotation>(Arrays.asList(observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingsAsArray()));
@@ -94,6 +94,10 @@
{
// Make sure exactly one and only one parameter is annotated with Observes
List<WBParameter<?, ?>> eventObjects = this.observerMethod.getAnnotatedParameters(Observes.class);
+ if (this.notifyType.equals(Notify.IF_EXISTS) && declaringBean.getScopeType().equals(Dependent.class))
+ {
+ throw new DefinitionException(this + " is invalid because it is a conditional observer method, and is declared by a @Dependent scoped bean");
+ }
if (eventObjects.size() > 1)
{
throw new DefinitionException(this + " is invalid because it contains more than event parameter annotated @Observes");
@@ -140,7 +144,7 @@
@SuppressWarnings("unchecked")
public Bean<X> getBean()
{
- return (Bean<X>) observerBean;
+ return (Bean<X>) declaringBean;
}
public Annotation[] getBindingsAsArray()
@@ -201,9 +205,9 @@
// Get the most specialized instance of the component
if (notifyType.equals(Notify.ALWAYS))
{
- creationalContext = manager.createCreationalContext(observerBean);
+ creationalContext = manager.createCreationalContext(declaringBean);
}
- instance = manager.getReference(observerBean, creationalContext);
+ instance = manager.getReference(declaringBean, creationalContext);
if (instance == null)
{
return;
@@ -213,7 +217,7 @@
}
finally
{
- if (creationalContext != null && Dependent.class.equals(observerBean.getScopeType()))
+ if (creationalContext != null && Dependent.class.equals(declaringBean.getScopeType()))
{
creationalContext.release();
}
@@ -235,7 +239,7 @@
{
StringBuilder builder = new StringBuilder();
builder.append("Observer Implementation: \n");
- builder.append(" Observer (Declaring) class: " + observerBean.getBeanClass());
+ builder.append(" Observer (Declaring) class: " + declaringBean.getBeanClass());
builder.append(" Observer method: " + observerMethod);
return builder.toString();
}
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-08-16 09:59:51 UTC (rev 3517)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java 2009-08-16 10:20:09 UTC (rev 3518)
@@ -14,7 +14,7 @@
public class DependentIsConditionalObserverTest extends AbstractJSR299Test
{
// WBRI-315
- @Test(groups = { "events", "ri-broken" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "10.4.4", id = "b")
public void testDependentBeanWithConditionalObserverMethodIsDefinitionError()
{
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3517 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: bean and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-16 05:59:51 -0400 (Sun, 16 Aug 2009)
New Revision: 3517
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/AnnotationModel.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/BindingTypeModel.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/ScopeModel.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java
Log:
WBRI-364, and fix annotation literal to support array member values
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-16 09:57:59 UTC (rev 3516)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-16 09:59:51 UTC (rev 3517)
@@ -1304,12 +1304,26 @@
public ScopeType getScopeDefinition(Class<? extends Annotation> scopeType)
{
- throw new UnsupportedOperationException("Not yet implemented");
+ if (isScopeType(scopeType))
+ {
+ return getServices().get(MetaAnnotationStore.class).getScopeModel(scopeType).getMetaAnnnotation();
+ }
+ else
+ {
+ throw new IllegalArgumentException("Not a scope type " + scopeType);
+ }
}
public Set<Annotation> getStereotypeDefinition(Class<? extends Annotation> stereotype)
{
- throw new UnsupportedOperationException("Not yet implemented");
+ if (getServices().get(MetaAnnotationStore.class).getStereotype(stereotype).isValid())
+ {
+ return getServices().get(MetaAnnotationStore.class).getStereotype(stereotype).getMetaAnnotations();
+ }
+ else
+ {
+ throw new IllegalArgumentException("Not a stereotype " + stereotype);
+ }
}
public boolean isBindingType(Class<? extends Annotation> annotationType)
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-08-16 09:57:59 UTC (rev 3516)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-08-16 09:59:51 UTC (rev 3517)
@@ -492,12 +492,7 @@
public Set<Class<? extends Annotation>> getStereotypes()
{
- Set<Class<? extends Annotation>> stereotypes = new HashSet<Class<? extends Annotation>>();
- for (Annotation stereotypeAnnotation : getAnnotatedItem().getMetaAnnotations(Stereotype.class))
- {
- stereotypes.add(stereotypeAnnotation.annotationType());
- }
- return stereotypes;
+ return mergedStereotypes.getStereotypes();
}
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/AnnotationModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/AnnotationModel.java 2009-08-16 09:57:59 UTC (rev 3516)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/AnnotationModel.java 2009-08-16 09:59:51 UTC (rev 3517)
@@ -67,7 +67,7 @@
{
if (!Annotation.class.isAssignableFrom(getRawType()))
{
- throw new DefinitionException(getMetaAnnotation().toString() + " can only be applied to an annotation, it was applied to " + getRawType());
+ throw new DefinitionException(getMetaAnnotationType().toString() + " can only be applied to an annotation, it was applied to " + getRawType());
}
}
@@ -77,7 +77,7 @@
protected void initValid()
{
this.valid = true;
- if (!annotatedAnnotation.isAnnotationPresent(getMetaAnnotation()))
+ if (!annotatedAnnotation.isAnnotationPresent(getMetaAnnotationType()))
{
this.valid = false;
}
@@ -104,7 +104,7 @@
*
* @return
*/
- protected abstract Class<? extends Annotation> getMetaAnnotation();
+ protected abstract Class<? extends Annotation> getMetaAnnotationType();
/**
* Indicates if the annotation is valid
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/BindingTypeModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/BindingTypeModel.java 2009-08-16 09:57:59 UTC (rev 3516)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/BindingTypeModel.java 2009-08-16 09:59:51 UTC (rev 3517)
@@ -110,7 +110,7 @@
* @return The BindingType class
*/
@Override
- protected Class<? extends Annotation> getMetaAnnotation()
+ protected Class<? extends Annotation> getMetaAnnotationType()
{
return BindingType.class;
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java 2009-08-16 09:57:59 UTC (rev 3516)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/MergedStereotypes.java 2009-08-16 09:59:51 UTC (rev 3517)
@@ -36,6 +36,8 @@
// Are any of the sterotypes policies
private boolean policy;
+ private Set<Class<? extends Annotation>> stereotypes;
+
private final BeanManagerImpl manager;
/**
@@ -46,6 +48,7 @@
public MergedStereotypes(Set<Annotation> stereotypeAnnotations, BeanManagerImpl manager)
{
this.possibleScopeTypes = new HashSet<Annotation>();
+ this.stereotypes = new HashSet<Class<? extends Annotation>>();
this.manager = manager;
merge(stereotypeAnnotations);
}
@@ -77,6 +80,7 @@
{
beanNameDefaulted = true;
}
+ this.stereotypes.add(stereotypeAnnotation.annotationType());
// Merge in inherited stereotypes
merge(stereotype.getInheritedSterotypes());
}
@@ -106,15 +110,13 @@
{
return beanNameDefaulted;
}
-
+
/**
- * Indicates if the bean was declared in XML
- *
- * @return True if declared in XML, else false
+ * @return the stereotypes
*/
- public boolean isDeclaredInXml()
+ public Set<Class<? extends Annotation>> getStereotypes()
{
- return false;
+ return stereotypes;
}
/**
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/ScopeModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/ScopeModel.java 2009-08-16 09:57:59 UTC (rev 3516)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/ScopeModel.java 2009-08-16 09:59:51 UTC (rev 3517)
@@ -25,6 +25,7 @@
import javax.enterprise.context.ScopeType;
+import org.jboss.webbeans.literal.ScopeTypeLiteral;
import org.jboss.webbeans.log.Log;
import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.resources.ClassTransformer;
@@ -41,6 +42,10 @@
{
private static final Log log = Logging.getLog(ScopeModel.class);
+ private final ScopeType metaAnnotation;
+ private final boolean normal;
+ private final boolean passivating;
+
/**
* Constrctor
*
@@ -49,6 +54,18 @@
public ScopeModel(Class<T> scope, ClassTransformer classTransformer)
{
super(scope, classTransformer);
+ if (isValid())
+ {
+ this.normal = getAnnotatedAnnotation().getAnnotation(ScopeType.class).normal();
+ this.passivating = getAnnotatedAnnotation().getAnnotation(ScopeType.class).passivating();
+ this.metaAnnotation = new ScopeTypeLiteral(normal, passivating);
+ }
+ else
+ {
+ this.normal = false;
+ this.passivating = false;
+ this.metaAnnotation = null;
+ }
}
@Override
@@ -74,7 +91,7 @@
*/
public boolean isNormal()
{
- return getAnnotatedAnnotation().getAnnotation(ScopeType.class).normal();
+ return normal;
}
/**
@@ -84,7 +101,7 @@
*/
public boolean isPassivating()
{
- return getAnnotatedAnnotation().getAnnotation(ScopeType.class).passivating();
+ return passivating;
}
/**
@@ -93,10 +110,15 @@
* @return The ScopeType class
*/
@Override
- protected Class<? extends Annotation> getMetaAnnotation()
+ protected Class<? extends Annotation> getMetaAnnotationType()
{
return ScopeType.class;
}
+
+ public ScopeType getMetaAnnnotation()
+ {
+ return metaAnnotation;
+ }
/**
* Gets a string representation of the scope model
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java 2009-08-16 09:57:59 UTC (rev 3516)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/cache/StereotypeModel.java 2009-08-16 09:59:51 UTC (rev 3517)
@@ -58,6 +58,8 @@
private Set<Annotation> interceptorBindings;
private Set<Annotation> inheritedSterotypes;
+
+ private Set<Annotation> metaAnnotations;
/**
* Constructor
@@ -73,6 +75,7 @@
initInterceptorBindings();
initInheritedStereotypes();
checkBindings();
+ this.metaAnnotations = getAnnotatedAnnotation().getAnnotations();
}
/**
@@ -202,7 +205,7 @@
* @return The Stereotype class
*/
@Override
- protected Class<? extends Annotation> getMetaAnnotation()
+ protected Class<? extends Annotation> getMetaAnnotationType()
{
return Stereotype.class;
}
@@ -219,5 +222,13 @@
{
return inheritedSterotypes;
}
+
+ /**
+ * @return the metaAnnotations
+ */
+ public Set<Annotation> getMetaAnnotations()
+ {
+ return metaAnnotations;
+ }
}
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3516 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-16 05:57:59 -0400 (Sun, 16 Aug 2009)
New Revision: 3516
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java
Modified:
ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.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/beanManager/Transactional.java
Log:
WBRI-364, and fix annotation literal to support array member values
Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java
===================================================================
--- ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java 2009-08-16 09:54:45 UTC (rev 3515)
+++ ri/trunk/api/src/main/java/javax/enterprise/inject/AnnotationLiteral.java 2009-08-16 09:57:59 UTC (rev 3516)
@@ -22,6 +22,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.util.Arrays;
/**
@@ -124,8 +125,15 @@
{
Object thisValue = invoke(member, this);
Object thatValue = invoke(member, that);
- if (!thisValue.equals(thatValue))
+ if (thisValue.getClass().isArray() && thatValue.getClass().isArray())
{
+ if (!Arrays.equals(Object[].class.cast(thisValue), Object[].class.cast(thatValue)))
+ {
+ return false;
+ }
+ }
+ else if (!thisValue.equals(thatValue))
+ {
return false;
}
}
@@ -142,7 +150,8 @@
for (Method member : members)
{
int memberNameHashCode = 127 * member.getName().hashCode();
- int memberValueHashCode = invoke(member, this).hashCode();
+ Object value = invoke(member, this);
+ int memberValueHashCode = value.getClass().isArray() ? Arrays.hashCode(Object[].class.cast(value)) : value.hashCode();
hashCode += memberNameHashCode ^ memberValueHashCode;
}
return hashCode;
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java 2009-08-16 09:57:59 UTC (rev 3516)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, 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.jsr299.tck.literals;
+
+import java.lang.annotation.Retention;
+
+import javax.enterprise.inject.AnnotationLiteral;
+
+/**
+ * @author pmuir
+ *
+ */
+public abstract class RetentionLiteral extends AnnotationLiteral<Retention> implements Retention
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java 2009-08-16 09:57:59 UTC (rev 3516)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, 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.jsr299.tck.literals;
+
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.AnnotationLiteral;
+
+/**
+ * @author pmuir
+ *
+ */
+public abstract class TargetLiteral extends AnnotationLiteral<Target> implements Target
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-08-16 09:54:45 UTC (rev 3515)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-08-16 09:57:59 UTC (rev 3516)
@@ -17,10 +17,16 @@
package org.jboss.jsr299.tck.tests.extensions.beanManager;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+
import java.lang.annotation.Annotation;
import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.HashSet;
import java.util.Set;
@@ -28,6 +34,7 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.ScopeType;
+import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.AmbiguousResolutionException;
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.BindingType;
@@ -40,6 +47,8 @@
import javax.enterprise.inject.stereotype.Stereotype;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.literals.RetentionLiteral;
+import org.jboss.jsr299.tck.literals.TargetLiteral;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -101,52 +110,86 @@
getCurrentManager().validate(injectionPoint);
}
- @Test
+ @Test(groups="rewrite")
@SpecAssertion(section = "11.3.14", id = "aa")
+ // Should also check a custom bindingtype
public void testDetermineBindingType()
{
assert getCurrentManager().isBindingType(Tame.class);
+ assert !getCurrentManager().isBindingType(AnimalStereotype.class);
+ assert !getCurrentManager().isBindingType(ApplicationScoped.class);
+ assert !getCurrentManager().isBindingType(Transactional.class);
}
- @Test()
+ @Test(groups="rewrite")
+ // Should also check a custom scope
@SpecAssertion(section = "11.3.14", id = "ab")
public void testDetermineScopeType()
{
assert getCurrentManager().isScopeType(ApplicationScoped.class);
+ assert !getCurrentManager().isScopeType(Tame.class);
+ assert !getCurrentManager().isScopeType(AnimalStereotype.class);
+ assert !getCurrentManager().isScopeType(Transactional.class);
}
- @Test
+ @Test(groups="rewrite")
@SpecAssertion(section = "11.3.14", id = "ac")
+ // Should also check a custom stereotype
public void testDetermineStereotype()
{
assert getCurrentManager().isStereotype(AnimalStereotype.class);
+ assert !getCurrentManager().isStereotype(Tame.class);
+ assert !getCurrentManager().isStereotype(ApplicationScoped.class);
+ assert !getCurrentManager().isStereotype(Transactional.class);
}
- @Test(groups = "ri-broken")
- // WBRI-363
+ @Test(groups = {"ri-broken", "rewrite"})
+ // WBRI-59
+ // Should also check a custom interceptor binding type
@SpecAssertion(section = "11.3.14", id = "ad")
public void testDetermineInterceptorBindingType()
{
assert getCurrentManager().isInterceptorBindingType(Transactional.class);
+ assert !getCurrentManager().isInterceptorBindingType(Tame.class);
+ assert !getCurrentManager().isInterceptorBindingType(AnimalStereotype.class);
+ assert !getCurrentManager().isInterceptorBindingType(ApplicationScoped.class);
}
- @Test(groups = "ri-broken")
+ @Test(groups = { "rewrite"})
@SpecAssertion(section = "11.3.14", id = "ae")
- // WBRI-364
+ // Should also check a custom sterotype
public void testGetMetaAnnotationsForStereotype()
{
Set<Annotation> stereotypeAnnotations = getCurrentManager().getStereotypeDefinition(AnimalStereotype.class);
assert stereotypeAnnotations.size() == 5;
assert stereotypeAnnotations.contains(new AnnotationLiteral<Stereotype>() {});
- assert stereotypeAnnotations.contains(new AnnotationLiteral<Target>() {});
- assert stereotypeAnnotations.contains(new AnnotationLiteral<Retention>() {});
assert stereotypeAnnotations.contains(new AnnotationLiteral<RequestScoped>() {});
assert stereotypeAnnotations.contains(new AnnotationLiteral<Inherited>() {});
+ assert stereotypeAnnotations.contains(new RetentionLiteral()
+ {
+
+ public RetentionPolicy value()
+ {
+ return RetentionPolicy.RUNTIME;
+ }
+
+ });
+ assert stereotypeAnnotations.contains(new TargetLiteral()
+ {
+
+ public ElementType[] value()
+ {
+ ElementType[] value = {TYPE, METHOD, FIELD};
+ return value;
+ }
+
+ });
}
- @Test(groups = "ri-broken")
+ @Test(groups = {"ri-broken", "rewrite"})
@SpecAssertion(section = "11.3.14", id = "af")
- // WBRI-364
+ // WBRI-59
+ // Should also check a custom defined interceptor binding
public void testGetMetaAnnotationsForInterceptorBindingType()
{
Set<Annotation> metaAnnotations = getCurrentManager().getInterceptorBindingTypeDefinition(Transactional.class);
@@ -157,14 +200,18 @@
assert metaAnnotations.contains(new AnnotationLiteral<BindingType>() {});
}
- @Test(groups = "ri-broken")
+ @Test(groups = {"rewrite"})
@SpecAssertion(section = "11.3.14", id = "ag")
- // WBRI-364
+ // Should also check a custom defined scope
public void testGetScopeType()
{
- ScopeType scopeType = getCurrentManager().getScopeDefinition(RequestScoped.class);
- assert scopeType.normal();
- assert scopeType.passivating();
+ ScopeType requestScopeType = getCurrentManager().getScopeDefinition(RequestScoped.class);
+ assert requestScopeType.normal();
+ assert !requestScopeType.passivating();
+
+ ScopeType sessionScopeType = getCurrentManager().getScopeDefinition(SessionScoped.class);
+ assert sessionScopeType.normal();
+ assert sessionScopeType.passivating();
}
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java 2009-08-16 09:54:45 UTC (rev 3515)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java 2009-08-16 09:57:59 UTC (rev 3516)
@@ -10,12 +10,12 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.interceptor.InterceptorBindingType;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
-@BindingType
+@InterceptorBindingType
@interface Transactional
{
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3515 - in tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/context/conversation/client and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-16 05:54:45 -0400 (Sun, 16 Aug 2009)
New Revision: 3515
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationState.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.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/conversation/client/Cloud.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/ManualCidPropagationTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/cloud.jsf
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/rain.jsf
Log:
Fix tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java 2009-08-16 09:52:30 UTC (rev 3514)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java 2009-08-16 09:54:45 UTC (rev 3515)
@@ -1,15 +1,12 @@
package org.jboss.jsr299.tck.tests.context.conversation.client;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.HashSet;
import java.util.Set;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
import org.jboss.jsr299.tck.AbstractJSR299Test;
+import com.gargoylesoftware.htmlunit.Page;
+import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -22,53 +19,21 @@
public static final String LONG_RUNNING_HEADER_NAME = "org.jboss.jsr299.tck.longRunning";
- private static final long TIMEOUT = 200;
-
- protected boolean isCloudDestroyed(HttpClient client) throws Exception
+ protected boolean isCloudDestroyed(WebClient client) throws Exception
{
- HttpMethod method = new GetMethod(getConversationStatusPath("cloudDestroyed"));
- try
- {
- client.executeMethod(method);
- if (method.getStatusCode() == 200)
- {
- return true;
- }
- else
- {
- return false;
- }
- }
- finally
- {
- method.releaseConnection();
- }
+ client.setThrowExceptionOnFailingStatusCode(false);
+ Page page = client.getPage(getConversationStatusPath("cloudDestroyed"));
+ return page.getWebResponse().getStatusCode() == 200;
}
- protected void resetCloud(HttpClient client) throws Exception
+ protected void resetCloud(WebClient client) throws Exception
{
- HttpMethod method = new GetMethod(getConversationStatusPath("resetCloud"));
- try
- {
- client.executeMethod(method);
- }
- finally
- {
- method.releaseConnection();
- }
+ client.getPage(getConversationStatusPath("resetCloud"));
}
- protected void invalidateSession(HttpClient client) throws Exception
+ protected void invalidateSession(WebClient client) throws Exception
{
- HttpMethod method = new GetMethod(getConversationStatusPath("invalidateSession"));
- try
- {
- client.executeMethod(method);
- }
- finally
- {
- method.releaseConnection();
- }
+ client.getPage(getConversationStatusPath("invalidateSession"));
}
protected String getConversationStatusPath(String method)
@@ -76,64 +41,14 @@
return super.getContextPath() + "conversation-status?method=" + method;
}
- protected URL getConversationStatusURL(String method) throws MalformedURLException
- {
- return new URL(getConversationStatusPath(method));
- }
-
- protected ConversationState request(HttpClient client, String viewId) throws Exception
- {
- HttpMethod method = new GetMethod(getPath(viewId));
- try
- {
- client.executeMethod(method);
- assert method.getStatusCode() == 200;
- return new ConversationState(method.getResponseHeader(CID_HEADER_NAME).getValue(), Boolean.valueOf(method.getResponseHeader(LONG_RUNNING_HEADER_NAME).getValue()));
- }
- finally
- {
- method.releaseConnection();
- }
- }
-
- protected ConversationState request(HttpClient client, String viewId, ConversationState c) throws Exception
- {
- return request(client, viewId + "?" + CID_REQUEST_PARAMETER_NAME + "=" + c.getId());
- }
-
- protected String getBodyAsString(HttpClient client, String viewId) throws Exception
- {
- HttpMethod method = new GetMethod(getPath(viewId));
- try
- {
- client.executeMethod(method);
- assert method.getStatusCode() == 200;
- return method.getResponseBodyAsString();
- }
- finally
- {
- method.releaseConnection();
- }
- }
-
protected String getPath(String viewId)
{
return getContextPath() + viewId;
}
- protected boolean isActiveBeforeApplyRequestValues(HttpClient client, String viewId) throws Exception
+ protected String getPath(String viewId, String cid)
{
- HttpMethod method = new GetMethod(getPath(viewId));
- try
- {
- client.executeMethod(method);
- assert method.getStatusCode() == 200;
- return Boolean.valueOf(method.getResponseHeader(ConversationTestPhaseListener.ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME).getValue());
- }
- finally
- {
- method.releaseConnection();
- }
+ return getContextPath() + viewId + "?" + CID_REQUEST_PARAMETER_NAME + "=" + cid;
}
protected <T> Set<T> getElements(HtmlElement rootElement, Class<T> elementClass)
@@ -167,17 +82,17 @@
return null;
}
- protected String getCid(HtmlPage page)
+ protected String getCid(Page page)
{
return page.getWebResponse().getResponseHeaderValue(AbstractConversationTest.CID_HEADER_NAME);
}
- protected Boolean hasRained(HtmlPage page)
+ protected Boolean hasRained(Page page)
{
return Boolean.valueOf(page.getWebResponse().getResponseHeaderValue(Cloud.RAINED_HEADER_NAME));
}
- protected Boolean isLongRunning(HtmlPage page)
+ protected Boolean isLongRunning(Page page)
{
return Boolean.valueOf(page.getWebResponse().getResponseHeaderValue(LONG_RUNNING_HEADER_NAME));
}
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-08-16 09:52:30 UTC (rev 3514)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-08-16 09:54:45 UTC (rev 3515)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.context.conversation.client;
-import org.apache.commons.httpclient.HttpClient;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
@@ -12,8 +11,10 @@
import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor;
import org.testng.annotations.Test;
+import com.gargoylesoftware.htmlunit.Page;
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSpan;
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
/**
@@ -64,10 +65,10 @@
// TODO this test doesn't verify that the conversation context itself is destroyed
public void testTransientConversationInstancesDestroyedAtRequestEnd() throws Exception
{
- HttpClient client = new HttpClient();
+ WebClient client = new WebClient();
resetCloud(client);
- ConversationState c = request(client, "/cloud.jsf");
- assert c.isTransient();
+ HtmlPage page = client.getPage(getPath("/cloud.jsf"));
+ assert !isLongRunning(page);
assert isCloudDestroyed(client);
}
@@ -75,60 +76,96 @@
@SpecAssertion(section = "6.7.4", id = "k")
public void testLongRunningConversationInstancesNotDestroyedAtRequestEnd() throws Exception
{
- HttpClient client = new HttpClient();
+ WebClient client = new WebClient();
+
+
+
+ HtmlPage storm = client.getPage(getPath("/storm.jsf"));
+ HtmlSubmitInput beginConversationButton = getFirstMatchingElement(storm, HtmlSubmitInput.class, "beginConversationButton");
+ storm = beginConversationButton.click();
+
resetCloud(client);
- ConversationState c = request(client, "/clouds.jsf");
+
+ client.getPage(getPath("/cloud.jsf", getCid(storm)));
assert !isCloudDestroyed(client);
}
- @Test(groups = { "contexts" , "broken"})
+ @Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.4", id = "p")
public void testConversationsDontCrossSessionBoundary1() throws Exception
{
WebClient webClient = new WebClient();
+
+ // Load the page
HtmlPage rain = webClient.getPage(getPath("/rain.jsf"));
+
+ // begin a conversation
HtmlSubmitInput beginConversationButton = getFirstMatchingElement(rain, HtmlSubmitInput.class, "beginConversationButton");
rain = beginConversationButton.click();
+ String cid = getCid(rain);
+ // Cause rain
HtmlSubmitInput rainButton = getFirstMatchingElement(rain, HtmlSubmitInput.class, "rain");
-
rain = rainButton.click();
+ // Re-request the page, inside the conversation and check it has rained
+ rain = webClient.getPage(getPath("/rain.jsf", cid));
assert hasRained(rain);
- webClient.getPage(getConversationStatusPath("invalidateSession"));
+ // Invalidate the session, invalidate the conversation-scoped cloud
+ invalidateSession(webClient);
+ // Re-request the page, check it hasn't rained
+ rain = webClient.getPage(getPath("/rain.jsf", cid));
assert !hasRained(rain);
}
- @Test(groups = { "contexts" , "broken"})
+ @Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.4", id = "p")
public void testConversationsDontCrossSessionBoundary2() throws Exception
{
- // TODO Test assumes conversation.getId() is available when not in a lrc
- HttpClient client1 = new HttpClient();
- HttpClient client2 = new HttpClient();
- ConversationState c1 = request(client1, "/rain.jsf");
- //assert hasRained(client1, "/cloud.jsf", c1.getId());
- //assert !hasRained(client2, "/cloud.jsf", c1.getId());
+ WebClient webClient = new WebClient();
+
+ // Load the page
+ HtmlPage rain = webClient.getPage(getPath("/rain.jsf"));
+
+ // begin a conversation
+ HtmlSubmitInput beginConversationButton = getFirstMatchingElement(rain, HtmlSubmitInput.class, "beginConversationButton");
+ rain = beginConversationButton.click();
+ String cid = getCid(rain);
+
+ // Cause rain
+ HtmlSubmitInput rainButton = getFirstMatchingElement(rain, HtmlSubmitInput.class, "rain");
+ rain = rainButton.click();
+
+ // Re-request the page, inside the conversation and check it has rained
+ rain = webClient.getPage(getPath("/rain.jsf", cid));
+ assert hasRained(rain);
+
+ // Create a new web client and load the page
+ webClient = new WebClient();
+ rain = webClient.getPage(getPath("/rain.jsf", cid));
+ assert !hasRained(rain);
}
@Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.4", id = "a")
public void testConversationActiveDuringNonFacesRequest() throws Exception
{
- HttpClient client = new HttpClient();
- assert getBodyAsString(client, "/cloud.jsf").contains(Cloud.NAME);
+ WebClient client = new WebClient();
+ HtmlPage page = client.getPage(getPath("/cloud.jsf"));
+ HtmlSpan span = getFirstMatchingElement(page, HtmlSpan.class, "cloudName");
+ assert span.getTextContent().equals(Cloud.NAME);
}
@Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.4", id = "tb")
public void testConversationPropagationToNonExistentConversationLeadsToTransientConversation() throws Exception
{
- HttpClient client = new HttpClient();
- ConversationState c1 = request(client, "/cloud.jsf", new ConversationState("org.jboss.jsr299", false));
- assert c1.isTransient();
- assert !c1.getId().equals("org.jboss.jsr299");
+ WebClient client = new WebClient();
+ Page page = client.getPage(getPath("/cloud.jsf", "org.jboss.jsr299"));
+ assert !isLongRunning(page);
+ assert !getCid(page).equals("org.jboss.jsr299");
}
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java 2009-08-16 09:52:30 UTC (rev 3514)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java 2009-08-16 09:54:45 UTC (rev 3515)
@@ -13,7 +13,7 @@
*/
private static final long serialVersionUID = 5765109971012677278L;
-public static final String NAME = Cloud.class.getName() + ".Pete";
+ public static final String NAME = Cloud.class.getName() + ".Pete";
public static final String RAINED_HEADER_NAME = Cloud.class.getName() + ".rained";
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationState.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationState.java 2009-08-16 09:52:30 UTC (rev 3514)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationState.java 2009-08-16 09:54:45 UTC (rev 3515)
@@ -1,33 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.conversation.client;
-
-/**
- * A simple bean to hold the state of the conversation that
- * was returned in the headers of the request.
- */
-public class ConversationState
-{
- private String id;
-
- private boolean longRunning;
-
- public ConversationState(String id, boolean longRunning)
- {
- this.id = id;
- this.longRunning = longRunning;
- }
-
- public String getId()
- {
- return id;
- }
-
- public boolean isLongRunning()
- {
- return longRunning;
- }
-
- public boolean isTransient()
- {
- return !longRunning;
- }
-}
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-08-16 09:52:30 UTC (rev 3514)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-08-16 09:54:45 UTC (rev 3515)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.context.conversation.client;
-import org.apache.commons.httpclient.HttpClient;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -11,6 +10,8 @@
import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor;
import org.testng.annotations.Test;
+import com.gargoylesoftware.htmlunit.WebClient;
+
/**
* @author Nicklas Karlsson
*/
@@ -27,18 +28,17 @@
public class InvalidatingSessionDestroysConversationTest extends AbstractConversationTest
{
- @Test(groups = { "contexts", "broken" })
+ @Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.4", id = "qa")
// TODO this test doesn't precisely probe the boundaries of the service() method
public void testInvalidatingSessionDestroysConversation() throws Exception
{
- // TODO Test assumes conversation.getId() is available when not in a lrc
- HttpClient client = new HttpClient();
- resetCloud(client);
- request(client, "/clouds.jsf");
- assert !isCloudDestroyed(client);
- invalidateSession(client);
- assert isCloudDestroyed(client);
+ WebClient webClient = new WebClient();
+ resetCloud(webClient);
+ webClient.getPage(getPath("/clouds.jsf"));
+ assert !isCloudDestroyed(webClient);
+ invalidateSession(webClient);
+ assert isCloudDestroyed(webClient);
}
}
\ No newline at end of file
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-08-16 09:52:30 UTC (rev 3514)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ManualCidPropagationTest.java 2009-08-16 09:54:45 UTC (rev 3515)
@@ -1,7 +1,5 @@
package org.jboss.jsr299.tck.tests.context.conversation.client;
-import java.net.URL;
-
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -13,7 +11,6 @@
import org.testng.annotations.Test;
import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.WebRequestSettings;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
@@ -36,7 +33,7 @@
public class ManualCidPropagationTest extends AbstractConversationTest
{
- @Test(groups = { "contexts", "broken" })
+ @Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.4", id = "n")
public void testManualCidPropagation() throws Exception
{
@@ -47,11 +44,8 @@
String c1 = getCid(storm);
- WebRequestSettings settings = new WebRequestSettings(new URL(getPath("/cloud.jsf")));
- settings.addAdditionalHeader(CID_REQUEST_PARAMETER_NAME, c1);
+ HtmlPage cloud = webClient.getPage(getPath("/cloud.jsf", c1));
- HtmlPage cloud = webClient.getPage(settings);
-
String c2 = getCid(cloud);
assert isLongRunning(cloud);
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/cloud.jsf
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/cloud.jsf 2009-08-16 09:52:30 UTC (rev 3514)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/cloud.jsf 2009-08-16 09:54:45 UTC (rev 3515)
@@ -14,7 +14,7 @@
</head>
<body>
<f:view>
- <h:outputText value="#{cloud.name}" />
+ <h:outputText value="#{cloud.name}" id="cloudName" />
</f:view>
</body>
</html>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/rain.jsf
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/rain.jsf 2009-08-16 09:52:30 UTC (rev 3514)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/conversation/client/rain.jsf 2009-08-16 09:54:45 UTC (rev 3515)
@@ -14,8 +14,10 @@
</head>
<body>
<f:view>
+ <h:form>
<h:commandButton action="#{storm.beginConversation}" value="Thunder" id="beginConversationButton"/>
- <h:commandButton action="#{cloud.rain}" value="Rain" id="rain"/>
+ <h:commandButton action="#{cloud.rain}" value="Rain" id="rain"/>
+ </h:form>
</f:view>
</body>
</html>
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3514 - ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-16 05:52:30 -0400 (Sun, 16 Aug 2009)
New Revision: 3514
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
Log:
Enable test
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java 2009-08-16 09:51:06 UTC (rev 3513)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/el/WebBeansELResolverImpl.java 2009-08-16 09:52:30 UTC (rev 3514)
@@ -164,10 +164,14 @@
if (!(o instanceof ELCreationalContextStack))
{
ELCreationalContextStack store = ELCreationalContextStack.addToContext(context);
+ o = store;
+ }
+ ELCreationalContextStack store = (ELCreationalContextStack) o;
+ if (store.isEmpty())
+ {
// TODO need to use correct manager for module
ELCreationalContext<?> creationalContext = ELCreationalContext.of(CurrentManager.rootManager().createCreationalContext(CONTEXTUAL));
store.push(creationalContext);
- o = store;
}
return (ELCreationalContextStack) o;
}
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java 2009-08-16 09:51:06 UTC (rev 3513)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java 2009-08-16 09:52:30 UTC (rev 3514)
@@ -11,15 +11,19 @@
@SuppressWarnings("unchecked")
public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
{
- ELContext elContext = EL.createELContext();
+ ELContext elContext = createELContext();
return (T) EL.EXPRESSION_FACTORY.createValueExpression(elContext, expression, expectedType).getValue(elContext);
}
@SuppressWarnings("unchecked")
public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams)
{
- ELContext elContext = EL.createELContext();
+ ELContext elContext = createELContext();
return (T) EL.EXPRESSION_FACTORY.createMethodExpression(elContext, expression, expectedType, expectedParamTypes).invoke(elContext, expectedParams);
}
+ public ELContext createELContext()
+ {
+ return EL.createELContext();
+ }
}
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java 2009-08-16 09:51:06 UTC (rev 3513)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java 2009-08-16 09:52:30 UTC (rev 3514)
@@ -1,5 +1,7 @@
package org.jboss.jsr299.tck.spi;
+import javax.el.ELContext;
+
/**
* This interface provides operations relating to EL.
*
@@ -33,4 +35,6 @@
*/
public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams);
+ public ELContext createELContext();
+
}
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-08-16 09:51:06 UTC (rev 3513)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-08-16 09:52:30 UTC (rev 3514)
@@ -51,11 +51,10 @@
assert tunaFarm.tuna != null;
}
- @Test(groups={"el", "broken"})
- // TODO PLM Marked broken, as the spec says the *el resolver* returns null, not the whole value expression
+ @Test(groups={"el"})
@SpecAssertion(section="5.8", id="bb")
public void testUnresolvedNameReturnsNull() {
- assert getCurrentConfiguration().getEl().evaluateValueExpression("#{nonExistingTuna}", Tuna.class) == null;
+ assert getCurrentManager().getELResolver().getValue(getCurrentConfiguration().getEl().createELContext(), null, "nonExistingTuna") == null;
}
@Test(groups = "el")
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3513 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-16 05:51:06 -0400 (Sun, 16 Aug 2009)
New Revision: 3513
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Lazy.java
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/ManagedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java
Log:
Use binding type to ensure correct bean is returned
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-08-16 09:49:10 UTC (rev 3512)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-08-16 09:51:06 UTC (rev 3513)
@@ -22,12 +22,13 @@
import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
@@ -70,7 +71,7 @@
})
public void testProduceEjbProxyWithContainerInjections()
{
- Bean<RemoteEjb> remoteEjbBean = getBeans(RemoteEjb.class).iterator().next();
+ Bean<RemoteEjb> remoteEjbBean = getBeans(RemoteEjb.class, new AnnotationLiteral<Lazy>(){}).iterator().next();
CreationalContext<RemoteEjb> remoteEjbCc = getCurrentManager().createCreationalContext(remoteEjbBean);
RemoteEjb instance = remoteEjbBean.create(remoteEjbCc);
assert instance != null;
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Lazy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Lazy.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Lazy.java 2009-08-16 09:51:06 UTC (rev 3513)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Lazy
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Lazy.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java 2009-08-16 09:49:10 UTC (rev 3512)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java 2009-08-16 09:51:06 UTC (rev 3513)
@@ -1,10 +1,9 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
-import javax.enterprise.inject.Current;
class ManagedBean
{
- private @Current RemoteEjb myEjb;
+ private @Lazy RemoteEjb myEjb;
public RemoteEjb getMyEjb()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java 2009-08-16 09:49:10 UTC (rev 3512)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java 2009-08-16 09:51:06 UTC (rev 3513)
@@ -5,5 +5,5 @@
class ResourceProducer
{
- private @Produces @EJB RemoteEjb remoteEjb;
+ private @Produces @EJB @Lazy RemoteEjb remoteEjb;
}
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3512 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-16 05:49:10 -0400 (Sun, 16 Aug 2009)
New Revision: 3512
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
Log:
Fix tests
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-08-16 09:47:00 UTC (rev 3511)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-08-16 09:49:10 UTC (rev 3512)
@@ -3,6 +3,7 @@
import java.lang.annotation.Annotation;
import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
@@ -25,13 +26,14 @@
private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
- @Test(groups="broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section = "4.3", id = "ca")
})
public void testSpecializedBeanNotInstantiated() throws Exception
{
- FarmerLocal farmer = getInstanceByType(FarmerLocal.class,LANDOWNER_LITERAL);
+ Bean<?> farmerBean = getCurrentManager().resolve(getCurrentManager().getBeans(FarmerLocal.class,LANDOWNER_LITERAL));
+ FarmerLocal farmer = (FarmerLocal) getCurrentManager().getReference(farmerBean, Object.class, getCurrentManager().createCreationalContext(farmerBean));
assert farmer.getClassName().equals(LazyFarmer.class.getName());
}
16 years, 8 months
[webbeans-commits] Webbeans SVN: r3511 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-16 05:47:00 -0400 (Sun, 16 Aug 2009)
New Revision: 3511
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java
Log:
Mark passing test non-broken
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-08-16 09:43:33 UTC (rev 3510)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java 2009-08-16 09:47:00 UTC (rev 3511)
@@ -16,7 +16,7 @@
@SpecVersion("20090625")
public class ConditionalObserverTest extends AbstractJSR299Test
{
- @Test(groups = { "events", "broken" })
+ @Test(groups = { "events" })
@SpecAssertions( {
@SpecAssertion(section = "5.6.8", id = "ba"),
@SpecAssertion(section = "10.4.4", id = "a")
16 years, 8 months