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

[webbeans-commits at lists.jboss.org]

Author: nickarls
Date: 2009-01-22 04:25:46 -0500 (Thu, 22 Jan 2009)
New Revision: 1158

Modified:
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java
   tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
Log:
Remove references to the now-obsolete @Destroy
(I'll nuke them from RI/API next)

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java	2009-01-22 06:45:49 UTC (rev 1157)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java	2009-01-22 09:25:46 UTC (rev 1158)
@@ -358,15 +358,6 @@
 
    @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
    @SpecAssertion(section = "8.5.2")
-   public void testObserverMethodAnnotatedDestructorFails()
-   {
-      deployBeans(CairnsTerrier.class);
-      Set<Bean<Object>> beans = manager.resolveByType(Object.class);
-      assert beans != null;
-   }
-
-   @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
-   @SpecAssertion(section = "8.5.2")
    public void testObserverMethodWithDisposesParamFails()
    {
       deployBeans(FoxTerrier.class);

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java	2009-01-22 06:45:49 UTC (rev 1157)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java	2009-01-22 09:25:46 UTC (rev 1158)
@@ -74,12 +74,6 @@
    }
    
    @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.1")
-   public void testInitializerMethodAnnotatedDestructor()
-   {
-      createSimpleBean(Shrike.class);
-   }
-   
-   @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.1")
    public void testInitializerMethodHasParameterAnnotatedDisposes()
    {
       createSimpleBean(Capercaillie.class);

Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java	2009-01-22 06:45:49 UTC (rev 1157)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java	2009-01-22 09:25:46 UTC (rev 1158)
@@ -186,15 +186,6 @@
    }
    
    @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
-   public void testProducerMethodAnnotatedDestructor() throws Exception
-   {
-      Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class);
-      manager.addBean(bean);
-      Method method = SpiderProducer_Broken.class.getMethod("destroy");
-      createProducerMethodBean(method, bean);
-   }
-   
-   @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
    public void testProducerMethodWithParameterAnnotatedDisposes() throws Exception
    {
       Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class);