[webbeans-commits] Webbeans SVN: r1165 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit: implementation/enterprise and 3 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Jan 22 07:55:55 EST 2009
Author: dallen6
Date: 2009-01-22 07:55:55 -0500 (Thu, 22 Jan 2009)
New Revision: 1165
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CairnsTerrier.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Armant_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoodDoggie.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java
Log:
Cleanup of @Destructor references (not the the tests) and added producer field lifecycle test.
Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CairnsTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CairnsTerrier.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/CairnsTerrier.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,17 +0,0 @@
-package org.jboss.webbeans.tck.unit.event;
-
-import javax.ejb.Stateless;
-import javax.webbeans.Destructor;
-import javax.webbeans.Observes;
-import javax.webbeans.manager.Initialized;
-import javax.webbeans.manager.Manager;
-
- at Stateless
-class CairnsTerrier
-{
- @Destructor
- public void observeInitialized(@Observes @Initialized Manager manager)
- {
- }
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Armant_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Armant_Broken.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Armant_Broken.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -2,12 +2,11 @@
import javax.ejb.Remove;
import javax.ejb.Stateless;
-import javax.webbeans.Destructor;
@Stateless
class Armant_Broken
{
- @Destructor @Remove
+ @Remove
public void bye() {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -2,7 +2,6 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.webbeans.Destructor;
import javax.webbeans.Disposes;
import javax.webbeans.RequestScoped;
@@ -10,7 +9,7 @@
@RequestScoped
class GoldenRetriever
{
- @Remove @Destructor
+ @Remove
public void bye(@Disposes Object something) {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoodDoggie.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoodDoggie.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/GoodDoggie.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -2,7 +2,6 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.webbeans.Destructor;
@Stateful
class GoodDoggie implements LocalGoodDoggie
@@ -10,7 +9,7 @@
public static boolean destructorCalled = false;
- @Destructor @Remove
+ @Remove
public void bye() {
destructorCalled = true;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/JackRussellTerrier.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -2,7 +2,6 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.webbeans.Destructor;
import javax.webbeans.Observes;
import javax.webbeans.RequestScoped;
@@ -10,7 +9,7 @@
@RequestScoped
class JackRussellTerrier
{
- @Remove @Destructor
+ @Remove
public void bye(@Observes Object something) {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Pitbull.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -3,7 +3,6 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.webbeans.ApplicationScoped;
-import javax.webbeans.Destructor;
import javax.webbeans.Named;
@Stateful
@@ -14,7 +13,7 @@
public static boolean destructorCalled = false;
- @Remove @Destructor
+ @Remove
public void bye()
{
destructorCalled = true;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/Rottweiler.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,19 +1,16 @@
package org.jboss.webbeans.tck.unit.implementation.enterprise;
import javax.ejb.Stateful;
-import javax.webbeans.Destructor;
import javax.webbeans.RequestScoped;
@Stateful
@RequestScoped
class Rottweiler
{
- @Destructor
public void bye() {
}
- @Destructor
public void bye2() {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/enterprise/RussellTerrier.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,14 +1,12 @@
package org.jboss.webbeans.tck.unit.implementation.enterprise;
import javax.ejb.Stateful;
-import javax.webbeans.Destructor;
import javax.webbeans.RequestScoped;
@Stateful
@RequestScoped
class RussellTerrier
{
- @Destructor
public void bye() {
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/Shrike.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,6 +1,5 @@
package org.jboss.webbeans.tck.unit.implementation.initializer;
-import javax.webbeans.Destructor;
import javax.webbeans.Initializer;
class Shrike
@@ -8,7 +7,6 @@
@Initializer
- @Destructor
public void setName(String name)
{
// No-op
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -14,7 +14,7 @@
@Produces @Tame public Tarantula produceTameTarantula = new DefangedTarantula();
- @Produces public Tarantula produceTarantula = new Tarantula();
+ @Produces public static Tarantula produceTarantula = new Tarantula();
@Produces @Named("blackWidow") public BlackWidow produceBlackWidow = new BlackWidow();
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer_Broken.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/OtherSpiderProducer_Broken.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,6 +1,5 @@
package org.jboss.webbeans.tck.unit.implementation.producer.field;
-import javax.webbeans.Destructor;
import javax.webbeans.Disposes;
import javax.webbeans.Observes;
import javax.webbeans.Produces;
@@ -23,7 +22,7 @@
return "foo";
}
- @Produces @Destructor
+ @Produces
public String destroy()
{
return "foo";
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,6 +1,7 @@
package org.jboss.webbeans.tck.unit.implementation.producer.field;
import java.lang.reflect.Field;
+import java.util.Set;
import javax.webbeans.IllegalProductException;
import javax.webbeans.manager.Bean;
@@ -13,40 +14,62 @@
@SpecVersion("20081206")
public class ProducerFieldLifecycleTest extends AbstractTest
{
-
- @SuppressWarnings("unchecked")
- @Test(groups={"producerField", "broken"}) @SpecAssertion(section="5.6")
+
+ /**
+ * When the create() method of a Bean object that represents a producer field
+ * is called, the container must access the producer field to obtain the
+ * current value of the field.
+ *
+ * • If the producer method is static, the container must access the field
+ * value.
+ *
+ * @throws Exception
+ */
+ @Test(groups = { "producerField", "broken" })
+ @SpecAssertion(section = "5.6")
+ public void testProducerStaticFieldBean()
+ {
+ deployBeans(OtherSpiderProducer.class, TarantulaConsumer.class);
+ TarantulaConsumer tarantulaConsumer = manager.getInstanceByType(TarantulaConsumer.class);
+ assert tarantulaConsumer.getConsumedTarantula().equals(OtherSpiderProducer.produceTarantula);
+ }
+
+ @Test(groups = { "producerField", "broken" })
+ @SpecAssertion(section = "5.6")
public void testProducerFieldBeanCreate() throws Exception
{
- Bean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class);
- manager.addBean(spiderProducer);
+ deployBeans(OtherSpiderProducer.class);
+ Set<Bean<OtherSpiderProducer>> beans = manager.resolveByType(OtherSpiderProducer.class);
+ assert beans.size() == 1;
+ Bean<OtherSpiderProducer> spiderProducer = beans.iterator().next();
Field method = OtherSpiderProducer.class.getField("produceTarantula");
Bean<Tarantula> tarantulaBean = createProducerFieldBean(method, spiderProducer);
Tarantula tarantula = tarantulaBean.create();
assert tarantula != null;
}
-
- @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.3.3")
+
+ @Test(groups = { "stub", "specialization" })
+ @SpecAssertion(section = "3.3.3")
public void testSpecializedBeanAlwaysUsed()
{
// TODO Placeholder
assert false;
}
-
-
- @SuppressWarnings("unchecked")
- @Test(groups={"producerField", "broken"}) @SpecAssertion(section={"3.5", "5.6", "8.3"})
+
+ @Test(groups = { "producerField", "broken" })
+ @SpecAssertion(section = { "3.5", "5.6", "8.3" })
public void testProducerFieldReturnsNullIsDependent() throws Exception
{
- Bean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class);
+ Bean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class);
manager.addBean(spiderProducer);
Field method = OtherSpiderProducer.class.getField("getNullSpider");
Bean<Spider> spiderBean = createProducerFieldBean(method, spiderProducer);
Spider spider = spiderBean.create();
assert spider == null;
}
-
- @Test(groups="producerField", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.5", "5.6"})
+
+ @Test(groups = "producerField", expectedExceptions = IllegalProductException.class)
+ @SpecAssertion(section = { "3.5", "5.6" })
public void testProducerFieldReturnsNullIsNotDependent() throws Exception
{
Bean<OtherSpiderProducer_Broken> spiderProducer = createSimpleBean(OtherSpiderProducer_Broken.class);
@@ -54,5 +77,5 @@
Field method = OtherSpiderProducer_Broken.class.getField("getRequestScopedSpider");
createProducerFieldBean(method, spiderProducer).create();
}
-
+
}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -0,0 +1,39 @@
+/*
+ * 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.webbeans.tck.unit.implementation.producer.field;
+
+import javax.webbeans.Current;
+
+/**
+ * This bean contains an injection point for a Tarantula that must be provided
+ * by the container via a producer field.
+ *
+ * @author David Allen
+ *
+ */
+public class TarantulaConsumer
+{
+ @Current
+ private Tarantula consumedTarantula;
+
+ public Tarantula getConsumedTarantula()
+ {
+ return consumedTarantula;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/field/TarantulaConsumer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java 2009-01-22 12:25:28 UTC (rev 1164)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/SpiderProducer_Broken.java 2009-01-22 12:55:55 UTC (rev 1165)
@@ -1,6 +1,5 @@
package org.jboss.webbeans.tck.unit.implementation.producer.method;
-import javax.webbeans.Destructor;
import javax.webbeans.Disposes;
import javax.webbeans.Observes;
import javax.webbeans.Produces;
@@ -16,7 +15,7 @@
return null;
}
- @Produces @Destructor
+ @Produces
public String destroy()
{
return "foo";
More information about the weld-commits
mailing list