[webbeans-commits] Webbeans SVN: r2697 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: implementation/enterprise/lifecycle and 3 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu May 21 08:08:27 EDT 2009
Author: dallen6
Date: 2009-05-21 08:08:27 -0400 (Thu, 21 May 2009)
New Revision: 2697
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Acorn.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Pollen.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Den.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/FoxLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Litter.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
Log:
A few additional tests for section 3
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-05-19 21:31:05 UTC (rev 2696)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -53,14 +53,6 @@
assert getCurrentManager().resolveByType(GiraffeLocal.class).size() > 0;
}
- @Test(groups = { "enterpriseBeans", "ejbjarxml", "stub" })
- @SpecAssertion(section = "3.3.2", id = "b")
- public void testEJBJARDefinedEnterpriseBean()
- {
- // TODO dupe?
- assert false;
- }
-
@Test(groups = { "enterpriseBeans" })
@SpecAssertions( {
@SpecAssertion(section = "3.2.1", id = "f"),
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-05-19 21:31:05 UTC (rev 2696)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -41,8 +41,11 @@
public class EnterpriseBeanViaXmlTest extends AbstractJSR299Test
{
- @Test(groups = { "enterpriseBeans" })
- @SpecAssertions( { @SpecAssertion(section = "3.2.1", id = "n") })
+ @Test(groups = { "enterpriseBeans", "ejbjarxml" })
+ @SpecAssertions( {
+ @SpecAssertion(section = "3.2.1", id = "n"),
+ @SpecAssertion(section = "3.3.2", id = "b")
+ })
public void testEjbDeclaredInXmlNotSimpleBean()
{
Bean<ElephantLocal> elephantBean = getCurrentManager().resolveByType(ElephantLocal.class).iterator().next();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-05-19 21:31:05 UTC (rev 2696)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -43,13 +43,18 @@
* When the create() method of a Bean object that represents a stateful
* session bean that is called, the container creates and returns a session
* bean proxy, as defined in Section 3.3.9, "Session bean proxies".
+ * @throws Exception
+ *
+ * TODO Check this test once WBRI-269 is fixed
*/
- @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
+ @Test(groups = { "ri-broken", "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
@SpecAssertions( {
- @SpecAssertion(section = "3.3.8", id = "a"),
+ @SpecAssertion(section = "3.3.8", id = "a"),
+ @SpecAssertion(section = "3.3.9", id = "a"),
+ @SpecAssertion(section = "3.3.9", id = "b"),
@SpecAssertion(section = "6", id = "a"),
@SpecAssertion(section = "6.5", id = "a") })
- public void testCreateSFSB()
+ public void testCreateSFSB() throws Exception
{
GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class);
Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next();
@@ -70,6 +75,11 @@
Set<Class<?>> interfaces = new HashSet<Class<?>>(Arrays.asList(stadtInstance.getClass().getInterfaces()));
assert interfaces.contains(KleinStadt.class);
assert interfaces.contains(SchoeneStadt.class);
+
+ byte[] bytes = serialize(stadtInstance);
+ stadtInstance = (KleinStadt) deserialize(bytes);
+ assert getCurrentConfiguration().getBeans().isProxy(stadtInstance);
+
//frankfurt.dispose();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Den.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Den.java 2009-05-19 21:31:05 UTC (rev 2696)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Den.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -1,10 +1,8 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
-import java.io.Serializable;
-public class Den implements Serializable
+public class Den
{
- private static final long serialVersionUID = 1L;
private String name;
public Den(String name)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java 2009-05-19 21:31:05 UTC (rev 2696)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Fox.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -1,16 +1,16 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
+import javax.context.SessionScoped;
import javax.ejb.Stateful;
-import javax.event.Observes;
import javax.inject.Disposes;
import javax.inject.Produces;
@Stateful
- at AnimalStereotype
+ at SessionScoped
public class Fox implements FoxLocal
{
- @Produces
- public Den den = new Den("FoxDen");
+ @Produces @Tame
+ private Den den = new Den("FoxDen");
private int nextLitterSize;
@@ -48,13 +48,13 @@
this.nextLitterSize = nextLitterSize;
}
- @Produces
+ @Produces @Tame
public Litter produceLitter()
{
return new Litter(nextLitterSize);
}
- public void disposeLitter(@Disposes Litter litter)
+ public void disposeLitter(@Disposes @Tame Litter litter)
{
this.litterDisposed = true;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/FoxLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/FoxLocal.java 2009-05-19 21:31:05 UTC (rev 2696)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/FoxLocal.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -6,18 +6,18 @@
public interface FoxLocal
{
- public abstract Den getDen();
+ public Den getDen();
- public abstract void setDen(Den den);
+ public void setDen(Den den);
- public abstract int getNextLitterSize();
+ public int getNextLitterSize();
- public abstract void setNextLitterSize(int nextLitterSize);
+ public void setNextLitterSize(int nextLitterSize);
- public abstract Litter produceLitter();
+ public Litter produceLitter();
- public abstract void disposeLitter(Litter litter);
+ public void disposeLitter(Litter litter);
- public abstract boolean isLitterDisposed();
+ public boolean isLitterDisposed();
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Litter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Litter.java 2009-05-19 21:31:05 UTC (rev 2696)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/Litter.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -1,6 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
-class Litter
+
+public class Litter
{
private int quantity;
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-05-19 21:31:05 UTC (rev 2696)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -1,5 +1,6 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
+import javax.inject.AnnotationLiteral;
import javax.inject.manager.Bean;
import org.hibernate.tck.annotations.SpecAssertion;
@@ -33,7 +34,7 @@
*
* @throws Exception
*/
- @Test(groups = { "new", "ri-broken" })
+ @Test(groups = { "new" })
@SpecAssertion(section = "3.3.6", id = "j")
public void testNewBeanHasNoProducerMethods() throws Exception
{
@@ -47,13 +48,18 @@
FoxLocal newFox = getCurrentManager().getInstanceByType(FoxLocal.class, new NewLiteral());
fox.setNextLitterSize(3);
newFox.setNextLitterSize(5);
- Litter theOnlyLitter = getCurrentManager().getInstanceByType(Litter.class);
+ Litter theOnlyLitter = getCurrentManager().getInstanceByType(Litter.class, new AnnotationLiteral<Tame>(){});
assert theOnlyLitter.getQuantity() == fox.getNextLitterSize();
}
}.run();
}
+ /**
+ * TODO Once WBRI-208 is fixed, check this test too
+ *
+ * @throws Exception
+ */
@Test(groups = { "new", "ri-broken" })
@SpecAssertion(section = "3.3.6", id = "k")
public void testNewBeanHasNoProducerFields() throws Exception
@@ -67,7 +73,7 @@
FoxLocal fox = getCurrentManager().getInstanceByType(FoxLocal.class);
FoxLocal newFox = getCurrentManager().getInstanceByType(FoxLocal.class, new NewLiteral());
newFox.setDen(new Den("NewFoxDen"));
- Den theOnlyDen = getCurrentManager().getInstanceByType(Den.class);
+ Den theOnlyDen = getCurrentManager().getInstanceByType(Den.class, new AnnotationLiteral<Tame>(){});
assert theOnlyDen.getName().equals(fox.getDen().getName());
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Acorn.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Acorn.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Acorn.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
+
+class Acorn
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Acorn.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
+
+import javax.context.Dependent;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
+
+ at AnotherDeploymentType
+class OakTree
+{
+ @Produces @Dependent public Acorn growAcorn()
+ {
+ return null;
+ }
+
+ @Produces @RequestScoped public Pollen pollinate()
+ {
+ return null;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/OakTree.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Pollen.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Pollen.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Pollen.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
+
+class Pollen
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/Pollen.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-05-19 21:31:05 UTC (rev 2696)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -5,6 +5,7 @@
import javax.context.RequestScoped;
import javax.inject.AnnotationLiteral;
import javax.inject.Current;
+import javax.inject.IllegalProductException;
import javax.inject.TypeLiteral;
import javax.inject.manager.Bean;
@@ -70,7 +71,7 @@
@Test(groups = "producerMethod")
@SpecAssertions({
- @SpecAssertion(section = "3.4", id = "b"),
+ @SpecAssertion(section = "3.4", id = "c"),
@SpecAssertion(section = "2.3.1", id = "a")
})
public void testDefaultBindingType() throws Exception
@@ -236,4 +237,19 @@
Tarantula instance = getCurrentManager().getInstance(tarantula);
assert instance.getDeathsCaused() == 1;
}
+
+ @Test
+ @SpecAssertion(section = "3.4", id = "e")
+ public void testDependentProducerReturnsNullValue()
+ {
+ assert getCurrentManager().getInstanceByType(Acorn.class) == null;
+ }
+
+ @Test(groups = { "ri-broken" }, expectedExceptions = { IllegalProductException.class })
+ @SpecAssertion(section = "3.4", id = "f")
+ public void testNonDependentProducerReturnsNullValue()
+ {
+ getCurrentManager().getInstanceByType(Pollen.class);
+ assert false;
+ }
}
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-05-19 21:31:05 UTC (rev 2696)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-05-21 12:08:27 UTC (rev 2697)
@@ -26,7 +26,8 @@
@Test
@SpecAssertions({
@SpecAssertion(section = "4.3.1", id = "f"),
- @SpecAssertion(section = "3.3.7", id = "b")
+ @SpecAssertion(section = "3.3.7", id = "b"),
+ @SpecAssertion(section = "3.3.7", id = "c")
})
public void testSpecializedBeanNotInstantiated() throws Exception
{
More information about the weld-commits
mailing list