[jboss-cvs] JBossAS SVN: r75301 - projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test.

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

Author: alesj
Date: 2008-07-02 05:54:40 -0400 (Wed, 02 Jul 2008)
New Revision: 75301

Modified:
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingAliasAPITestCase.java
Log:
Add tests to test suite.

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java	2008-07-02 09:40:49 UTC (rev 75300)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/DeploymentTestSuite.java	2008-07-02 09:54:40 UTC (rev 75301)
@@ -72,6 +72,9 @@
       suite.addTest(BeanContainerInjectionTestCase.suite());
       suite.addTest(BeanContainerStaticTestCase.suite());
       suite.addTest(BeanContainerSetDemandTestCase.suite());
+      // scoping alias tests
+      suite.addTest(ScopingAliasTestCase.suite());
+      suite.addTest(ScopingAliasAPITestCase.suite());
 
       return suite;
    }

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingAliasAPITestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingAliasAPITestCase.java	2008-07-02 09:40:49 UTC (rev 75300)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/ScopingAliasAPITestCase.java	2008-07-02 09:54:40 UTC (rev 75301)
@@ -27,8 +27,6 @@
 import org.jboss.metadata.spi.scope.CommonLevels;
 import org.jboss.metadata.spi.scope.Scope;
 import org.jboss.metadata.spi.scope.ScopeKey;
-import org.jboss.test.kernel.deployment.support.SimpleBean;
-import org.jboss.test.kernel.deployment.support.SimpleObjectWithBean;
 import org.jboss.test.AbstractTestDelegate;
 
 /**
@@ -36,7 +34,7 @@
  *
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public class ScopingAliasAPITestCase extends ScopingDeploymentTest
+public class ScopingAliasAPITestCase extends ScopingAliasTestCase
 {
    public ScopingAliasAPITestCase(String name) throws Throwable
    {
@@ -99,33 +97,4 @@
 
       super.tearDown();
    }
-
-   public void testAliasInMainController() throws Throwable
-   {
-      checkBean("main", "main");
-   }
-
-   public void testAliasInOwnScope() throws Throwable
-   {
-      checkBean("deploy1", "deployment1");
-   }
-
-   public void testAliasInParentScope() throws Throwable
-   {
-      checkBean("deploy2", "main");
-   }
-
-   public void testAliasInOwnScope2() throws Throwable
-   {
-      checkBean("deploy3", "deployment3");
-   }
-
-   private void checkBean(String bean, String ctor)
-   {
-      SimpleObjectWithBean deploy = (SimpleObjectWithBean) getBean(bean);
-      assertNotNull(deploy);
-      SimpleBean simple = deploy.getSimpleBean();
-      assertNotNull(simple);
-      assertEquals(ctor, simple.getConstructorString());
-   }
 }
\ No newline at end of file