Weld SVN: r5707 - in core/trunk: impl/src/main/java/org/jboss/weld/injection and 2 other directories.
by weld-commits＠lists.jboss.org
Author: swd847
Date: 2010-02-02 04:54:45 -0500 (Tue, 02 Feb 2010)
New Revision: 5707
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWeldAnnotated.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java
Log:
WELD-409
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java 2010-02-02 09:00:53 UTC (rev 5706)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployerEnvironment.java 2010-02-02 09:54:45 UTC (rev 5707)
@@ -53,12 +53,13 @@
import org.jboss.weld.resolution.ResolvableFactory;
import org.jboss.weld.resolution.TypeSafeDisposerResolver;
import org.jboss.weld.resources.ClassTransformer;
+import org.jboss.weld.util.AnnotatedTypes;
public class BeanDeployerEnvironment
{
private final Map<WeldClass<?>, AbstractClassBean<?>> classBeanMap;
- private final Map<WeldMethod<?, ?>, ProducerMethod<?, ?>> producerMethodBeanMap;
+ private final Map<WeldMethodKey<?, ?>, ProducerMethod<?, ?>> producerMethodBeanMap;
private final Set<RIBean<?>> beans;
private final Set<ObserverMethodImpl<?, ?>> observers;
private final List<DisposalMethod<?, ?>> allDisposalBeans;
@@ -74,7 +75,7 @@
public BeanDeployerEnvironment(EjbDescriptors ejbDescriptors, BeanManagerImpl manager)
{
this.classBeanMap = new HashMap<WeldClass<?>, AbstractClassBean<?>>();
- this.producerMethodBeanMap = new HashMap<WeldMethod<?, ?>, ProducerMethod<?, ?>>();
+ this.producerMethodBeanMap = new HashMap<WeldMethodKey<?, ?>, ProducerMethod<?, ?>>();
this.allDisposalBeans = new ArrayList<DisposalMethod<?, ?>>();
this.resolvedDisposalBeans = new HashSet<DisposalMethod<?, ?>>();
this.beans = new HashSet<RIBean<?>>();
@@ -100,13 +101,14 @@
public <X, T> ProducerMethod<X, T> getProducerMethod(WeldMethod<X, T> method)
{
- if (!producerMethodBeanMap.containsKey(method))
+ WeldMethodKey<X, T> key = new WeldMethodKey<X, T>(method);
+ if (!producerMethodBeanMap.containsKey(key))
{
return null;
}
else
{
- ProducerMethod<?, ?> bean = producerMethodBeanMap.get(method);
+ ProducerMethod<?, ?> bean = producerMethodBeanMap.get(key);
bean.initialize(this);
return (ProducerMethod<X, T>) bean;
}
@@ -128,7 +130,7 @@
public void addProducerMethod(ProducerMethod<?, ?> bean)
{
- producerMethodBeanMap.put(bean.getWeldAnnotated(), bean);
+ producerMethodBeanMap.put(new WeldMethodKey(bean.getWeldAnnotated()), bean);
addAbstractBean(bean);
}
@@ -290,4 +292,31 @@
return Collections.unmodifiableSet(beans);
}
+ private static class WeldMethodKey<T, X>
+ {
+ final WeldMethod meth;
+
+ WeldMethodKey(WeldMethod<T, X> meth)
+ {
+ this.meth = meth;
+ }
+
+ @Override
+ public boolean equals(Object other)
+ {
+ if (other instanceof WeldMethodKey<?, ?>)
+ {
+ WeldMethodKey<?, ?> o = (WeldMethodKey<?, ?>) other;
+ return AnnotatedTypes.compareAnnotatedCallable(meth, o.meth);
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return meth.getJavaMember().hashCode();
+ }
+ }
+
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2010-02-02 09:00:53 UTC (rev 5706)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2010-02-02 09:54:45 UTC (rev 5707)
@@ -46,6 +46,7 @@
import org.jboss.weld.introspector.WeldParameter;
import org.jboss.weld.logging.messages.ReflectionMessage;
import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.util.AnnotatedTypes;
public class ConstructorInjectionPoint<T> extends ForwardingWeldConstructor<T> implements WeldInjectionPoint<T, Constructor<T>>, Serializable
{
@@ -86,6 +87,20 @@
}
@Override
+ public boolean equals(Object obj)
+ {
+ if (obj instanceof ConstructorInjectionPoint<?>)
+ {
+ ConstructorInjectionPoint<?> ip = (ConstructorInjectionPoint<?>) obj;
+ if (AnnotatedTypes.compareAnnotatedCallable(constructor, ip.constructor))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
protected WeldConstructor<T> delegate()
{
return constructor;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2010-02-02 09:00:53 UTC (rev 5706)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java 2010-02-02 09:54:45 UTC (rev 5707)
@@ -42,6 +42,7 @@
import org.jboss.weld.introspector.WeldField;
import org.jboss.weld.logging.messages.ReflectionMessage;
import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.util.AnnotatedTypes;
public class FieldInjectionPoint<T, X> extends ForwardingWeldField<T, X> implements WeldInjectionPoint<T, Field>, Serializable
{
@@ -64,6 +65,20 @@
}
@Override
+ public boolean equals(Object obj)
+ {
+ if (obj instanceof FieldInjectionPoint<?, ?>)
+ {
+ FieldInjectionPoint<?, ?> ip = (FieldInjectionPoint<?, ?>) obj;
+ if (AnnotatedTypes.compareAnnotatedField(field, ip.field))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
protected WeldField<T, X> delegate()
{
return field;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2010-02-02 09:00:53 UTC (rev 5706)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2010-02-02 09:54:45 UTC (rev 5707)
@@ -43,6 +43,7 @@
import org.jboss.weld.introspector.WeldParameter;
import org.jboss.weld.logging.messages.ReflectionMessage;
import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.util.AnnotatedTypes;
public class MethodInjectionPoint<T, X> extends ForwardingWeldMethod<T, X> implements WeldInjectionPoint<T, Method>
{
@@ -83,6 +84,20 @@
}
@Override
+ public boolean equals(Object obj)
+ {
+ if (obj instanceof MethodInjectionPoint<?, ?>)
+ {
+ MethodInjectionPoint<?, ?> ip = (MethodInjectionPoint<?, ?>) obj;
+ if (AnnotatedTypes.compareAnnotatedCallable(method, ip.method))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
protected WeldMethod<T, X> delegate()
{
return method;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2010-02-02 09:00:53 UTC (rev 5706)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java 2010-02-02 09:54:45 UTC (rev 5707)
@@ -67,6 +67,20 @@
}
@Override
+ public boolean equals(Object obj)
+ {
+ if (obj instanceof ParameterInjectionPoint<?, ?>)
+ {
+ ParameterInjectionPoint<?, ?> ip = (ParameterInjectionPoint<?, ?>) obj;
+ if (parameter.getDeclaringWeldCallable().getJavaMember().equals(ip.parameter.getDeclaringWeldCallable().getJavaMember()) && parameter.getAnnotations().equals(ip.parameter.getAnnotations()) && parameter.getPosition() == ip.parameter.getPosition())
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
protected WeldParameter<T, X> delegate()
{
return parameter;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWeldAnnotated.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWeldAnnotated.java 2010-02-02 09:00:53 UTC (rev 5706)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/AbstractWeldAnnotated.java 2010-02-02 09:54:45 UTC (rev 5707)
@@ -23,7 +23,6 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -207,34 +206,6 @@
}
/**
- * Compares two AbstractAnnotatedItems
- *
- * @param other The other item
- * @return True if equals, false otherwise
- */
- @Override
- public boolean equals(Object other)
- {
- if (other instanceof WeldAnnotated<?, ?>)
- {
- WeldAnnotated<?, ?> that = (WeldAnnotated<?, ?>) other;
- return this.getAnnotations().equals(that.getAnnotations()) && this.getJavaClass().equals(that.getJavaClass()) && this.getActualTypeArguments().length == that.getActualTypeArguments().length && Arrays.equals(this.getActualTypeArguments(), that.getActualTypeArguments());
- }
- return false;
- }
-
- /**
- * Gets the hash code of the actual type
- *
- * @return The hash code
- */
- @Override
- public int hashCode()
- {
- return getJavaClass().hashCode();
- }
-
- /**
* Indicates if the type is proxyable to a set of pre-defined rules
*
* @return True if proxyable, false otherwise.
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java 2010-02-02 09:00:53 UTC (rev 5706)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldClassImpl.java 2010-02-02 09:54:45 UTC (rev 5707)
@@ -47,7 +47,6 @@
import org.jboss.weld.introspector.WeldField;
import org.jboss.weld.introspector.WeldMethod;
import org.jboss.weld.resources.ClassTransformer;
-import org.jboss.weld.util.AnnotatedTypes;
import org.jboss.weld.util.Names;
import org.jboss.weld.util.collections.HashSetSupplier;
import org.jboss.weld.util.reflection.HierarchyDiscovery;
@@ -366,17 +365,6 @@
}
}
- @Override
- public boolean equals(Object other)
- {
- if (other instanceof WeldClassImpl<?>)
- {
- WeldClassImpl<?> that = (WeldClassImpl<?>) other;
- return AnnotatedTypes.compareAnnotatedTypes(this, that) && this.getActualTypeArguments().length == that.getActualTypeArguments().length && Arrays.equals(this.getActualTypeArguments(), that.getActualTypeArguments());
- }
- return false;
- }
-
/**
* Gets the implementing class
*
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java 2010-02-02 09:00:53 UTC (rev 5706)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java 2010-02-02 09:54:45 UTC (rev 5707)
@@ -276,19 +276,6 @@
}
/**
- * The overridden hashcode
- *
- * Gets the hash code from the delegate
- *
- * @return The hash code
- */
- @Override
- public int hashCode()
- {
- return getDelegate().hashCode();
- }
-
- /**
* Gets a string representation of the constructor
*
* @return A string representation
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java 2010-02-02 09:00:53 UTC (rev 5706)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldFieldImpl.java 2010-02-02 09:54:45 UTC (rev 5707)
@@ -135,24 +135,4 @@
return new StringBuilder().append("field ").append(getDeclaringType().getName()).append(".").append(field.getName()).toString();
}
- @Override
- public boolean equals(Object other)
- {
- if (super.equals(other) && other instanceof WeldField<?, ?>)
- {
- WeldField<?, ?> that = (WeldField<?, ?>) other;
- return this.getJavaMember().equals(that.getJavaMember());
- }
- else
- {
- return false;
- }
- }
-
- @Override
- public int hashCode()
- {
- return getDelegate().hashCode();
- }
-
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java 2010-02-02 09:00:53 UTC (rev 5706)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java 2010-02-02 09:54:45 UTC (rev 5707)
@@ -187,30 +187,11 @@
return Collections.unmodifiableList(annotatedParameters.get(annotationType));
}
- @Override
- public boolean equals(Object other)
- {
- if (super.equals(other) && other instanceof WeldMethod)
- {
- WeldMethod<?, ?> that = (WeldMethod<?, ?>) other;
- return this.getJavaMember().equals(that.getJavaMember()) && this.getWeldParameters().equals(that.getWeldParameters());
- }
- else
- {
- return false;
- }
- }
-
public boolean isEquivalent(Method method)
{
return this.getDeclaringType().isEquivalent(method.getDeclaringClass()) && this.getName().equals(method.getName()) && Arrays.equals(this.getParameterTypesAsArray(), method.getParameterTypes());
}
- @Override
- public int hashCode()
- {
- return getDelegate().hashCode();
- }
public T invokeOnInstance(Object instance, Object... parameters) throws IllegalArgumentException, SecurityException, IllegalAccessException, InvocationTargetException, NoSuchMethodException
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java 2010-02-02 09:00:53 UTC (rev 5706)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/managed/newBean/NewSimpleBeanTest.java 2010-02-02 09:54:45 UTC (rev 5707)
@@ -26,6 +26,7 @@
import org.jboss.weld.introspector.WeldAnnotated;
import org.jboss.weld.literal.NewLiteral;
import org.jboss.weld.test.AbstractWeldTest;
+import org.jboss.weld.util.AnnotatedTypes;
import org.testng.annotations.Test;
@Artifact
@@ -65,7 +66,7 @@
public void testNewBeanHasSameConstructorAsWrappedBean()
{
initNewBean();
- assert wrappedSimpleBean.getConstructor().equals(newSimpleBean.getConstructor());
+ assert AnnotatedTypes.compareAnnotatedCallable(wrappedSimpleBean.getConstructor(), newSimpleBean.getConstructor());
}
@Test(groups = { "new" })
14 years, 3 months
Weld SVN: r5706 - in core/trunk/tests/src/test: java/org/jboss/weld/tests/extensions/interceptors and 2 other directories.
by weld-commits＠lists.jboss.org
Author: swd847
Date: 2010-02-02 04:00:53 -0500 (Tue, 02 Feb 2010)
New Revision: 5706
Added:
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java
core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/
core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml
core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension
Log:
WELD-312 tests
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/FullMarathon.java 2010-02-02 09:00:53 UTC (rev 5706)
@@ -0,0 +1,13 @@
+package org.jboss.weld.tests.extensions.interceptors;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+(a)Retention(RetentionPolicy.RUNTIME)
+@Target(value = { ElementType.TYPE })
+public @interface FullMarathon
+{
+
+}
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Incremented.java 2010-02-02 09:00:53 UTC (rev 5706)
@@ -0,0 +1,13 @@
+package org.jboss.weld.tests.extensions.interceptors;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+(a)Retention(RetentionPolicy.RUNTIME)
+@Target(value = { ElementType.TYPE, ElementType.METHOD })
+public @interface Incremented
+{
+
+}
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java 2010-02-02 09:00:53 UTC (rev 5706)
@@ -0,0 +1,27 @@
+package org.jboss.weld.tests.extensions.interceptors;
+
+import javax.interceptor.InvocationContext;
+
+/**
+ * Interceptor that adds one to the result of a method
+ *
+ * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
+ *
+ */
+public class IncrementingInterceptor
+{
+ private static boolean doAroundCalled = false;
+
+ // @AroundInvoke
+ public Object doAround(InvocationContext context) throws Exception
+ {
+ doAroundCalled = true;
+ Integer res = (Integer)context.proceed();
+ return res + 1;
+ }
+
+ public static boolean isDoAroundCalled()
+ {
+ return doAroundCalled;
+ }
+}
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtension.java 2010-02-02 09:00:53 UTC (rev 5706)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.weld.tests.extensions.interceptors;
+
+import java.lang.reflect.Method;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import org.jboss.weld.tests.util.annotated.TestAnnotatedTypeBuilder;
+
+/**
+ *
+ * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
+ *
+ */
+public class InterceptorExtension implements Extension
+{
+ /**
+ * registers two interceptors via the SPI
+ */
+ public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager) throws SecurityException, NoSuchMethodException
+ {
+ event.addInterceptorBinding(Incremented.class);
+ event.addInterceptorBinding(FullMarathon.class);
+
+ TestAnnotatedTypeBuilder<IncrementingInterceptor> incBuilder = new TestAnnotatedTypeBuilder<IncrementingInterceptor>(IncrementingInterceptor.class);
+ incBuilder.addToClass(new InterceptorLiteral());
+ incBuilder.addToClass(new IncrementedLiteral());
+
+ Method around = IncrementingInterceptor.class.getMethod("doAround", InvocationContext.class);
+ incBuilder.addToMethod(around, new AroundInvokeLiteral());
+ event.addAnnotatedType(incBuilder.create());
+
+ TestAnnotatedTypeBuilder<LifecycleInterceptor> marBuilder = new TestAnnotatedTypeBuilder<LifecycleInterceptor>(LifecycleInterceptor.class);
+ marBuilder.addToClass(new InterceptorLiteral());
+ marBuilder.addToClass(new FullMarathonImpl());
+
+ Method pre = LifecycleInterceptor.class.getMethod("preDestroy", InvocationContext.class);
+ marBuilder.addToMethod(pre, new PreDestroyLiteral());
+
+ Method post = LifecycleInterceptor.class.getMethod("postConstruct", InvocationContext.class);
+ marBuilder.addToMethod(post, new PostConstructLiteral());
+
+ event.addAnnotatedType(marBuilder.create());
+
+ }
+
+ private static class InterceptorLiteral extends AnnotationLiteral<Interceptor> implements Interceptor
+ {
+ };
+
+ private static class IncrementedLiteral extends AnnotationLiteral<Incremented> implements Incremented
+ {
+ };
+
+ private static class AroundInvokeLiteral extends AnnotationLiteral<AroundInvoke> implements AroundInvoke
+ {
+ };
+
+ private static class PreDestroyLiteral extends AnnotationLiteral<PreDestroy> implements PreDestroy
+ {
+ };
+
+ private static class PostConstructLiteral extends AnnotationLiteral<PostConstruct> implements PostConstruct
+ {
+ };
+
+ private static class FullMarathonImpl extends AnnotationLiteral<FullMarathon> implements FullMarathon
+ {
+ };
+
+}
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java 2010-02-02 09:00:53 UTC (rev 5706)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.weld.tests.extensions.interceptors;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.testharness.impl.packaging.jsr299.Extension;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that interceptors registered via the SPI work correctly
+ *
+ * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
+ *
+ */
+@Artifact
+@IntegrationTest
+(a)Packaging(PackagingType.EAR)
+@Extension("javax.enterprise.inject.spi.Extension")
+@BeansXml("beans.xml")
+@Classes(packages = { "org.jboss.weld.tests.util.annotated" })
+public class InterceptorExtensionTest extends AbstractWeldTest
+{
+ @Test(groups={"broken"})
+ public void testInterceptorCalled()
+ {
+ NumberSource ng = getReference(NumberSource.class);
+ assert ng.value() == 2;
+ assert IncrementingInterceptor.isDoAroundCalled();
+ }
+
+ @Test(groups={"broken"})
+ @SuppressWarnings("unchecked")
+ public void testLifecycleInterceptor()
+ {
+ Bean bean = getCurrentManager().getBeans(Marathon.class).iterator().next();
+ CreationalContext creationalContext = getCurrentManager().createCreationalContext(bean);
+ Marathon m = (Marathon)bean.create(creationalContext);
+
+ assert LifecycleInterceptor.isPostConstructCalled();
+ assert m.getLength()==42;
+ bean.destroy(m, creationalContext);
+ assert LifecycleInterceptor.isPreDestroyCalled();
+ }
+
+}
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java 2010-02-02 09:00:53 UTC (rev 5706)
@@ -0,0 +1,43 @@
+package org.jboss.weld.tests.extensions.interceptors;
+
+import javax.interceptor.InvocationContext;
+
+/**
+ *
+ * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
+ *
+ */
+public class LifecycleInterceptor
+{
+ static private boolean preDestroyCalled = false;
+ static private boolean postConstructCalled = false;
+
+ // PreDestroy
+ public void preDestroy(InvocationContext ctx)
+ {
+ preDestroyCalled = true;
+ }
+
+ // @PostConstruct
+ public void postConstruct(InvocationContext ctx)
+ {
+ Object marathon = ctx.getTarget();
+ if (marathon instanceof Marathon)
+ {
+ Marathon m = (Marathon) marathon;
+ m.setLength(42);
+ }
+ postConstructCalled = true;
+ }
+
+ static public boolean isPostConstructCalled()
+ {
+ return postConstructCalled;
+ }
+
+ static public boolean isPreDestroyCalled()
+ {
+ return preDestroyCalled;
+ }
+
+}
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/Marathon.java 2010-02-02 09:00:53 UTC (rev 5706)
@@ -0,0 +1,18 @@
+package org.jboss.weld.tests.extensions.interceptors;
+
+@FullMarathon
+public class Marathon
+{
+ long length;
+
+ public long getLength()
+ {
+ return length;
+ }
+
+ public void setLength(long length)
+ {
+ this.length = length;
+ }
+
+}
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/interceptors/NumberSource.java 2010-02-02 09:00:53 UTC (rev 5706)
@@ -0,0 +1,15 @@
+package org.jboss.weld.tests.extensions.interceptors;
+
+/**
+ *
+ * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
+ *
+ */
+public class NumberSource
+{
+ @Incremented
+ public int value()
+ {
+ return 1;
+ }
+}
Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/beans.xml 2010-02-02 09:00:53 UTC (rev 5706)
@@ -0,0 +1,6 @@
+<beans>
+ <interceptors>
+ <class>org.jboss.weld.tests.extensions.interceptors.IncrementingInterceptor</class>
+ <class>org.jboss.weld.tests.extensions.interceptors.LifecycleInterceptor</class>
+ </interceptors>
+</beans>
Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/extensions/interceptors/javax.enterprise.inject.spi.Extension 2010-02-02 09:00:53 UTC (rev 5706)
@@ -0,0 +1 @@
+org.jboss.weld.tests.extensions.interceptors.InterceptorExtension
\ No newline at end of file
14 years, 3 months
Weld SVN: r5704 - core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-01 15:50:30 -0500 (Mon, 01 Feb 2010)
New Revision: 5704
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java
Log:
make the bean stateless, use ejb 3.1 :-)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java 2010-02-01 20:48:08 UTC (rev 5703)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/Castle.java 2010-02-01 20:50:30 UTC (rev 5704)
@@ -1,8 +1,8 @@
package org.jboss.weld.tests.enterprise;
-import javax.ejb.Stateful;
+import javax.ejb.Stateless;
-@Stateful
+@Stateless
public class Castle
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java 2010-02-01 20:48:08 UTC (rev 5703)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java 2010-02-01 20:50:30 UTC (rev 5704)
@@ -23,6 +23,7 @@
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
import org.jboss.weld.bean.SessionBean;
import org.jboss.weld.test.AbstractWeldTest;
import org.jboss.weld.test.Utils;
@@ -31,6 +32,7 @@
@Artifact
@IntegrationTest
@Packaging(PackagingType.EAR)
+@EjbJarXml("ejb-jar.xml")
public class EnterpriseBeanTest extends AbstractWeldTest
{
14 years, 3 months
Weld SVN: r5703 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-01 15:48:08 -0500 (Mon, 01 Feb 2010)
New Revision: 5703
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java
Log:
CDITCK-101
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java 2010-02-01 20:43:10 UTC (rev 5702)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java 2010-02-01 20:48:08 UTC (rev 5703)
@@ -16,7 +16,15 @@
public boolean includeMethod(IMethodSelectorContext ctx, ITestNGMethod method, boolean isTestMethod)
{
- return isWar(method.getMethod().getDeclaringClass()) && !isFullProfileOnly(method.getGroups());
+ if (isWar(method.getMethod().getDeclaringClass()) && !isFullProfileOnly(method.getGroups()))
+ {
+ return true;
+ }
+ else
+ {
+ ctx.setStopped(true);
+ return false;
+ }
}
public void setTestMethods(List<ITestNGMethod> arg0)
14 years, 3 months
Weld SVN: r5702 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-01 15:43:10 -0500 (Mon, 01 Feb 2010)
New Revision: 5702
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooImpl.java
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/Foo.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java
Log:
CDITCK-99
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/Foo.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/Foo.java 2010-02-01 20:30:29 UTC (rev 5701)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/Foo.java 2010-02-01 20:43:10 UTC (rev 5702)
@@ -1,28 +1,8 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.interceptors.definition.interceptorCalledBeforeDecorator;
-import javax.interceptor.Interceptors;
-
-(a)Interceptors(TransactionInterceptor.class)
-class Foo
+interface Foo
{
- public static boolean interceptorCalledFirst;
- public static boolean decoratorCalledFirst;
-
- public void bar() {}
-}
+
+ public abstract void bar();
+
+}
\ No newline at end of file
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java 2010-02-01 20:30:29 UTC (rev 5701)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java 2010-02-01 20:43:10 UTC (rev 5702)
@@ -21,13 +21,13 @@
import javax.inject.Inject;
@Decorator
-class FooDecorator
+class FooDecorator implements Foo
{
@Inject @Delegate Foo delegate;
public void bar()
{
- if (!Foo.interceptorCalledFirst) Foo.decoratorCalledFirst = true;
+ if (!FooImpl.interceptorCalledFirst) FooImpl.decoratorCalledFirst = true;
delegate.bar();
}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooImpl.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooImpl.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooImpl.java 2010-02-01 20:43:10 UTC (rev 5702)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.interceptors.definition.interceptorCalledBeforeDecorator;
+
+import javax.interceptor.Interceptors;
+
+(a)Interceptors(TransactionInterceptor.class)
+class FooImpl implements Foo
+{
+ public static boolean interceptorCalledFirst;
+ public static boolean decoratorCalledFirst;
+
+ public void bar() {}
+}
Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2010-02-01 20:30:29 UTC (rev 5701)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2010-02-01 20:43:10 UTC (rev 5702)
@@ -32,13 +32,13 @@
@SpecAssertion(section = "9.4", id = "g")
public void testInterceptorCalledBeforeDecorator()
{
- Foo.interceptorCalledFirst = false;
- Foo.decoratorCalledFirst = false;
+ FooImpl.interceptorCalledFirst = false;
+ FooImpl.decoratorCalledFirst = false;
Foo foo = getInstanceByType(Foo.class);
foo.bar();
- assert Foo.interceptorCalledFirst;
- assert !Foo.decoratorCalledFirst;
+ assert FooImpl.interceptorCalledFirst;
+ assert !FooImpl.decoratorCalledFirst;
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java 2010-02-01 20:30:29 UTC (rev 5701)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java 2010-02-01 20:43:10 UTC (rev 5702)
@@ -23,7 +23,7 @@
{
@AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
{
- if (!Foo.decoratorCalledFirst) Foo.interceptorCalledFirst = true;
+ if (!FooImpl.decoratorCalledFirst) FooImpl.interceptorCalledFirst = true;
return ctx.proceed();
}
14 years, 3 months
Weld SVN: r5701 - java-se/trunk/src/test/java/org/jboss/weld/environment/se/test.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-01 15:30:29 -0500 (Mon, 01 Feb 2010)
New Revision: 5701
Modified:
java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/EventsTest.java
Log:
actually call the container initialized event
Modified: java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/EventsTest.java
===================================================================
--- java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/EventsTest.java 2010-02-01 20:07:49 UTC (rev 5700)
+++ java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/EventsTest.java 2010-02-01 20:30:29 UTC (rev 5701)
@@ -19,6 +19,7 @@
import org.jboss.weld.environment.se.ShutdownManager;
import org.jboss.weld.environment.se.Weld;
import org.jboss.weld.environment.se.WeldContainer;
+import org.jboss.weld.environment.se.events.ContainerInitialized;
import org.jboss.weld.environment.se.test.events.Foo;
import org.testng.annotations.Test;
@@ -34,6 +35,8 @@
{
Foo.reset();
WeldContainer weld = new Weld().initialize();
+ weld.event().select(ContainerInitialized.class).fire(new ContainerInitialized());
+ assert Foo.isObservedContainerInitialized();
assert !Foo.isObservedEventTest();
shutdownManager(weld);
}
14 years, 3 months
Weld SVN: r5700 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-01 15:07:49 -0500 (Mon, 01 Feb 2010)
New Revision: 5700
Added:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooImpl.java
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/Foo.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java
Log:
CDITCK-99
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/Foo.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/Foo.java 2010-02-01 19:53:25 UTC (rev 5699)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/Foo.java 2010-02-01 20:07:49 UTC (rev 5700)
@@ -1,28 +1,8 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.tests.interceptors.definition.interceptorCalledBeforeDecorator;
-import javax.interceptor.Interceptors;
-
-(a)Interceptors(TransactionInterceptor.class)
-class Foo
+interface Foo
{
- public static boolean interceptorCalledFirst;
- public static boolean decoratorCalledFirst;
-
- public void bar() {}
-}
+
+ public abstract void bar();
+
+}
\ No newline at end of file
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java 2010-02-01 19:53:25 UTC (rev 5699)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java 2010-02-01 20:07:49 UTC (rev 5700)
@@ -21,13 +21,13 @@
import javax.inject.Inject;
@Decorator
-class FooDecorator
+class FooDecorator implements Foo
{
@Inject @Delegate Foo delegate;
public void bar()
{
- if (!Foo.interceptorCalledFirst) Foo.decoratorCalledFirst = true;
+ if (!FooImpl.interceptorCalledFirst) FooImpl.decoratorCalledFirst = true;
delegate.bar();
}
Copied: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooImpl.java (from rev 5696, cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/Foo.java)
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooImpl.java (rev 0)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/FooImpl.java 2010-02-01 20:07:49 UTC (rev 5700)
@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.tests.interceptors.definition.interceptorCalledBeforeDecorator;
+
+import javax.interceptor.Interceptors;
+
+(a)Interceptors(TransactionInterceptor.class)
+class FooImpl implements Foo
+{
+ public static boolean interceptorCalledFirst;
+ public static boolean decoratorCalledFirst;
+
+ public void bar() {}
+}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2010-02-01 19:53:25 UTC (rev 5699)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java 2010-02-01 20:07:49 UTC (rev 5700)
@@ -32,13 +32,13 @@
@SpecAssertion(section = "9.4", id = "g")
public void testInterceptorCalledBeforeDecorator()
{
- Foo.interceptorCalledFirst = false;
- Foo.decoratorCalledFirst = false;
+ FooImpl.interceptorCalledFirst = false;
+ FooImpl.decoratorCalledFirst = false;
Foo foo = getInstanceByType(Foo.class);
foo.bar();
- assert Foo.interceptorCalledFirst;
- assert !Foo.decoratorCalledFirst;
+ assert FooImpl.interceptorCalledFirst;
+ assert !FooImpl.decoratorCalledFirst;
}
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java 2010-02-01 19:53:25 UTC (rev 5699)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java 2010-02-01 20:07:49 UTC (rev 5700)
@@ -23,7 +23,7 @@
{
@AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
{
- if (!Foo.decoratorCalledFirst) Foo.interceptorCalledFirst = true;
+ if (!FooImpl.decoratorCalledFirst) FooImpl.interceptorCalledFirst = true;
return ctx.proceed();
}
14 years, 3 months
Weld SVN: r5699 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/impl.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-01 14:53:25 -0500 (Mon, 01 Feb 2010)
New Revision: 5699
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java
Log:
CDITCK-101
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java 2010-02-01 19:49:43 UTC (rev 5698)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/impl/WebProfileMethodSelector.java 2010-02-01 19:53:25 UTC (rev 5699)
@@ -32,7 +32,15 @@
public boolean includeMethod(IMethodSelectorContext ctx, ITestNGMethod method, boolean isTestMethod)
{
- return isWar(method.getMethod().getDeclaringClass()) && !isFullProfileOnly(method.getGroups());
+ if (isWar(method.getMethod().getDeclaringClass()) && !isFullProfileOnly(method.getGroups()))
+ {
+ return true;
+ }
+ else
+ {
+ ctx.setStopped(true);
+ return false;
+ }
}
public void setTestMethods(List<ITestNGMethod> arg0)
14 years, 3 months
Weld SVN: r5698 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-01 14:49:43 -0500 (Mon, 01 Feb 2010)
New Revision: 5698
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java
Log:
CDITCK-104
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2010-02-01 19:44:24 UTC (rev 5697)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2010-02-01 19:49:43 UTC (rev 5698)
@@ -65,7 +65,7 @@
BeanManager beanManager = configuration.getManagers().getManager();
Conversation conversation = OldSPIBridge.getInstanceByType(beanManager, Conversation.class);
HttpServletResponse response = (HttpServletResponse) event.getFacesContext().getExternalContext().getResponse();
- response.addHeader(AbstractConversationTest.CID_HEADER_NAME, conversation.getId());
+ response.addHeader(AbstractConversationTest.CID_HEADER_NAME, conversation.getId() == null ? " null" : conversation.getId());
response.addHeader(AbstractConversationTest.LONG_RUNNING_HEADER_NAME, String.valueOf(!conversation.isTransient()));
response.addHeader(Cloud.RAINED_HEADER_NAME, new Boolean(OldSPIBridge.getInstanceByType(beanManager, Cloud.class).isRained()).toString());
response.addHeader(ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME, new Boolean(activeBeforeApplyRequestValues).toString());
14 years, 3 months