[jboss-cvs] JBossAS SVN: r60382 - branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test.

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

Author: dimitris at jboss.org
Date: 2007-02-07 11:15:10 -0500 (Wed, 07 Feb 2007)
New Revision: 60382

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/NamingServerSetup.java
Log:
JBAS-4082, fix naming tests after naming service changes

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/NamingServerSetup.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/NamingServerSetup.java	2007-02-07 16:10:34 UTC (rev 60381)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/NamingServerSetup.java	2007-02-07 16:15:10 UTC (rev 60382)
@@ -22,32 +22,37 @@
 package org.jboss.test.naming.test;
 
 import java.util.Hashtable;
-import javax.naming.RefAddr;
-import javax.naming.StringRefAddr;
-import javax.naming.Reference;
+
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import javax.naming.RefAddr;
+import javax.naming.Reference;
+import javax.naming.StringRefAddr;
+import javax.naming.spi.InitialContextFactory;
 import javax.naming.spi.InitialContextFactoryBuilder;
-import javax.naming.spi.InitialContextFactory;
 import javax.naming.spi.NamingManager;
 
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 
 import org.jboss.naming.ENCFactory;
+import org.jnp.interfaces.NamingContext;
 import org.jnp.server.Main;
-import org.jnp.interfaces.NamingContext;
+import org.jnp.server.NamingBeanImpl;
 
-/** Create a naming server instance in setUp and destroy it in tearDown.
+/** 
+ * Create a naming server instance in setUp and destroy it in tearDown.
  * @author Scott.Stark at jboss.org
+ * @author Dimitris.Andreadis at jboss.org
  * @version $Revision$
  */
 public class NamingServerSetup extends TestSetup
    implements InitialContextFactoryBuilder
 {
    private Main namingServer;
-
+   private NamingBeanImpl namingBean;
+   
    public NamingServerSetup(Test test)
    {
       super(test);
@@ -62,8 +67,11 @@
    protected void setUp() throws Exception
    {
       super.setUp();
+      namingBean = new NamingBeanImpl();
       namingServer = new Main();
       namingServer.setPort(10099);
+      namingServer.setNamingInfo(namingBean);
+      namingBean.start();
       namingServer.start();
 
       NamingManager.setInitialContextFactoryBuilder(this);
@@ -83,6 +91,7 @@
    protected void tearDown() throws Exception
    {
       namingServer.stop();
+      namingBean.stop();
       super.tearDown();
    }