Author: pete.muir(a)jboss.org Date: 2010-01-28 17:44:46 -0500 (Thu, 28 Jan 2010) New Revision: 5659 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java Log: bind interceptors to correct class, enable interceptor1, interceptor2 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java 2010-01-28 22:32:55 UTC (rev 5658) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java 2010-01-28 22:44:46 UTC (rev 5659) @@ -17,9 +17,7 @@ package org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order; import javax.annotation.PostConstruct; -import javax.interceptor.Interceptors; -@Interceptors( { Interceptor3.class, Interceptor4.class }) class CargoShip extends Ship { @PostConstruct Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java 2010-01-28 22:32:55 UTC (rev 5658) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java 2010-01-28 22:44:46 UTC (rev 5659) @@ -36,6 +36,7 @@ }) public void testInvocationOrder() { getInstanceByType(LakeCargoShip.class); + int s = LakeCargoShip.getSequence(); assert LakeCargoShip.getSequence() == 7; } } 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-28 22:32:55 UTC (rev 5658) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java 2010-01-28 22:44:46 UTC (rev 5659) @@ -17,7 +17,9 @@ package org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order; import javax.annotation.PostConstruct; +import javax.interceptor.Interceptors; +@Interceptors( { Interceptor1.class, Interceptor2.class, Interceptor3.class, Interceptor4.class }) class LakeCargoShip extends CargoShip { // Every interceptor sets this property to a certain value.