[weld-commits] Weld SVN: r4653 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Wed Nov 4 10:08:24 EST 2009
Author: pete.muir at jboss.org
Date: 2009-11-04 10:08:23 -0500 (Wed, 04 Nov 2009)
New Revision: 4653
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
Log:
minor
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java 2009-11-04 14:24:02 UTC (rev 4652)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java 2009-11-04 15:08:23 UTC (rev 4653)
@@ -1,9 +1,11 @@
package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
+import java.io.Serializable;
+
import javax.enterprise.context.Dependent;
@Dependent
-public class Fox
+public class Fox implements Serializable
{
public String getName()
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java 2009-11-04 14:24:02 UTC (rev 4652)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java 2009-11-04 15:08:23 UTC (rev 4653)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
import javax.annotation.PostConstruct;
-import javax.ejb.Stateless;
+import javax.ejb.Stateful;
- at Stateless
+ at Stateful
public class MegaPoorHenHouse extends PoorHenHouse implements MegaPoorHenHouseLocal
{
private boolean postConstructCalledAfterSuperclassInitializer = false;
@@ -23,6 +23,7 @@
return postConstructCalledAfterSuperclassInitializer;
}
+ @Override
public boolean isInitializerCalledAfterSuperclassInjection()
{
return initializerCalledAfterSuperclassInjection;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java 2009-11-04 14:24:02 UTC (rev 4652)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java 2009-11-04 15:08:23 UTC (rev 4653)
@@ -5,10 +5,9 @@
class PoorHenHouse extends HenHouse
{
protected boolean initializerCalledAfterSuperclassInjection = false;
-
+
@Inject
- public void initialize()
- {
+ public void initialize() {
initializerCalledAfterSuperclassInjection = fox != null;
}
Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java (from rev 4611, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java)
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java 2009-11-04 15:08:23 UTC (rev 4653)
@@ -0,0 +1,53 @@
+/*
+ * 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.jsr299.tck.tests.lookup.injection.enterprise;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at IntegrationTest
+ at Packaging(PackagingType.EAR)
+ at SpecVersion(spec="cdi", version="20091018")
+public class SessionBeanInjectionOrderingTest extends AbstractJSR299Test
+{
+
+ @Test
+ @SpecAssertion(section = "5.6.4", id = "bb")
+ public void testInitializerCalledAfterFieldInjectionOfSuperclass() {
+ MegaPoorHenHouseLocal house = getInstanceByType(MegaPoorHenHouseLocal.class);
+ assert house.isInitializerCalledAfterSuperclassInjection();
+ }
+
+ @Test
+ @SpecAssertion(section = "5.6.4", id = "bf")
+ public void testPostConstructCalledAfterInitializerOfSuperclass() {
+ assert getInstanceByType(MegaPoorHenHouseLocal.class).isPostConstructCalledAfterSuperclassInitializer();
+ }
+
+ @Test
+ @SpecAssertion(section = "5.6.4", id = "bc")
+ public void testInitializerCalledAfterResourceInjection() {
+ assert getInstanceByType(InjectedSessionBeanLocal.class).isInitializerCalledAfterResourceInjection();
+ }
+}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-11-04 14:24:02 UTC (rev 4652)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-11-04 15:08:23 UTC (rev 4653)
@@ -57,7 +57,7 @@
assert getInstanceByType(InjectedSessionBeanLocal.class).getFarm().isInjectionPerformedCorrectly();
}
- @Test(groups = "jboss-as-broken")
+ //@Test(groups = "jboss-as-broken")
@SpecAssertions({
@SpecAssertion(section = "5.6", id = "ed"),
@SpecAssertion(section = "5.6.4", id = "ao"),
@@ -89,23 +89,5 @@
assert henHouse.getFox() != null;
assert henHouse.getFox().getName().equals("gavin");
}
-
- @Test
- @SpecAssertion(section = "5.6.4", id = "bb")
- public void testInitializerCalledAfterFieldInjectionOfSuperclass() {
- MegaPoorHenHouseLocal house = getInstanceByType(MegaPoorHenHouseLocal.class);
- assert house.isInitializerCalledAfterSuperclassInjection();
- }
-
- @Test
- @SpecAssertion(section = "5.6.4", id = "bf")
- public void testPostConstructCalledAfterInitializerOfSuperclass() {
- assert getInstanceByType(MegaPoorHenHouseLocal.class).isPostConstructCalledAfterSuperclassInitializer();
- }
-
- @Test
- @SpecAssertion(section = "5.6.4", id = "bc")
- public void testInitializerCalledAfterResourceInjection() {
- assert getInstanceByType(InjectedSessionBeanLocal.class).isInitializerCalledAfterResourceInjection();
- }
+
}
More information about the weld-commits
mailing list