Fixed deployment archives / CDITCK-175

- deployment archives in tests from org.jboss.jsr299.tck.tests.interceptors.definition.broken.finalClassInterceptor package now contain only test-related classes to ensure "the test cases run in isolation"
jakartaee · Sep 22, 2011 · a7578ff · a7578ff
1 parent 45c504c
commit a7578ff
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 29 deletions.
diff --git a/...rceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelInterceptorTest.java b/...rceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelInterceptorTest.java
@@ -32,7 +32,8 @@ public class FinalClassClassLevelInterceptorTest extends AbstractJSR299Test {
     public static EnterpriseArchive createTestArchive() 
 	{
         return new EnterpriseArchiveBuilder()
-            .withTestClassPackage(FinalClassClassLevelInterceptorTest.class)
+            .withTestClassDefinition(FinalClassClassLevelInterceptorTest.class)
+            .withClasses(FooBinding.class, MissileInterceptor.class, FinalClassClassLevelMissile.class, FinalClassClassLevelMissileLocal.class)
             .withBeansXml("beans.xml")
             .build();
     }
@@ -41,11 +42,5 @@ public static EnterpriseArchive createTestArchive()
    @SpecAssertion(section = "9.3", id = "ca")
    public void testFinalClassWithClassLevelInterceptor() throws Exception
    {
-/*      MissileInterceptor.intercepted = false;
-      
-      FinalClassMissileLocal missile = getInstanceByType(FinalClassMissileLocal.class);      
-      missile.fire();
-      
-      assert MissileInterceptor.intercepted;*/
    }
 }
diff --git a/...ceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelInterceptorTest.java b/...ceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelInterceptorTest.java
@@ -32,7 +32,8 @@ public class FinalClassMethodLevelInterceptorTest extends AbstractJSR299Test
     public static EnterpriseArchive createTestArchive() 
 	{
         return new EnterpriseArchiveBuilder()
-            .withTestClassPackage(FinalClassMethodLevelInterceptorTest.class)
+            .withTestClassDefinition(FinalClassMethodLevelInterceptorTest.class)
+            .withClasses(FooBinding.class, MissileInterceptor.class, FinalClassMethodLevelMissile.class, FinalClassMethodLevelMissileLocal.class)
             .withBeansXml("beans.xml")
             .build();
     }
@@ -41,11 +42,5 @@ public static EnterpriseArchive createTestArchive()
    @SpecAssertion(section = "9.3", id = "da")
    public void testFinalClassWithMethodLevelInterceptor() throws Exception
    {
-/*      MissileInterceptor.intercepted = false;
-      
-      FinalClassMethodLevelMissileLocal missile = getInstanceByType(FinalClassMethodLevelMissileLocal.class);      
-      missile.fire();
-      
-      assert MissileInterceptor.intercepted;*/
    }
 }
diff --git a/...ceptors/definition/broken/finalClassInterceptor/FinalMethodClassLevelInterceptorTest.java b/...ceptors/definition/broken/finalClassInterceptor/FinalMethodClassLevelInterceptorTest.java
@@ -33,7 +33,8 @@ public class FinalMethodClassLevelInterceptorTest extends AbstractJSR299Test
     public static EnterpriseArchive createTestArchive() 
 	{
         return new EnterpriseArchiveBuilder()
-            .withTestClassPackage(FinalMethodClassLevelInterceptorTest.class)
+            .withTestClassDefinition(FinalMethodClassLevelInterceptorTest.class)
+            .withClasses(FooBinding.class, MissileInterceptor.class, FinalMethodClassLevelMissile.class, FinalMethodClassLevelMissileLocal.class)
             .withBeansXml("beans.xml")
             .build();
     }
@@ -43,11 +44,5 @@ public static EnterpriseArchive createTestArchive()
    @SpecAssertion(section = "9.3", id = "cb")
    public void testFinalMethodWithClassLevelInterceptor() throws Exception
    {
-/*      MissileInterceptor.intercepted = false;
-      
-      FinalMethodMissileLocal missile = getInstanceByType(FinalMethodMissileLocal.class);      
-      missile.fire();
-      
-      assert MissileInterceptor.intercepted;*/
    }
 }
diff --git a/...eptors/definition/broken/finalClassInterceptor/FinalMethodMethodLevelInterceptorTest.java b/...eptors/definition/broken/finalClassInterceptor/FinalMethodMethodLevelInterceptorTest.java
@@ -32,20 +32,15 @@ public class FinalMethodMethodLevelInterceptorTest extends AbstractJSR299Test
     public static EnterpriseArchive createTestArchive() 
 	{
         return new EnterpriseArchiveBuilder()
-            .withTestClassPackage(FinalMethodClassLevelInterceptorTest.class)
+            .withTestClassDefinition(FinalMethodMethodLevelInterceptorTest.class)
+            .withClasses(FooBinding.class, MissileInterceptor.class, FinalMethodMethodLevelMissile.class, FinalMethodMethodLevelMissileLocal.class)
             .withBeansXml("beans.xml")
             .build();
     }
 
    @Test
    @SpecAssertion(section = "9.3", id = "db")
    public void testFinalMethodWithMethodLevelInterceptor() throws Exception
-   {
-/*      MissileInterceptor.intercepted = false;
-      
-      FinalMethodMethodLevelMissileLocal missile = getInstanceByType(FinalMethodMethodLevelMissileLocal.class);      
-      missile.fire();
-      
-      assert MissileInterceptor.intercepted;*/
+   { 
    }
 }