[jboss-cvs] JBossAS SVN: r71135 - projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Mar 21 05:07:45 EDT 2008


Author: alesj
Date: 2008-03-21 05:07:45 -0400 (Fri, 21 Mar 2008)
New Revision: 71135

Added:
   projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/AbstractGuiceTest.java
Modified:
   projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceIntegrationTestCase.java
   projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceObjectsTestCase.java
   projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceTestSuite.java
   projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceToMCTestCase.java
Log:
[JBMICROCONT-274]; removing deprecated GenericBeanFactoryMetaData usage.

Added: projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/AbstractGuiceTest.java
===================================================================
--- projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/AbstractGuiceTest.java	                        (rev 0)
+++ projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/AbstractGuiceTest.java	2008-03-21 09:07:45 UTC (rev 71135)
@@ -0,0 +1,65 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.guice.test;
+
+import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.test.kernel.junit.MicrocontainerTest;
+import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+
+/**
+ * Abstract Guice test.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class AbstractGuiceTest extends MicrocontainerTest
+{
+   protected AbstractGuiceTest(String name)
+   {
+      super(name);
+   }
+
+   protected KernelController getController()
+   {
+      BasicBootstrap bootstrap = new BasicBootstrap();
+      bootstrap.run();
+      return bootstrap.getKernel().getController();
+   }
+
+   protected GenericBeanFactoryMetaData installFactory(KernelController controller, String name, Class<?> beanClass) throws Throwable
+   {
+      return installFactory(controller, name, beanClass.getName());
+   }
+
+   protected GenericBeanFactoryMetaData installFactory(KernelController controller, String name, String beanClassName) throws Throwable
+   {
+      GenericBeanFactoryMetaData factory = new GenericBeanFactoryMetaData();
+      factory.setName(name);
+      factory.setBean(beanClassName);
+
+      for (BeanMetaData bean : factory.getBeans())
+         controller.install(bean);
+
+      return factory;
+   }
+}

Modified: projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceIntegrationTestCase.java
===================================================================
--- projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceIntegrationTestCase.java	2008-03-21 08:01:49 UTC (rev 71134)
+++ projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceIntegrationTestCase.java	2008-03-21 09:07:45 UTC (rev 71135)
@@ -21,29 +21,26 @@
 */
 package org.jboss.test.guice.test;
 
-import org.jboss.test.kernel.junit.MicrocontainerTest;
-import org.jboss.test.guice.support.Singleton;
-import org.jboss.test.guice.support.Prototype;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
-import org.jboss.dependency.spi.Controller;
-import org.jboss.guice.spi.GuiceIntegration;
-import junit.framework.Test;
-import com.google.inject.Injector;
-import com.google.inject.Guice;
 import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.name.Names;
+import junit.framework.Test;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.dependency.spi.Controller;
+import org.jboss.guice.spi.GuiceIntegration;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.test.guice.support.Prototype;
+import org.jboss.test.guice.support.Singleton;
 
 /**
  * Guice integration test case.
  *
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public class GuiceIntegrationTestCase extends MicrocontainerTest
+public class GuiceIntegrationTestCase extends AbstractGuiceTest
 {
    public GuiceIntegrationTestCase(String name)
    {
@@ -60,21 +57,13 @@
       return suite(GuiceIntegrationTestCase.class);
    }
 
-   protected KernelController getController()
-   {
-      BasicBootstrap bootstrap = new BasicBootstrap();
-      bootstrap.run();
-      return bootstrap.getKernel().getController();
-   }
-
    protected void installBeans(KernelController controller)
          throws Throwable
    {
       BeanMetaData singleton = new AbstractBeanMetaData("singleton", Singleton.class.getName());
       controller.install(singleton);
 
-      BeanMetaData prototype = new GenericBeanFactoryMetaData("prototype", Prototype.class.getName());
-      controller.install(prototype);
+      installFactory(controller, "prototype", Prototype.class);
    }
 
    public void testBindFromMicrocontainer() throws Throwable

Modified: projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceObjectsTestCase.java
===================================================================
--- projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceObjectsTestCase.java	2008-03-21 08:01:49 UTC (rev 71134)
+++ projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceObjectsTestCase.java	2008-03-21 09:07:45 UTC (rev 71135)
@@ -21,38 +21,35 @@
 */
 package org.jboss.test.guice.test;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.name.Names;
 import junit.framework.Test;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.test.kernel.junit.MicrocontainerTest;
