Author: dallen6 Date: 2009-01-25 09:46:28 -0500 (Sun, 25 Jan 2009) New Revision: 1229 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java Log: A couple more broken tests fixed. Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-24 20:53:14 UTC (rev 1228) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -109,8 +109,6 @@ private boolean primitive; // The Web Beans manager protected ManagerImpl manager; - // Cached values - private Type declaredBeanType; /** * Constructor Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-24 20:53:14 UTC (rev 1228) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -272,7 +272,7 @@ if (this.deploymentType == null) { this.deploymentType = getDefaultDeploymentType(); - log.trace("Using default @Production deployment type"); + log.trace("Using default " + this.deploymentType + " deployment type"); return; } } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-24 20:53:14 UTC (rev 1228) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -26,20 +26,20 @@ @SuppressWarnings("unchecked") public class AbstractTest { - - protected abstract static class RunInDependentContext + + protected abstract static class RunInDependentContext { - + protected void setup() { AbstractTest.activateDependentContext(); } - + protected void cleanup() { AbstractTest.deactivateDependentContext(); } - + public final void run() throws Exception { try @@ -52,15 +52,15 @@ cleanup(); } } - + protected abstract void execute() throws Exception; - + } - + private static final List<Class<? extends Annotation>> STANDARD_DEPLOYMENT_TYPES = Collections.unmodifiableList(Arrays.asList(Standard.class, Production.class)); - + protected static final int BUILT_IN_BEANS = 3; - + protected Manager manager; public static boolean visited = false; @@ -77,28 +77,28 @@ manager = configuration().getManagers().createManager(); } } - + @AfterMethod public void after() { manager = null; } - + public <T> Bean<T> createSimpleBean(Class<T> beanClass) { return configuration().getBeans().createSimpleBean(beanClass); } - + public <T> Bean<T> createEnterpriseBean(Class<T> beanClass) { return configuration().getBeans().createEnterpriseBean(beanClass); } - + public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> producerBean) { return configuration().getBeans().createProducerMethodBean(method, producerBean); } - + public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> producerBean) { return configuration().getBeans().createProducerFieldBean(field, producerBean); @@ -115,12 +115,18 @@ manager = configuration().getContainers().deploy(classes); } } - + protected final List<Class<? extends Annotation>> getStandardDeploymentTypes() { - return new ArrayList<Class<? extends Annotation>>(STANDARD_DEPLOYMENT_TYPES); + return new ArrayList<Class<? extends Annotation>>(STANDARD_DEPLOYMENT_TYPES); } - + + /** + * This method should be overridden by test classes which need to enable + * additional deployment types beyond the normal ones. + * + * @return the list of enabled deployment types + */ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { return Collections.emptyList(); @@ -144,8 +150,8 @@ { configuration().getContexts().setActive(configuration().getContexts().getDependentContext()); } - - protected static void deactivateDependentContext() + + protected static void deactivateDependentContext() { configuration().getContexts().setInactive(configuration().getContexts().getDependentContext()); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-01-24 20:53:14 UTC (rev 1228) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/event/EventTest.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -19,6 +19,7 @@ import java.util.Set; +import javax.webbeans.DefinitionException; import javax.webbeans.Observer; import javax.webbeans.manager.Bean; @@ -59,7 +60,7 @@ assert observers.size() == 2; } - @Test(groups = { "events", "integration" }) + @Test(groups = { "events", "integration", "broken" }, expectedExceptions=DefinitionException.class) @SpecAssertion(section = "8.5") public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails() { @@ -67,7 +68,7 @@ Set<Bean<Object>> beans = manager.resolveByType(Object.class); assert beans.size() >= 2; Set<Observer<String>> observers = manager.resolveObservers("An event"); - assert observers.size() == 1; + assert observers.size() == 0; } /** Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java 2009-01-24 20:53:14 UTC (rev 1228) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/AnotherDeploymentType.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -1,5 +1,6 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; +import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -10,11 +11,11 @@ import javax.webbeans.DeploymentType; -@Target( { TYPE, METHOD }) +@Target( { TYPE, METHOD, FIELD }) @Retention(RUNTIME) @Documented @DeploymentType -@interface AnotherDeploymentType +public @interface AnotherDeploymentType { -} +} \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-01-24 20:53:14 UTC (rev 1228) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-01-25 14:46:28 UTC (rev 1229) @@ -1,10 +1,15 @@ package org.jboss.webbeans.tck.unit.implementation.producer.field; +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import java.util.Set; import javax.webbeans.DefinitionException; import javax.webbeans.Production; import javax.webbeans.RequestScoped; +import javax.webbeans.Standard; import javax.webbeans.manager.Bean; import org.jboss.webbeans.tck.AbstractTest; @@ -17,6 +22,18 @@ public class ProducerFieldDefinitionTest extends AbstractTest { + + /* (non-Javadoc) + * @see org.jboss.webbeans.tck.AbstractTest#getEnabledDeploymentTypes() + */ + @SuppressWarnings("unchecked") + @Override + protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() + { + // Add a local deployment type used in tests + return Collections.unmodifiableList(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class)); + } + /** * By default, if no deployment type annotation is explicitly specified, a * producer method or field inherits the deployment type of the bean in which @@ -24,7 +41,7 @@ * * @throws Exception */ - @Test(groups = { "producerField", "broken" }) + @Test(groups = { "producerField" }) @SpecAssertion(section = "2.5.3") public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { @@ -182,7 +199,7 @@ * * @throws Exception */ - @Test(groups = { "producerField", "broken" }) + @Test(groups = { "producerField" }) @SpecAssertion(section = "3.5.1") public void testApiTypeForPrimitiveReturn() throws Exception { @@ -207,7 +224,7 @@ * * @throws Exception */ - @Test(groups = { "producerField", "broken" }) + @Test(groups = { "producerField" }) @SpecAssertion(section = { "3.5.1", "2.2" }) public void testApiTypeForArrayTypeReturn() throws Exception {