[jboss-cvs] JBossAS SVN: r73652 - in projects/jboss-deployers/trunk/deployers-vfs/src: resources/tests/bean/multiple/jbossrar.jar and 5 other directories.

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

Author: alesj
Date: 2008-05-24 13:49:50 -0400 (Sat, 24 May 2008)
New Revision: 73652

Added:
   projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/jbossrar.jar/
   projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/jbossrar.jar/META-INF/
   projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/jbossrar.jar/META-INF/jboss-rar.xml
   projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/specrar.jar/
   projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/specrar.jar/META-INF/
   projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/specrar.jar/META-INF/rar.xml
Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/MockRarDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java
Log:
Mock RAR tests - one file missing.

Added: projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/jbossrar.jar/META-INF/jboss-rar.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/jbossrar.jar/META-INF/jboss-rar.xml	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/jbossrar.jar/META-INF/jboss-rar.xml	2008-05-24 17:49:50 UTC (rev 73652)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-rar xmlns="urn:jboss:rar:1.0" attrib="Test">
+  <elt>java.lang.StringBuilder</elt>
+</jboss-rar>
\ No newline at end of file

Added: projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/specrar.jar/META-INF/rar.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/specrar.jar/META-INF/rar.xml	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/bean/multiple/specrar.jar/META-INF/rar.xml	2008-05-24 17:49:50 UTC (rev 73652)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rar xmlns="urn:spec:rar:1.0" attrib="Test">
+  <elt>java.lang.String</elt>
+</rar>
\ No newline at end of file

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/MockRarDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/MockRarDeployer.java	2008-05-24 09:51:19 UTC (rev 73651)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/support/MockRarDeployer.java	2008-05-24 17:49:50 UTC (rev 73652)
@@ -29,6 +29,9 @@
  */
 public class MockRarDeployer extends JBossExtensionDeployer<RarMetaData, JBossRarMetaData, RarDeploymentMetaData>
 {
+   private RarMetaData spec;
+   private JBossRarMetaData jboss;
+
    public MockRarDeployer()
    {
       super(RarDeploymentMetaData.class, "rar.xml", RarMetaData.class, "jboss-rar.xml", JBossRarMetaData.class);
@@ -36,6 +39,9 @@
 
    protected RarDeploymentMetaData mergeMetaData(VFSDeploymentUnit unit, RarMetaData spec, JBossRarMetaData jboss) throws Exception
    {
+      this.spec = spec;
+      this.jboss = jboss;
+
       RarDeploymentMetaData deployment = new RarDeploymentMetaData();
       if (spec != null)
       {
@@ -51,4 +57,14 @@
       }
       return deployment;
    }
+
+   public RarMetaData getSpec()
+   {
+      return spec;
+   }
+
+   public JBossRarMetaData getJboss()
+   {
+      return jboss;
+   }
 }
\ No newline at end of file

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java	2008-05-24 09:51:19 UTC (rev 73651)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java	2008-05-24 17:49:50 UTC (rev 73652)
@@ -37,6 +37,8 @@
  */
 public class MockRarUnitTestCase extends AbstractDeployerUnitTest
 {
+   private MockRarDeployer deployer = new MockRarDeployer();
+
    public MockRarUnitTestCase(String name) throws Throwable
    {
       super(name);
@@ -49,32 +51,50 @@
 
    protected void addDeployers(Kernel kernel)
    {
-      MockRarDeployer rard = new MockRarDeployer();
       try
       {
-         controller.install(new AbstractBeanMetaData("rard", MockRarDeployer.class.getName()), rard);
+         controller.install(new AbstractBeanMetaData("rard", MockRarDeployer.class.getName()), deployer);
       }
       catch (Throwable t)
       {
          throw new RuntimeException(t);
       }
-      addDeployer(main, rard);
+      addDeployer(main, deployer);
       addDeployer(main, new RarDeploymentDeployer());
       addDeployer(main, new KernelDeploymentDeployer());
       addDeployer(main, new BeanMetaDataDeployer(kernel));
    }
 
-   public void testRarMerge() throws Exception
+   protected void testRarMerge(String name, boolean spec, boolean jboss, Class<?> clazz) throws Exception
    {
-      VFSDeployment deployment = createDeployment("/bean", "multiple/allrar.jar");
+      VFSDeployment deployment = createDeployment("/bean", "multiple/" + name + ".jar");
       assertDeploy(deployment);
+
+      assertEquals(spec, deployer.getSpec() != null);
+      assertEquals(jboss, deployer.getJboss() != null);
+
       ControllerContext context = controller.getInstalledContext("Test");
       assertNotNull(context);
       Object target = context.getTarget();
       assertNotNull(target);
-      assertEquals(Object.class, target.getClass());
+      assertEquals(clazz, target.getClass());
 
       assertUndeploy(deployment);
       assertNull(controller.getContext("Test", null));
    }
+
+   public void testAllRar() throws Exception
+   {
+      testRarMerge("allrar", true, true, Object.class);
+   }
+
+   public void testSpecRar() throws Exception
+   {
+      testRarMerge("specrar", true, false, String.class);
+   }
+
+   public void testJarRar() throws Exception
+   {
+      testRarMerge("jbossrar", false, true, StringBuilder.class);
+   }
 }