-import org.jboss.test.guice.support.Prototype;
-import org.jboss.test.guice.support.Singleton;
-import org.jboss.guice.plugins.GuiceInjectorFactory;
-import org.jboss.guice.plugins.GuiceObject;
-import org.jboss.beans.metadata.spi.ParameterMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractArrayMetaData;
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
+import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
 import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
 import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.plugins.AbstractArrayMetaData;
-import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.ParameterMetaData;
 import org.jboss.dependency.spi.ControllerContext;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.name.Names;
+import org.jboss.guice.plugins.GuiceInjectorFactory;
+import org.jboss.guice.plugins.GuiceObject;
+import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.test.guice.support.Prototype;
+import org.jboss.test.guice.support.Singleton;
 
 /**
  * Guice test case via installed objects.
  * 
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public class GuiceObjectsTestCase extends MicrocontainerTest
+public class GuiceObjectsTestCase extends AbstractGuiceTest
 {
    public GuiceObjectsTestCase(String name)
    {
@@ -69,13 +66,6 @@
       return suite(GuiceObjectsTestCase.class);
    }
 
-   private KernelController getController()
-   {
-      BasicBootstrap bootstrap = new BasicBootstrap();
-      bootstrap.run();
-      return bootstrap.getKernel().getController();
-   }
-
 /*
    // TODO - resolved when Guice Issue 49 is implemented 
    public void testBindFromListener() throws Throwable
@@ -128,8 +118,7 @@
          BeanMetaData singleton = new AbstractBeanMetaData("singleton", Singleton.class.getName());
          controller.install(singleton);
 
-         BeanMetaData prototype = new GenericBeanFactoryMetaData("prototype", Prototype.class.getName());
-         controller.install(prototype);
+         installFactory(controller, "prototype", Prototype.class);
 
          AbstractBeanMetaData injectorBean = new AbstractBeanMetaData("injector", GuiceInjectorFactory.class.getName());
          AbstractConstructorMetaData constructor = new AbstractConstructorMetaData();

Modified: projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceTestSuite.java
===================================================================
--- projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceTestSuite.java	2008-03-21 08:01:49 UTC (rev 71134)
+++ projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceTestSuite.java	2008-03-21 09:07:45 UTC (rev 71135)
@@ -32,7 +32,6 @@
  */
 public class GuiceTestSuite extends TestSuite
 {
-
    public static void main(String[] args)
    {
       TestRunner.run(suite());
@@ -48,5 +47,4 @@
 
       return suite;
    }
-
 }

Modified: projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceToMCTestCase.java
===================================================================
--- projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceToMCTestCase.java	2008-03-21 08:01:49 UTC (rev 71134)
+++ projects/microcontainer/trunk/guice-int/src/tests/org/jboss/test/guice/test/GuiceToMCTestCase.java	2008-03-21 09:07:45 UTC (rev 71135)
@@ -49,7 +49,7 @@
  *
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public class GuiceToMCTestCase extends MicrocontainerTest
+public class GuiceToMCTestCase extends AbstractGuiceTest
 {
    public GuiceToMCTestCase(String name)
    {
@@ -66,13 +66,6 @@
       return suite(GuiceToMCTestCase.class);
    }
 
-   private KernelController getController()
-   {
-      BasicBootstrap bootstrap = new BasicBootstrap();
-      bootstrap.run();
-      return bootstrap.getKernel().getController();
-   }
-
    public void testGuice2MC() throws Throwable
    {
       final KernelController controller = getController();




More information about the jboss-cvs-commits mailing list