Author: jharting Date: 2010-01-29 05:35:19 -0500 (Fri, 29 Jan 2010) New Revision: 5661 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java Log: Test also lifecycle callback interceptors defined on an interceptor superclasses Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java 2010-01-29 07:50:35 UTC (rev 5660) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java 2010-01-29 10:35:19 UTC (rev 5661) @@ -19,7 +19,7 @@ import javax.annotation.PostConstruct; import javax.interceptor.InvocationContext; -class Interceptor3 +class Interceptor3 extends Interceptor2 { @PostConstruct void postConstruct3(InvocationContext ctx) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java 2010-01-29 07:50:35 UTC (rev 5660) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java 2010-01-29 10:35:19 UTC (rev 5661) @@ -19,7 +19,7 @@ import javax.annotation.PostConstruct; import javax.interceptor.InvocationContext; -class Interceptor4 +class Interceptor4 extends Interceptor3 { @PostConstruct void postConstruct(InvocationContext ctx) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java 2010-01-29 07:50:35 UTC (rev 5660) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java 2010-01-29 10:35:19 UTC (rev 5661) @@ -19,7 +19,7 @@ import javax.annotation.PostConstruct; import javax.interceptor.Interceptors; -@Interceptors( { Interceptor1.class, Interceptor2.class, Interceptor3.class, Interceptor4.class }) +@Interceptors( { Interceptor1.class, Interceptor4.class }) class LakeCargoShip extends CargoShip { // Every interceptor sets this property to a certain value.