Second pass at adding cdi-full to interceptors tests (#285)

* Update most tests to not use @interceptors so they work in Lite and full.
* Move cdi-full group tests to under org.jboss.cdi.tck.tests.full.interceptors.*

Signed-off-by: Scott M Stark <[email protected]>

Author: starksm64

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/AlphaInterceptor1.java

@@ -16,9 +16,11 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.Interceptor;
 
 @Interceptor
 @AlphaBinding(1)
+@Priority(Interceptor.Priority.APPLICATION)
 public class AlphaInterceptor1 extends AbstractInterceptor {
 }

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/AlphaInterceptor2.java

@@ -16,9 +16,11 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.Interceptor;
 
 @Interceptor
 @AlphaBinding(2)
+@Priority(Interceptor.Priority.APPLICATION)
 public class AlphaInterceptor2 extends AbstractInterceptor {
 }

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/BeanOverridingTypeLevelBinding.java

@@ -16,12 +16,14 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 
 import org.jboss.cdi.tck.util.ActionSequence;
 
 @AlphaBinding(1)
+@Dependent
 public class BeanOverridingTypeLevelBinding {
 
     @Inject

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/BeanWithConstructorLevelAndTypeLevelBinding.java

@@ -16,12 +16,14 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 
 import org.jboss.cdi.tck.util.ActionSequence;
 
 @AlphaBinding(1)
+@Dependent
 public class BeanWithConstructorLevelAndTypeLevelBinding {
 
     @Inject

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/BeanWithConstructorLevelBinding.java

@@ -16,11 +16,13 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 
 import org.jboss.cdi.tck.util.ActionSequence;
 
+@Dependent
 public class BeanWithConstructorLevelBinding {
 
     @Inject

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/BeanWithMultipleConstructorLevelBinding.java

@@ -16,11 +16,13 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 
 import org.jboss.cdi.tck.util.ActionSequence;
 
+@Dependent
 public class BeanWithMultipleConstructorLevelBinding {
 
     @Inject

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/BeanWithTypeLevelBinding.java

@@ -16,12 +16,14 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct;
 
+import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.inject.Inject;
 
 import org.jboss.cdi.tck.util.ActionSequence;
 
 @AlphaBinding(1)
+@Dependent
 public class BeanWithTypeLevelBinding {
 
     @Inject

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/BravoInterceptor.java

@@ -16,9 +16,11 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.aroundConstruct;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.Interceptor;
 
 @Interceptor
 @BravoBinding
+@Priority(Interceptor.Priority.APPLICATION)
 public class BravoInterceptor extends AbstractInterceptor {
 }

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java

@@ -48,7 +48,6 @@ public class ConstructorInterceptionTest extends AbstractTest {
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(ConstructorInterceptionTest.class)
-                .withBeansXml(new BeansXml().interceptors(AlphaInterceptor1.class, AlphaInterceptor2.class, BravoInterceptor.class))
                 .build();
     }
 

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/Bar.java

@@ -16,8 +16,11 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.broken;
 
+import jakarta.enterprise.context.Dependent;
+
 @FooStereotype
 @BarStereotype
+@Dependent
 public class Bar {
 
 }

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarInterceptor.java

@@ -16,12 +16,14 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.broken;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.AroundInvoke;
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
 
 @BarBinding
 @Interceptor
+@Priority(Interceptor.Priority.APPLICATION)
 public class BarInterceptor {
     @AroundInvoke
     public Object alwaysReturnThis(InvocationContext ctx) throws Exception {

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/Foo.java

@@ -16,8 +16,11 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.broken;
 
+import jakarta.enterprise.context.Dependent;
+
 @FooBinding
 @BarBinding
+@Dependent
 public class Foo {
 
 }

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooInterceptor.java

@@ -16,12 +16,14 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.broken;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.AroundInvoke;
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
 
 @FooBinding
 @Interceptor
+@Priority(Interceptor.Priority.APPLICATION)
 public class FooInterceptor {
     @AroundInvoke
     public Object alwaysReturnThis(InvocationContext ctx) throws Exception {

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java

@@ -45,7 +45,6 @@ public static WebArchive createTestArchive() {
                 .withClasses(Bar.class, FooBinding.class, BarBinding.class, BazBinding.class, FooInterceptor.class,
                         BarInterceptor.class, YesBazInterceptor.class, NoBazInterceptor.class, FooStereotype.class,
                         BarStereotype.class)
-                .withBeansXml(new BeansXml().interceptors(FooInterceptor.class, BarInterceptor.class, YesBazInterceptor.class, NoBazInterceptor.class))
                 .build();
     }
 

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java

@@ -42,8 +42,6 @@ public static WebArchive createTestArchive() {
                 .withTestClass(InvalidTransitiveInterceptorBindingAnnotationsTest.class)
                 .withClasses(Foo.class, FooBinding.class, BarBinding.class, BazBinding.class, FooInterceptor.class,
                         BarInterceptor.class, YesBazInterceptor.class, NoBazInterceptor.class)
-                .withBeansXml(new BeansXml().interceptors(FooInterceptor.class, BarInterceptor.class,
-                        YesBazInterceptor.class, NoBazInterceptor.class))
                 .build();
     }
 

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/NoBazInterceptor.java

@@ -16,6 +16,7 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.broken;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.AroundInvoke;
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
@@ -24,6 +25,7 @@
 
 @BazBinding(ANSWER.NO)
 @Interceptor
+@Priority(Interceptor.Priority.APPLICATION)
 public class NoBazInterceptor {
     @AroundInvoke
     public Object alwaysReturnThis(InvocationContext ctx) throws Exception {

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/YesBazInterceptor.java

@@ -16,6 +16,7 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.broken;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.AroundInvoke;
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
@@ -24,6 +25,7 @@
 
 @BazBinding(ANSWER.YES)
 @Interceptor
+@Priority(Interceptor.Priority.APPLICATION)
 public class YesBazInterceptor {
     @AroundInvoke
     public Object alwaysReturnThis(InvocationContext ctx) throws Exception {

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/DecreasingInterceptor.java

@@ -16,6 +16,7 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.members;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.AroundInvoke;
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
@@ -24,6 +25,7 @@
 
 @Interceptor
 @AnimalCountInterceptorBinding(Operation.DECREASE)
+@Priority(Interceptor.Priority.APPLICATION)
 public class DecreasingInterceptor {
     private static boolean intercepted = false;
 

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/Farm.java

@@ -16,8 +16,10 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.members;
 
+import jakarta.enterprise.context.Dependent;
 import org.jboss.cdi.tck.interceptors.tests.bindings.members.AnimalCountInterceptorBinding.Operation;
 
+@Dependent
 public class Farm {
     @AnimalCountInterceptorBinding(Operation.INCREASE)
     public int getAnimalCount() {

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/IncreasingInterceptor.java

@@ -16,6 +16,7 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.members;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.AroundInvoke;
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
@@ -24,6 +25,7 @@
 
 @Interceptor
 @AnimalCountInterceptorBinding(Operation.INCREASE)
+@Priority(Interceptor.Priority.APPLICATION)
 public class IncreasingInterceptor {
 
     private static boolean intercepted = false;

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java

@@ -53,8 +53,6 @@ public abstract class PlantInterceptorBindingLiteral extends AnnotationLiteral<P
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(InterceptorBindingTypeWithMemberTest.class)
-                .withBeansXml(new BeansXml()
-                        .interceptors(IncreasingInterceptor.class, DecreasingInterceptor.class, VehicleCountInterceptor.class, PlantInterceptor.class))
                 .build();
     }
 

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/Plant.java

@@ -16,7 +16,10 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.members;
 
+import jakarta.enterprise.context.Dependent;
+
 @PlantInterceptorBinding(age = 1, name = Plant.TEST)
+@Dependent
 public class Plant {
 
     public static final String TEST = "TEST";

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/PlantInterceptor.java

@@ -16,12 +16,14 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.members;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.AroundInvoke;
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @PlantInterceptorBinding(age = 1, name = "TEST")
+@Priority(Interceptor.Priority.APPLICATION)
 public class PlantInterceptor {
 
     private static boolean intercepted = false;

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/VehicleCountInterceptor.java

@@ -16,12 +16,14 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.members;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.AroundInvoke;
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @VehicleCountInterceptorBinding(comment = "bar")
+@Priority(Interceptor.Priority.APPLICATION)
 public class VehicleCountInterceptor {
     private static boolean intercepted = false;
 

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/FastAndDeadlyMissile.java

@@ -16,8 +16,11 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.multiple;
 
+import jakarta.enterprise.context.Dependent;
+
 @Fast
 @Deadly
+@Dependent
 public class FastAndDeadlyMissile implements Missile {
     public void fire() {
     }

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/GuidedMissile.java

@@ -16,6 +16,9 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.multiple;
 
+import jakarta.enterprise.context.Dependent;
+
+@Dependent
 public class GuidedMissile implements Missile {
     @Slow
     @Deadly

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/LockInterceptor.java

@@ -16,13 +16,15 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.multiple;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.AroundInvoke;
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @Slow
 @Deadly
+@Priority(Interceptor.Priority.APPLICATION)
 public class LockInterceptor {
     public static boolean intercepted = false;
 

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/MissileInterceptor.java

@@ -16,13 +16,15 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.multiple;
 
+import jakarta.annotation.Priority;
 import jakarta.interceptor.AroundInvoke;
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
 
 @Interceptor
 @Fast
 @Deadly
+@Priority(Interceptor.Priority.APPLICATION)
 public class MissileInterceptor {
     public static boolean intercepted = false;
 

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/MultipleInterceptorBindingsTest.java

@@ -37,7 +37,6 @@ public class MultipleInterceptorBindingsTest extends AbstractTest {
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(MultipleInterceptorBindingsTest.class)
-                .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class, LockInterceptor.class))
                 .build();
     }
 

impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/SlowMissile.java

@@ -16,8 +16,11 @@
  */
 package org.jboss.cdi.tck.interceptors.tests.bindings.multiple;
 
+import jakarta.enterprise.context.Dependent;
+
 @Slow
 @Deadly
+@Dependent
 public class SlowMissile implements Missile {
     public void fire() {
     }