[webbeans-commits] Webbeans SVN: r1091 - in tck/trunk/impl: src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2009-01-19 15:26:33 -0500 (Mon, 19 Jan 2009) New Revision: 1091 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/BookOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/CdOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/NovelOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/OrderProcessor.java Removed: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/BookOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/CdOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/LifecycleCallbackTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/NovelOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/OrderProcessor.java Modified: tck/trunk/impl/pom.xml tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/SimpleBeanLifecycleTest.java Log: refactor tests slightly Modified: tck/trunk/impl/pom.xml =================================================================== --- tck/trunk/impl/pom.xml 2009-01-19 18:34:54 UTC (rev 1090) +++ tck/trunk/impl/pom.xml 2009-01-19 20:26:33 UTC (rev 1091) @@ -63,6 +63,12 @@ <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>tck-utils</artifactId> + <scope>test</scope> + </dependency> </dependencies> Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/BookOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/BookOrderProcessor.java 2009-01-19 18:34:54 UTC (rev 1090) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/BookOrderProcessor.java 2009-01-19 20:26:33 UTC (rev 1091) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.commonAnnotations; - -class BookOrderProcessor extends OrderProcessor -{ - - @Override - public void postConstruct() {} - - @Override - public void preDestroy() {} - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/CdOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/CdOrderProcessor.java 2009-01-19 18:34:54 UTC (rev 1090) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/CdOrderProcessor.java 2009-01-19 20:26:33 UTC (rev 1091) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.commonAnnotations; - -class CdOrderProcessor extends OrderProcessor -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/LifecycleCallbackTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/LifecycleCallbackTest.java 2009-01-19 18:34:54 UTC (rev 1090) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/LifecycleCallbackTest.java 2009-01-19 20:26:33 UTC (rev 1091) @@ -1,80 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.commonAnnotations; - -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -public class LifecycleCallbackTest extends AbstractTest -{ - - @Test @SpecAssertion(section="4.2") - public void testSubClassInheritsPostConstructOnSuperclass() throws Exception - { - OrderProcessor.postConstructCalled = false; - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - Bean<CdOrderProcessor> bean = createSimpleBean(CdOrderProcessor.class); - bean.create(); - } - }.run(); - assert OrderProcessor.postConstructCalled; - } - - @Test @SpecAssertion(section="4.2") - public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception - { - OrderProcessor.preDestroyCalled = false; - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - Bean<CdOrderProcessor> bean = createSimpleBean(CdOrderProcessor.class); - CdOrderProcessor instance = bean.create(); - bean.destroy(instance); - } - }.run(); - assert OrderProcessor.preDestroyCalled; - } - - @Test @SpecAssertion(section="4.2") - public void testSubClassDoesNotInheritPostConstructOnSuperclassBlockedByIntermediateClass() throws Exception - { - - OrderProcessor.postConstructCalled = false; - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - Bean<NovelOrderProcessor> bean = createSimpleBean(NovelOrderProcessor.class); - bean.create(); - } - }.run(); - assert !OrderProcessor.postConstructCalled; - } - - @Test @SpecAssertion(section="4.2") - public void testSubClassDoesNotInheritPreDestroyConstructOnSuperclassBlockedByIntermediateClass() throws Exception - { - OrderProcessor.preDestroyCalled = false; - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - Bean<NovelOrderProcessor> bean = createSimpleBean(NovelOrderProcessor.class); - NovelOrderProcessor instance = bean.create(); - bean.destroy(instance); - } - }.run(); - assert !OrderProcessor.preDestroyCalled; - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/NovelOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/NovelOrderProcessor.java 2009-01-19 18:34:54 UTC (rev 1090) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/NovelOrderProcessor.java 2009-01-19 20:26:33 UTC (rev 1091) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.commonAnnotations; - -class NovelOrderProcessor extends BookOrderProcessor -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/OrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/OrderProcessor.java 2009-01-19 18:34:54 UTC (rev 1090) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/OrderProcessor.java 2009-01-19 20:26:33 UTC (rev 1091) @@ -1,25 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.commonAnnotations; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - -class OrderProcessor -{ - - public static boolean postConstructCalled = false; - - public static boolean preDestroyCalled = true; - - @PostConstruct - public void postConstruct() - { - postConstructCalled = true; - } - - @PreDestroy - public void preDestroy() - { - preDestroyCalled = true; - } - -} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/BookOrderProcessor.java (from rev 1088, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/BookOrderProcessor.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/BookOrderProcessor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/BookOrderProcessor.java 2009-01-19 20:26:33 UTC (rev 1091) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.tck.tests.implementation.simple; + +class BookOrderProcessor extends OrderProcessor +{ + + @Override + public void postConstruct() {} + + @Override + public void preDestroy() {} + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/BookOrderProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/CdOrderProcessor.java (from rev 1088, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/CdOrderProcessor.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/CdOrderProcessor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/CdOrderProcessor.java 2009-01-19 20:26:33 UTC (rev 1091) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.simple; + +class CdOrderProcessor extends OrderProcessor +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/CdOrderProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/NovelOrderProcessor.java (from rev 1088, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/NovelOrderProcessor.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/NovelOrderProcessor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/NovelOrderProcessor.java 2009-01-19 20:26:33 UTC (rev 1091) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.simple; + +class NovelOrderProcessor extends BookOrderProcessor +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/NovelOrderProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/OrderProcessor.java (from rev 1088, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/commonAnnotations/OrderProcessor.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/OrderProcessor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/OrderProcessor.java 2009-01-19 20:26:33 UTC (rev 1091) @@ -0,0 +1,25 @@ +package org.jboss.webbeans.tck.tests.implementation.simple; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +class OrderProcessor +{ + + public static boolean postConstructCalled = false; + + public static boolean preDestroyCalled = true; + + @PostConstruct + public void postConstruct() + { + postConstructCalled = true; + } + + @PreDestroy + public void preDestroy() + { + preDestroyCalled = true; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/OrderProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/SimpleBeanLifecycleTest.java 2009-01-19 18:34:54 UTC (rev 1090) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/simple/SimpleBeanLifecycleTest.java 2009-01-19 20:26:33 UTC (rev 1091) @@ -92,6 +92,74 @@ assert farm.closed!=null; } + @Test @SpecAssertion(section="4.2") + public void testSubClassInheritsPostConstructOnSuperclass() throws Exception + { + OrderProcessor.postConstructCalled = false; + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + Bean<CdOrderProcessor> bean = createSimpleBean(CdOrderProcessor.class); + bean.create(); + } + }.run(); + assert OrderProcessor.postConstructCalled; + } + + @Test @SpecAssertion(section="4.2") + public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception + { + OrderProcessor.preDestroyCalled = false; + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + Bean<CdOrderProcessor> bean = createSimpleBean(CdOrderProcessor.class); + CdOrderProcessor instance = bean.create(); + bean.destroy(instance); + } + }.run(); + assert OrderProcessor.preDestroyCalled; + } + + @Test @SpecAssertion(section="4.2") + public void testSubClassDoesNotInheritPostConstructOnSuperclassBlockedByIntermediateClass() throws Exception + { + + OrderProcessor.postConstructCalled = false; + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + Bean<NovelOrderProcessor> bean = createSimpleBean(NovelOrderProcessor.class); + bean.create(); + } + }.run(); + assert !OrderProcessor.postConstructCalled; + } + + @Test @SpecAssertion(section="4.2") + public void testSubClassDoesNotInheritPreDestroyConstructOnSuperclassBlockedByIntermediateClass() throws Exception + { + OrderProcessor.preDestroyCalled = false; + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + Bean<NovelOrderProcessor> bean = createSimpleBean(NovelOrderProcessor.class); + NovelOrderProcessor instance = bean.create(); + bean.destroy(instance); + } + }.run(); + assert !OrderProcessor.preDestroyCalled; + + } + @Test(groups="injection") @SpecAssertion(section="5.3") public void testCreateInjectsFieldsDeclaredInJava() {