[jboss-cvs] JBossAS SVN: r78898 - in projects/microcontainer/branches/Branch_2_0/kernel/src: test/java/org/jboss/test/junit/test and 1 other directories.

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

Author: alesj
Date: 2008-09-26 11:40:23 -0400 (Fri, 26 Sep 2008)
New Revision: 78898

Added:
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/junit/test/JUnitTestCase#testTwo.xml
Modified:
   projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java
   projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/junit/test/JUnitTestCase.java
Log:
Port per method test support to Branch_2_0.

Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java	2008-09-26 15:21:40 UTC (rev 78897)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/test/kernel/junit/MicrocontainerTest.java	2008-09-26 15:40:23 UTC (rev 78898)
@@ -49,6 +49,9 @@
    /** The test bean name */
    private String testBeanName;
 
+   /** The method specific deployment */
+   private KernelDeployment methodDeployment;
+   
    /**
     * Get the test delegate
     * 
@@ -80,9 +83,25 @@
    protected void setUp() throws Exception
    {
       super.setUp();
+      URL url = getMethodResource();
+      if (url != null)
+         methodDeployment = deploy(url);
+      else
+         getLog().debug("No method specific deployment " + getMethodDeployment());
       afterSetUp();
    }
 
+   protected String getMethodDeployment()
+   {
+      String testName = getClass().getName();
+      return "/" + testName.replace('.', '/') + "#" + getName() + ".xml";
+   }
+
+   protected URL getMethodResource()
+   {
+      return getResource(getMethodDeployment());
+   }
+
    /**
     * Configure after set up.
     *
@@ -101,9 +120,10 @@
    @Override
    protected void tearDown() throws Exception
    {
+      if (methodDeployment != null)
+         undeploy(methodDeployment);
       if (autowireCandidate)
          clearAutowire();
-
       super.tearDown();
    }
 

Modified: projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/junit/test/JUnitTestCase.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/junit/test/JUnitTestCase.java	2008-09-26 15:21:40 UTC (rev 78897)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/test/java/org/jboss/test/junit/test/JUnitTestCase.java	2008-09-26 15:40:23 UTC (rev 78898)
@@ -75,6 +75,6 @@
    
    public void testTwo() throws Exception
    {
-      System.out.println(getBean("TheBean"));
+      System.out.println(getBean("MethodBean"));
    }
 }

Copied: projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/junit/test/JUnitTestCase#testTwo.xml (from rev 78897, projects/microcontainer/trunk/kernel/src/test/resources/org/jboss/test/junit/test/JUnitTestCase#testTwo.xml)
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/junit/test/JUnitTestCase#testTwo.xml	                        (rev 0)
+++ projects/microcontainer/branches/Branch_2_0/kernel/src/test/resources/org/jboss/test/junit/test/JUnitTestCase#testTwo.xml	2008-09-26 15:40:23 UTC (rev 78898)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+   <bean name="MethodBean" class="javax.naming.InitialContext"/>
+</deployment>