[jboss-cvs] JBossAS SVN: r77256 - trunk/testsuite/src/main/org/jboss/test/refs/test.

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

Author: scott.stark at jboss.org
Date: 2008-08-20 18:21:21 -0400 (Wed, 20 Aug 2008)
New Revision: 77256

Modified:
   trunk/testsuite/src/main/org/jboss/test/refs/test/CircularRefResolutionUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/refs/test/RefResolutionUnitTestCase.java
Log:
JBAS-5868, Use reflection to validate the Client results to avoid duplicate class instances

Modified: trunk/testsuite/src/main/org/jboss/test/refs/test/CircularRefResolutionUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/refs/test/CircularRefResolutionUnitTestCase.java	2008-08-20 22:09:26 UTC (rev 77255)
+++ trunk/testsuite/src/main/org/jboss/test/refs/test/CircularRefResolutionUnitTestCase.java	2008-08-20 22:21:21 UTC (rev 77256)
@@ -21,6 +21,7 @@
  */
 package org.jboss.test.refs.test;
 
+import java.lang.reflect.Method;
 import java.util.Date;
 
 import javax.ejb.Remote;
@@ -103,7 +104,20 @@
       
       ClientLauncher launcher = new ClientLauncher();
       launcher.launch(mainClassName, applicationClientName, args);
-      assertNotNull(Client.getStatefulBean());
-      assertNotNull(Client.getStatelessBean());
+
+      // Need to use the client class obtained from the launcher
+      Class<?> clientClass = ClientLauncher.getTheMainClass();
+      Class<?> empty[] = {};
+      {
+         Method getStatefulBean = clientClass.getDeclaredMethod("getStatefulBean", empty);
+         Object bean = getStatefulBean.invoke(null, null);
+         assertNotNull("StatefulBean was set", bean);
+      }
+
+      {
+         Method getStatelessBean = clientClass.getDeclaredMethod("getStatelessBean", empty);
+         Object bean = getStatelessBean.invoke(null, null);
+         assertNotNull("StatelessBean was set", bean);
+      }
    }
 }

Modified: trunk/testsuite/src/main/org/jboss/test/refs/test/RefResolutionUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/refs/test/RefResolutionUnitTestCase.java	2008-08-20 22:09:26 UTC (rev 77255)
+++ trunk/testsuite/src/main/org/jboss/test/refs/test/RefResolutionUnitTestCase.java	2008-08-20 22:21:21 UTC (rev 77256)
@@ -21,6 +21,7 @@
  */
 package org.jboss.test.refs.test;
 
+import java.lang.reflect.Method;
 import java.util.Date;
 import java.util.Properties;
 
@@ -121,8 +122,21 @@
       ClientLauncher launcher = new ClientLauncher();
       Properties env = getENCProps(applicationClientName);
       launcher.launch(mainClassName, applicationClientName, args, env);
-      assertNotNull(Client.getStatefulBean());
-      assertNotNull(Client.getStatelessBean());
+
+      // Need to use the client class obtained from the launcher
+      Class<?> clientClass = ClientLauncher.getTheMainClass();
+      Class<?> empty[] = {};
+      {
+         Method getStatefulBean = clientClass.getDeclaredMethod("getStatefulBean", empty);
+         Object bean = getStatefulBean.invoke(null, null);
+         assertNotNull("StatefulBean was set", bean);
+      }
+
+      {
+         Method getStatelessBean = clientClass.getDeclaredMethod("getStatelessBean", empty);
+         Object bean = getStatelessBean.invoke(null, null);
+         assertNotNull("StatelessBean was set", bean);
+      }
    }
 
    private Properties getENCProps(String applicationClientName)