[jboss-cvs] JBossAS SVN: r70487 - in projects/microcontainer/trunk/aop-mc-int/src: tests/org/jboss/test/microcontainer/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2008-03-06 10:34:49 -0500 (Thu, 06 Mar 2008)
New Revision: 70487

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCase.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCase.java
Log:
Source code tidyup

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java	2008-03-06 15:34:19 UTC (rev 70486)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java	2008-03-06 15:34:49 UTC (rev 70487)
@@ -21,7 +21,6 @@
 */ 
 package org.jboss.aop.microcontainer.integration;
 
-import java.util.Iterator;
 import java.util.List;
 
 import org.jboss.dependency.plugins.AbstractLifecycleCallbackItem;

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCase.java	2008-03-06 15:34:19 UTC (rev 70486)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UndeployAspectDependencyTestCase.java	2008-03-06 15:34:49 UTC (rev 70487)
@@ -26,7 +26,7 @@
 
    /**
     * Validate that the 
-    * @throws Exception
+    * @throws Throwable for any error
     */
    public void testUndeployAndRedeploy() throws Throwable
    {

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCase.java	2008-03-06 15:34:19 UTC (rev 70486)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UndeployLifecycleCallbackDependencyTestCase.java	2008-03-06 15:34:49 UTC (rev 70487)
@@ -1,9 +1,6 @@
 package org.jboss.test.microcontainer.test;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
 import junit.framework.Test;
 
 import org.jboss.dependency.spi.Controller;
@@ -11,8 +8,6 @@
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.test.aop.junit.AOPMicrocontainerTest;
 import org.jboss.test.microcontainer.support.SimpleBeanImpl;
-import org.jboss.test.microcontainer.support.SimpleInterceptor1;
-import org.jboss.test.microcontainer.support.SimpleInterceptor2;
 import org.jboss.test.microcontainer.support.SimpleLifecycleCallback;
 import org.jboss.test.microcontainer.support.SimpleLifecycleCallback.Handled;
 
@@ -31,7 +26,7 @@
 
    /**
     * Validate that the 
-    * @throws Exception
+    * @throws Throwable for any error
     */
    public void testUndeployAndRedeploy() throws Throwable
    {
@@ -53,7 +48,6 @@
                SimpleBeanImpl bean = (SimpleBeanImpl)getBean("Intercepted");
                assertNotNull(bean);
                assertEquals(2, SimpleLifecycleCallback.interceptions.size());
-               List list = SimpleLifecycleCallback.interceptions;
                assertTrue(hasExpectedInterception("Intercepted", ControllerState.CONFIGURED));
                assertTrue(hasExpectedInterception("Intercepted", ControllerState.START));
 
@@ -66,7 +60,6 @@
                controller.change(ctx, ControllerState.PRE_INSTALL);
 
                assertEquals(2, SimpleLifecycleCallback.interceptions.size());
-               list = SimpleLifecycleCallback.interceptions;
                assertTrue(hasExpectedInterception("Intercepted", ControllerState.CONFIGURED));
                assertTrue(hasExpectedInterception("Intercepted", ControllerState.START));