[openejb-scm] openejb/modules/core/src/test/org/openejb/server/httpd HttpServerTest.java

[dain]

dain        2005/05/08 15:37:11

  Modified:    modules/core/src/test/org/openejb/server/httpd
                        HttpServerTest.java
  Log:

  Added KernelFactory for pluggable kernel
  Kernel is now an interface
  Moved Kernel implementation  to basic kernel
  Converted JMX registry and config manager to plain old gbeans (they do not 
require special access to the kernel)
  Magic attributes such as state and enabled are now accessed via kernel methods
  Use of getAttribute and invoke for magic attributes and state transition is 
now deprecated
  Cleaned up cruft in GBean infos such as declaration of non existent attributes
  Upgraded to newest CGLIB, asm, and commons-collections
  
  Revision  Changes    Path
  1.8       +5 -5      
openejb/modules/core/src/test/org/openejb/server/httpd/HttpServerTest.java
  
  Index: HttpServerTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/server/httpd/HttpServerTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HttpServerTest.java       25 Mar 2005 11:23:40 -0000      1.7
  +++ HttpServerTest.java       8 May 2005 19:37:10 -0000       1.8
  @@ -57,6 +57,7 @@
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
   import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
   import org.apache.geronimo.kernel.GBeanNotFoundException;
  +import org.apache.geronimo.kernel.KernelFactory;
   import org.apache.geronimo.kernel.Kernel;
   import org.apache.geronimo.kernel.jmx.JMXUtil;
   import org.apache.geronimo.kernel.management.State;
  @@ -143,7 +144,7 @@
       }
   
       public void testHttpServerGBean() throws Exception {
  -        Kernel kernel = new Kernel("wstest");
  +        Kernel kernel = KernelFactory.newInstance().createKernel("wstest");
           kernel.boot();
   
           ObjectName listener = TestHttpListener.addGBean(kernel, "HTTP");
  @@ -173,7 +174,7 @@
       }
   
       public void testGBeanServiceStack() throws Exception {
  -        Kernel kernel = new Kernel("wstest");
  +        Kernel kernel = KernelFactory.newInstance().createKernel("wstest");
           kernel.boot();
   
           ObjectName listener = TestHttpListener.addGBean(kernel, "HTTP");
  @@ -217,8 +218,7 @@
   
   
       private void assertRunning(Kernel kernel, ObjectName objectName) throws 
Exception {
  -        int state = ((Integer) kernel.getAttribute(objectName, 
"state")).intValue();
  -        assertEquals("should be running: " + objectName, 
State.RUNNING_INDEX, state);
  +        assertEquals("should be running: " + objectName, 
State.RUNNING_INDEX, kernel.getGBeanState(objectName));
       }
   
       public static class TestHttpListener implements HttpListener {