12:19 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-06-09 13:19:44 -0400 (Tue, 09 Jun 2009)
New Revision: 2799
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Important.java
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/remove/EnterpriseBeanRemoveMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java
Log:
Fixes to i/c suite
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-06-09
14:49:53 UTC (rev 2798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-09
17:19:44 UTC (rev 2799)
@@ -6,6 +6,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.spi.Context;
+import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
import org.hibernate.tck.annotations.SpecAssertion;
@@ -102,10 +103,13 @@
}
@Test(groups = { "enterpriseBeans", "lifecycle",
"integration" })
- @SpecAssertion(section = "6.5", id = "c")
+ @SpecAssertions({
+ @SpecAssertion(section = "6.5", id = "c"),
+ @SpecAssertion(section = "3.3.1", id = "db")
+ })
public void testRemovedEjbIgnored()
{
- KleinStadt stadtInstance = getInstanceByType(KleinStadt.class);
+ KleinStadt stadtInstance = getInstanceByType(KleinStadt.class, new
AnnotationLiteral<Important>() {});
assert stadtInstance != null : "Expected instance to be created by
container";
stadtInstance.setName("Kassel-Wilhelmshoehe");
stadtInstance.zustandVergessen();
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java 2009-06-09
17:19:44 UTC (rev 2799)
@@ -0,0 +1,48 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.EJB;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+@Stateful
+@Important
+public class Heidelburg implements KleinStadt
+{
+ private String name;
+
+ @EJB
+ private GrossStadt grossStadt;
+
+ @PostConstruct
+ public void begruendet()
+ {
+ grossStadt.kleinStadtCreated();
+ name = "Heidelburg";
+ }
+
+ @Remove
+ public void zustandVergessen()
+ {
+ }
+
+ @PreDestroy
+ public void zustandVerloren()
+ {
+ grossStadt.kleinStadtDestroyed();
+ }
+
+ public void ping() {}
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Important.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Important.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Important.java 2009-06-09
17:19:44 UTC (rev 2799)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+/**
+ * @author Dan Allen
+ */
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@Inherited
+public @interface Important {
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Important.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-06-09
14:49:53 UTC (rev 2798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-06-09
17:19:44 UTC (rev 2799)
@@ -59,7 +59,7 @@
}.run();
}
- @Test(groups = { "enterpriseBeans", "removeMethod",
"lifecycle", "ri-broken" }, expectedExceptions =
UnsupportedOperationException.class)
+ @Test(groups = { "enterpriseBeans", "removeMethod",
"lifecycle" }, expectedExceptions = UnsupportedOperationException.class)
@SpecAssertions({
@SpecAssertion(section = "3.3.1", id = "b"),
@SpecAssertion(section = "3.3.1", id = "c")
@@ -71,25 +71,4 @@
assert false : "Should never reach this assertion";
}
- @Test(groups = { "enterpriseBeans", "removeMethod",
"lifecycle" })
- @SpecAssertion(section = "3.3.1", id = "db")
- public void
applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButInstanceIsNotDestroyed()
throws Exception
- {
- StateKeeper stateKeeper = getInstanceByType(StateKeeper.class);
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- DependentSessionInterface sessionBean = (DependentSessionInterface)
-
getCurrentManager().getReference(getCurrentManager().getBeans(DependentSessionInterface.class).iterator().next(),
- DependentSessionInterface.class);
-
- sessionBean.businessMethod();
- }
- }.run();
- assert !stateKeeper.isBeanDestroyed();
- }
-
}
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java 2009-06-09
14:49:53 UTC (rev 2798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/EnterpriseBeanInjectionTest.java 2009-06-09
17:19:44 UTC (rev 2799)
@@ -1,7 +1,5 @@
package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
-import javax.enterprise.inject.spi.Bean;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
@@ -28,8 +26,7 @@
@Override
protected void execute() throws Exception
{
- Bean<HenHouseLocal> bean =
getBeans(HenHouseLocal.class).iterator().next();
- HenHouseLocal henHouse =
getCurrentManager().getContext(bean.getScopeType()).get(bean);
+ HenHouseLocal henHouse = getInstanceByType(HenHouseLocal.class);
assert henHouse.getFox() != null;
assert henHouse.getFox().getName().equals("gavin");
}
@@ -45,8 +42,7 @@
@Override
protected void execute() throws Exception
{
- Bean<HenHouseLocal> bean = getBeans(HenHouseLocal.class, new
MegaPoorBinding()).iterator().next();
- HenHouseLocal henHouse =
getCurrentManager().getContext(bean.getScopeType()).get(bean);
+ HenHouseLocal henHouse = getInstanceByType(HenHouseLocal.class);
assert henHouse.getFox() != null;
assert henHouse.getFox().getName().equals("gavin");
}