Merge pull request #492 from gaol/EJBCLIENT-263-4.0

[EJBCLIENT-263] Testsuite enhancements

Author: tadamski

src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java

@@ -138,6 +138,9 @@ public Object handleInvocationResult(final EJBClientInvocationContext context) t
         try {
             result = context.getResult();
         } catch (NoSuchEJBException | RequestSendFailedException e) {
+            if (Logs.INVOCATION.isDebugEnabled()) {
+                Logs.INVOCATION.debugf("DiscoveryEJBClientInterceptor: handleInvocationResult: (exception = %s)", e.getMessage());
+            }
             processMissingTarget(context, e);
             throw e;
         }

src/test/java/org/jboss/ejb/client/test/AbstractEJBClientTestCase.java

@@ -29,34 +29,6 @@
 /**
  * A base class for EJB client test cases.
  *
- * This base class provides helpers for the client side test case to model the following aspects of s server environment:
- * - starting/stopping of servers with specific endpoint name, hostname and port
- * - deployment/undeployment of EJBs on those servers
- * - simple, generic Stateful and Stateless Session beans (with real annotations and methods)
- * - named clusters of servers
- *
- * Convenience methods are available for performing common tasks in test cases which subclass from this abstract class.
- * For example, to start a singleton node and deploy a SFSB on that node:
- * startServer(0);
- * deployStateful(0);
- * This starts the server with endpoint name "node1", hostname "node1" and port 6999. Module updates will be received by the client.
- * We can undeploy and shutdown the node:
- * undeployStateful(0);
- * stopServer(0);
- *
- * To create a cluster of two nodes called "ejb" and deploy a Stateless bean on the second node only:
- * startServer(0);
- * startServer(1);
- * defineCluster(0, CLUSTER);
- * defineCluster(1, CLUSTER);
- * deployStateless(1);
- * Module updates and topology updates will be received by the client.
- * Changes to cluster membership need to be arranged by creating new ClusterInfo objects corresponding to the actual membership.
- * We can bring down the cluster:
- * undeployStateless(1);
- * removeCluster(0, "ejb")
- * removeCluster(1, "ejb")
- *
  * @author <a href="mailto:[email protected]">Richard Achmatowicz</a>
  */
 public class AbstractEJBClientTestCase {
@@ -172,9 +144,26 @@ public void undeployStateful(int index) {
         logger.info("Unregistered SFSB module " + MODULE_IDENTIFIER.toString()  + " on server " + serverNames[index]);
     }
 
-    /*
-     * bean deployment helpers for generic beans StatefulEchoBean, StatelessEchoBean in module "my-other-app"/"my-bar-module"
-     */
+
+    public void defineCluster(int index, ClusterTopologyListener.ClusterInfo cluster) {
+        servers[index].addCluster(cluster);
+        logger.info("Added node to cluster " + cluster + ": server " + servers[index]);
+    }
+
+    public void addClusterNodes(int index, ClusterTopologyListener.ClusterInfo cluster) {
+        servers[index].addClusterNodes(cluster);
+        logger.info("Added node(s) to cluster " + cluster + ":" + cluster.getNodeInfoList());
+    }
+
+    public void removeClusterNodes(int index, ClusterTopologyListener.ClusterRemovalInfo cluster) {
+        servers[index].removeClusterNodes(cluster);
+        logger.info("Removed node(s) from cluster " + cluster + ":" + cluster.getNodeNames());
+    }
+
+    public void removeCluster(int index, String clusterName) {
+        servers[index].removeCluster(clusterName);
+        logger.info("Removed cluster " + clusterName + " from node: server " + servers[index]);
+    }
 
     public void deployOtherStateless(int index) {
         servers[index].register(OTHER_APP, MODULE_NAME, DISTINCT_NAME, StatelessEchoBean.class.getSimpleName(), new StatelessEchoBean(serverNames[index]));
@@ -196,10 +185,6 @@ public void undeployOtherStateful(int index) {
         logger.info("Unregistered other SFSB module " + OTHER_MODULE_IDENTIFIER.toString()  + " on server " + serverNames[index]);
     }
 
-    /*
-     * bean deployment helpers for custom beans in custom modules
-     */
-
     public void deployCustomBean(int index, String app, String module, String distinct, String beanName, Object beanInstance) {
         servers[index].register(app, module, distinct, beanName, beanInstance);
         logger.info("Registered custom bean " + (new EJBModuleIdentifier(app, module, distinct)).toString()  + " on server " + serverNames[index]);
@@ -210,29 +195,4 @@ public void undeployCustomBean(int index, String app, String module, String dist
         logger.info("Unregistered custom bean " + (new EJBModuleIdentifier(app, module, distinct)).toString()  + " on server " + serverNames[index]);
     }
 
-
-    /*
-     * cluster deployment helpers - these depend on predefined ClusterInfo and NodeInfo objects representing topology update information
-     */
-
-    public void defineCluster(int index, ClusterTopologyListener.ClusterInfo cluster) {
-        servers[index].addCluster(cluster);
-        logger.info("Added node to cluster " + cluster + ": server " + servers[index]);
-    }
-
-    public void addClusterNodes(int index, ClusterTopologyListener.ClusterInfo cluster) {
-        servers[index].addClusterNodes(cluster);
-        logger.info("Added node(s) to cluster " + cluster + ":" + cluster.getNodeInfoList());
-    }
-
-    public void removeClusterNodes(int index, ClusterTopologyListener.ClusterRemovalInfo cluster) {
-        servers[index].removeClusterNodes(cluster);
-        logger.info("Removed node(s) from cluster " + cluster + ":" + cluster.getNodeNames());
-    }
-
-    public void removeCluster(int index, String clusterName) {
-        servers[index].removeCluster(clusterName);
-        logger.info("Removed cluster " + clusterName + " from node: server " + servers[index]);
-    }
-
 }

src/test/java/org/jboss/ejb/client/test/ClusterNodeSelectorTestCase.java

@@ -17,7 +17,6 @@
  */
 package org.jboss.ejb.client.test;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -33,6 +32,8 @@
 import org.jboss.ejb.client.test.common.DummyServer;
 import org.jboss.ejb.client.test.common.Echo;
 import org.jboss.ejb.client.test.common.EchoBean;
+import org.jboss.ejb.client.test.common.StatefulEchoBean;
+import org.jboss.ejb.client.test.common.StatelessEchoBean;
 import org.jboss.ejb.server.ClusterTopologyListener.ClusterInfo;
 import org.jboss.ejb.server.ClusterTopologyListener.NodeInfo;
 import org.jboss.logging.Logger;
@@ -49,34 +50,11 @@
  * @author Jason T. Greene
  * @author <a href="mailto:[email protected]">Richard Achmatowicz</a>
  */
-public class ClusterNodeSelectorTestCase {
+public class ClusterNodeSelectorTestCase extends AbstractEJBClientTestCase {
 
     private static final Logger logger = Logger.getLogger(ClusterNodeSelectorTestCase.class);
     private static final String PROPERTIES_FILE = "cluster-node-selector-jboss-ejb-client.properties";
 
-    // servers
-    private static final String SERVER1_NAME = "node1";
-    private static final String SERVER2_NAME = "node2";
-
-    private DummyServer[] servers = new DummyServer[2];
-    private static String[] serverNames = {SERVER1_NAME, SERVER2_NAME};
-    private boolean[] serversStarted = new boolean[2] ;
-
-    // module
-    private static final String APP_NAME = "my-foo-app";
-    private static final String MODULE_NAME = "my-bar-module";
-    private static final String DISTINCT_NAME = "";
-
-    // cluster
-    // note: node names and server names should match!
-    private static final String CLUSTER_NAME = "ejb";
-    private static final String NODE1_NAME = "node1";
-    private static final String NODE2_NAME = "node2";
-
-    private static final NodeInfo NODE1 = DummyServer.getNodeInfo(NODE1_NAME, "localhost",6999,"0.0.0.0",0);
-    private static final NodeInfo NODE2 = DummyServer.getNodeInfo(NODE2_NAME, "localhost",7099,"0.0.0.0",0);
-    private static final ClusterInfo CLUSTER = DummyServer.getClusterInfo(CLUSTER_NAME, NODE1, NODE2);
-
     public static class TestSelector implements ClusterNodeSelector  {
         private static volatile String PICK_NODE = null;
 
@@ -111,29 +89,18 @@ public static void beforeClass() throws Exception {
     public void beforeTest() throws Exception {
 
         // start a server
-        servers[0] = new DummyServer("localhost", 6999, serverNames[0]);
-        servers[0].start();
-        serversStarted[0] = true;
-        logger.info("Started server " + serverNames[0]);
-
-        // start a server
-        servers[1] = new DummyServer("localhost", 7099, serverNames[1]);
-        servers[1].start();
-        serversStarted[1] = true;
-        logger.info("Started server " + serverNames[1]);
+        startServer(0, 6999);
+        startServer(1, 7099);
 
         // deploy modules
-        servers[0].register(APP_NAME, MODULE_NAME, DISTINCT_NAME, Echo.class.getSimpleName(), new EchoBean(NODE1_NAME));
-        logger.info("Registered module on server " + servers[0]);
-
-        servers[1].register(APP_NAME, MODULE_NAME, DISTINCT_NAME, Echo.class.getSimpleName(), new EchoBean(NODE2_NAME));
-        logger.info("Registered module on server " + servers[1]);
+        deployStateful(0);
+        deployStateless(0);
+        deployStateful(1);
+        deployStateless(1);
 
         // define clusters
-        servers[0].addCluster(CLUSTER);
-        logger.info("Added node to cluster " + CLUSTER_NAME + ": server " + servers[1]);
-        servers[1].addCluster(CLUSTER);
-        logger.info("Added node to cluster " +  CLUSTER_NAME +":  server " + servers[1]);
+        defineCluster(0, CLUSTER);
+        defineCluster(1, CLUSTER);
     }
 
     @Test
@@ -160,7 +127,7 @@ public void testClusteredSLSBInvocation() {
         logger.info("Testing invocation on SLSB proxy with ClusterAffinity");
 
         // create a proxy for invocation
-        final StatelessEJBLocator<Echo> statelessEJBLocator = new StatelessEJBLocator<Echo>(Echo.class, APP_NAME, MODULE_NAME, Echo.class.getSimpleName(), DISTINCT_NAME);
+        final StatelessEJBLocator<Echo> statelessEJBLocator = new StatelessEJBLocator<Echo>(Echo.class, APP_NAME, MODULE_NAME, StatelessEchoBean.class.getSimpleName(), DISTINCT_NAME);
         final Echo proxy = EJBClient.createProxy(statelessEJBLocator);
 
         EJBClient.setStrongAffinity(proxy, new ClusterAffinity("ejb"));
@@ -171,12 +138,12 @@ public void testClusteredSLSBInvocation() {
 
         TestSelector.PICK_NODE = NODE1_NAME;
         for (int i = 0; i < 10; i++) {
-            Assert.assertEquals(NODE1_NAME, proxy.whoAreYou());
+            Assert.assertEquals(NODE1_NAME, proxy.echo("someMsg").getNode());
         }
 
         TestSelector.PICK_NODE = NODE2_NAME;
         for (int i = 0; i < 10; i++) {
-            Assert.assertEquals(NODE2_NAME, proxy.whoAreYou());
+            Assert.assertEquals(NODE2_NAME, proxy.echo("someMsg").getNode());
         }
     }
 
@@ -189,22 +156,22 @@ public void testClusteredSFSBInvocation() throws Exception {
 
         TestSelector.PICK_NODE = NODE2_NAME;
         // create a proxy for invocation
-        final StatelessEJBLocator<Echo> statelessEJBLocator = new StatelessEJBLocator<Echo>(Echo.class, APP_NAME, MODULE_NAME, Echo.class.getSimpleName(), DISTINCT_NAME);
+        final StatelessEJBLocator<Echo> statelessEJBLocator = new StatelessEJBLocator<Echo>(Echo.class, APP_NAME, MODULE_NAME, StatefulEchoBean.class.getSimpleName(), DISTINCT_NAME);
         StatefulEJBLocator<Echo> statefulEJBLocator = null;
         statefulEJBLocator = EJBClient.createSession(statelessEJBLocator.withNewAffinity(new ClusterAffinity("ejb")));
 
         Echo proxy = EJBClient.createProxy(statefulEJBLocator);
         Assert.assertNotNull("Received a null proxy", proxy);
         for (int i = 0; i < 10; i++) {
-            Assert.assertEquals(NODE2_NAME, proxy.whoAreYou());
+            Assert.assertEquals(NODE2_NAME, proxy.echo("someMsg").getNode());
         }
 
         TestSelector.PICK_NODE = NODE1_NAME;
         statefulEJBLocator = EJBClient.createSession(statelessEJBLocator.withNewAffinity(new ClusterAffinity("ejb")));
         proxy = EJBClient.createProxy(statefulEJBLocator);
 
         for (int i = 0; i < 10; i++) {
-            Assert.assertEquals(NODE1_NAME, proxy.whoAreYou());
+            Assert.assertEquals(NODE1_NAME, proxy.echo("someMsg").getNode());
         }
     }
 
@@ -213,32 +180,17 @@ public void testClusteredSFSBInvocation() throws Exception {
      */
     @After
     public void afterTest() {
-        servers[0].unregister(APP_NAME, MODULE_NAME, DISTINCT_NAME, Echo.class.getName());
-        logger.info("Unregistered module from " + serverNames[0]);
-
-        servers[1].unregister(APP_NAME, MODULE_NAME, DISTINCT_NAME, Echo.class.getName());
-        logger.info("Unregistered module from " + serverNames[1]);
+        undeployStateless(0);
+        undeployStateful(0);
 
-        servers[0].removeCluster(CLUSTER_NAME);
-        servers[1].removeCluster(CLUSTER_NAME);
+        undeployStateless(1);
+        undeployStateful(1);
 
-        if (serversStarted[0]) {
-            try {
-                this.servers[0].stop();
-            } catch (Throwable t) {
-                logger.info("Could not stop server", t);
-            }
-        }
-        logger.info("Stopped server " + serverNames[0]);
+        removeCluster(0, CLUSTER_NAME);
+        removeCluster(1, CLUSTER_NAME);
 
-        if (serversStarted[1]) {
-            try {
-                this.servers[1].stop();
-            } catch (Throwable t) {
-                logger.info("Could not stop server", t);
-            }
-        }
-        logger.info("Stopped server " + serverNames[1]);
+        stopServer(0);
+        stopServer(1);
     }
 
     /**