[Jboss-cvs] JBossAS SVN: r56266 - in branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test: jbossmq/test naming/test testbeancluster/test

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

Author: ryan.campbell at jboss.com
Date: 2006-08-25 10:10:12 -0400 (Fri, 25 Aug 2006)
New Revision: 56266

Modified:
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/jbossmq/test/UnackedUnitTestCase.java
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
   branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/testbeancluster/test/BeanUnitTestCase.java
Log:
merged testsuite fixes from 4.0 branch

Modified: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/jbossmq/test/UnackedUnitTestCase.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/jbossmq/test/UnackedUnitTestCase.java	2006-08-25 14:01:38 UTC (rev 56265)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/jbossmq/test/UnackedUnitTestCase.java	2006-08-25 14:10:12 UTC (rev 56266)
@@ -521,11 +521,11 @@
       Queue queue = (Queue)context.lookup(TEST_QUEUE);
 
       QueueReceiver receiver = session.createReceiver(queue);
-      Message message = receiver.receive(50);
+      Message message = receiver.receive(1000);
       int c = 0;
       while (message != null)
       {
-         message = receiver.receive(50);
+         message = receiver.receive(1000);
          c++;
       }
 
@@ -548,11 +548,11 @@
       Topic topic = (Topic)context.lookup(TEST_TOPIC);
       TopicSubscriber subscriber = session.createSubscriber(topic);
 
-      Message message = subscriber.receive(50);
+      Message message = subscriber.receive(1000);
       int c = 0;
       while (message != null)
       {
-         message = subscriber.receive(50);
+         message = subscriber.receive(1000);
          c++;
       }
 
@@ -575,11 +575,11 @@
       Topic topic = (Topic)context.lookup(TEST_DURABLE_TOPIC);
       TopicSubscriber subscriber = session.createDurableSubscriber(topic, "test");
 
-      Message message = subscriber.receive(50);
+      Message message = subscriber.receive(1000);
       int c = 0;
       while (message != null)
       {
-         message = subscriber.receive(50);
+         message = subscriber.receive(1000);
          c++;
       }
 

Modified: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java	2006-08-25 14:01:38 UTC (rev 56265)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java	2006-08-25 14:10:12 UTC (rev 56266)
@@ -217,8 +217,9 @@
    {
       getLog().debug("+++ testHjnp.localAddressaParitionName");
       Properties env = new Properties();
-      env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":65535/");
-      env.setProperty("jnp.localAddress", InetAddress.getLocalHost().getHostName());      
+      String serverHost = getServerHost();
+      env.setProperty(Context.PROVIDER_URL, "jnp://" + serverHost + ":65535/");
+      env.setProperty("jnp.localAddress", serverHost);      
       env.setProperty("jnp.partitionName", "DefaultPartition");
       getLog().debug("Creating InitialContext with env="+env);
       InitialContext ctx = new InitialContext(env);
@@ -258,8 +259,9 @@
    {
       getLog().debug("+++ testDiscoveryPort");
       Properties env = new Properties();
-      env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":65535/");
-      env.setProperty("jnp.localAddress", InetAddress.getLocalHost().getHostName());      
+      String serverHost = getServerHost();
+      env.setProperty(Context.PROVIDER_URL, "jnp://" + serverHost + ":65535/");
+      env.setProperty("jnp.localAddress", serverHost);      
       env.setProperty("jnp.discoveryPort", "1102");
       getLog().debug("Creating InitialContext with env="+env);
       InitialContext ctx = new InitialContext(env);

Modified: branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/testbeancluster/test/BeanUnitTestCase.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/testbeancluster/test/BeanUnitTestCase.java	2006-08-25 14:01:38 UTC (rev 56265)
+++ branches/JBoss_4_0_3_SP1_CP/testsuite/src/main/org/jboss/test/testbeancluster/test/BeanUnitTestCase.java	2006-08-25 14:10:12 UTC (rev 56266)
@@ -334,7 +334,14 @@
 
       for(int n = 0; n < beans.length; n ++)
       {
-         beans[n].remove();
+         try
+         {
+            beans[n].remove();
+         }
+         catch (java.rmi.NoSuchObjectException nso)
+         {
+            log.debug("Caught NoSuchObjectException removing bean " + n);
+         }
       }
       
       // Confirm that the bean cache is empty