[jboss-cvs] JBossAS SVN: r112055 - projects/naming/branches/5.0.3.GA_CP/jnpserver/src/test/java/org/jnp/test.

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

Author: bstansberry at jboss.com
Date: 2011-08-15 11:55:40 -0400 (Mon, 15 Aug 2011)
New Revision: 112055

Modified:
   projects/naming/branches/5.0.3.GA_CP/jnpserver/src/test/java/org/jnp/test/NamingEventsUnitTest.java
Log:
Fix broken test by ensuring environment is clean

Modified: projects/naming/branches/5.0.3.GA_CP/jnpserver/src/test/java/org/jnp/test/NamingEventsUnitTest.java
===================================================================
--- projects/naming/branches/5.0.3.GA_CP/jnpserver/src/test/java/org/jnp/test/NamingEventsUnitTest.java	2011-08-15 15:09:26 UTC (rev 112054)
+++ projects/naming/branches/5.0.3.GA_CP/jnpserver/src/test/java/org/jnp/test/NamingEventsUnitTest.java	2011-08-15 15:55:40 UTC (rev 112055)
@@ -47,12 +47,12 @@
    /** The actual namingMain service impl bean */
    private static NamingBeanImpl namingBean;
    private QueueEventListener listener = new QueueEventListener();
-   
+
    public static Test suite()
    {
       return suite(NamingEventsUnitTest.class);
    }
-   
+
    public NamingEventsUnitTest(String name)
    {
       super(name);
@@ -63,11 +63,12 @@
    {
       super.setUp();
       namingBean = new NamingBeanImpl();
+      namingBean.setUseGlobalService(false);
       namingBean.setInstallGlobalService(true);
       namingBean.setEventMgr(new ExecutorEventMgr());
       namingBean.start();
    }
-   
+
    @Override
    protected void tearDown() throws Exception
    {
@@ -91,7 +92,7 @@
       assertTrue("Saw bind event", listener.waitOnEvent());
       NamingEvent event = listener.getEvent(0);
       assertEquals("OBJECT_ADDED", NamingEvent.OBJECT_ADDED, event.getType());
-      assertNull("getOldBinding", event.getOldBinding());      
+      assertNull("getOldBinding", event.getOldBinding());
       assertEquals("testAddObject.bind", getValue(event.getNewBinding()));
 
       ctx.rebind("testAddObject", "testAddObject.rebind");
@@ -114,7 +115,7 @@
       assertEquals("Should be 4 events", 4, listener.getEventCount());
       event = listener.getEvent(3);
       assertEquals("OBJECT_ADDED", NamingEvent.OBJECT_ADDED, event.getType());
-      assertNull("getOldBinding", event.getOldBinding());      
+      assertNull("getOldBinding", event.getOldBinding());
       assertEquals("getNewBinding", subctx, getValue(event.getNewBinding()));
 
       // Creating a binding under subctx should not produce an event
@@ -139,7 +140,7 @@
       assertTrue("Saw bind event", listener.waitOnEvent());
       NamingEvent event = listener.getEvent(0);
       assertEquals("OBJECT_ADDED", NamingEvent.OBJECT_ADDED, event.getType());
-      assertNull("getOldBinding", event.getOldBinding());      
+      assertNull("getOldBinding", event.getOldBinding());
       assertEquals("testAddObject.bind", getValue(event.getNewBinding()));
 
       ctx.rebind("testAddObject", "testAddObject.rebind");
@@ -162,14 +163,14 @@
       assertEquals("Should be 4 events", 4, listener.getEventCount());
       event = listener.getEvent(3);
       assertEquals("OBJECT_ADDED", NamingEvent.OBJECT_ADDED, event.getType());
-      assertNull("getOldBinding", event.getOldBinding());      
+      assertNull("getOldBinding", event.getOldBinding());
       assertEquals("getNewBinding", subctx, getValue(event.getNewBinding()));
 
       // Creating a binding under subctx should produce an event
       subctx.bind("subctx.testAddObject", "testAddObject.subctx.bind");
       assertTrue("Wait on subctx bind", listener.waitOnEvent());
       event = listener.getEvent(4);
-      assertEquals("OBJECT_ADDED", NamingEvent.OBJECT_ADDED, event.getType());      
+      assertEquals("OBJECT_ADDED", NamingEvent.OBJECT_ADDED, event.getType());
    }
 
    protected Object getValue(Binding binding)