[jboss-cvs] JBossAS SVN: r104038 - projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api.

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

Author: ALRubinger
Date: 2010-04-16 02:36:02 -0400 (Fri, 16 Apr 2010)
New Revision: 104038

Modified:
   projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/MainDeployerViaBootstrapUnitTest.java
Log:
[RELOADED-14] Fix test after refactoring

Modified: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/MainDeployerViaBootstrapUnitTest.java
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/MainDeployerViaBootstrapUnitTest.java	2010-04-16 06:33:17 UTC (rev 104037)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/MainDeployerViaBootstrapUnitTest.java	2010-04-16 06:36:02 UTC (rev 104038)
@@ -5,7 +5,6 @@
 
 import junit.framework.TestCase;
 
-import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.bootstrap.api.descriptor.BootstrapDescriptor;
 import org.jboss.bootstrap.api.mc.server.MCServer;
 import org.jboss.deployers.client.spi.main.MainDeployer;
@@ -95,18 +94,12 @@
             .getTarget();
       TestCase.assertNotNull(MainDeployer.class.getName() + " instance was not installed into MC", mainDeployer);
 
-      // Install a caching deployer which will remember the last deployment
-      final CachingDeployer deployer = new CachingDeployer();
-      final String deployerName = deployer.getClass().getSimpleName();
-      final BeanMetaDataBuilder bmdb = BeanMetaDataBuilder.createBuilder(deployerName, deployer.getClass().getName());
-      controller.install(bmdb.getBeanMetaData(), deployer);
-
       // Construct a test JAR
-      final JavaArchive cachingDeployerJar = Archives.create(NAME_ARCHIVE, JavaArchive.class).addClass(this.getClass());
+      final JavaArchive testJar = Archives.create(NAME_ARCHIVE, JavaArchive.class).addClass(this.getClass());
 
       // Flush out to a real File
-      final File tmpFile = File.createTempFile(cachingDeployerJar.getName(), EXTENSION_TMP);
-      cachingDeployerJar.as(ZipExporter.class).exportZip(tmpFile, true);
+      final File tmpFile = File.createTempFile(testJar.getName(), EXTENSION_TMP);
+      testJar.as(ZipExporter.class).exportZip(tmpFile, true);
       tmpFile.deleteOnExit();
 
       // Deploy the test JAR
@@ -117,7 +110,7 @@
       mainDeployer.checkComplete();
 
       // Obtain the last deployed
-      DeploymentUnit lastDeployed = deployer.lastDeployed;
+      DeploymentUnit lastDeployed = cachingDeployer.lastDeployed;
       final String path = vFile.toURI().toURL().getPath();
       TestCase.assertEquals(path.substring(path.lastIndexOf('/') + 1, path.length()), lastDeployed.getSimpleName());