Author: jfrederic.clere(a)jboss.com Date: 2009-03-17 04:35:10 -0400 (Tue, 17 Mar 2009) New Revision: 2366 Added: trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestFailAppover.java Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/JBossWeb.java Log: Test for MODCLUSTER-63. Modified: trunk/mod_cluster/test/java/org/jboss/mod_cluster/JBossWeb.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/JBossWeb.java 2009-03-17 01:42:10 UTC (rev 2365) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/JBossWeb.java 2009-03-17 08:35:10 UTC (rev 2366) @@ -154,6 +154,17 @@ addEngine( baseEngine ); baseEngine.setService(this); } + void AddContext(String path, String docBase) { + Context context = createContext(path, docBase); + Engine engine = (Engine) getContainer(); + Container[] containers = engine.findChildren(); + for (int j = 0; j < containers.length; j++) { + if (containers[j] instanceof Host) { + Host host = (Host) containers[j]; + host.addChild(context); + } + } + } public JBossWeb(String route, String host) throws IOException { this(route, host, false); @@ -191,6 +202,17 @@ return connector; } + public void removeContext(String path) { + Engine engine = (Engine) getContainer(); + Container[] containers = engine.findChildren(); + for (int j = 0; j < containers.length; j++) { + if (containers[j] instanceof StandardHost) { + StandardHost host = (StandardHost) containers[j]; + Context context = host.map(path); + containers[j].removeChild(context); + } + } + } /* Test */ Added: trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestFailAppover.java =================================================================== --- trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestFailAppover.java (rev 0) +++ trunk/mod_cluster/test/java/org/jboss/mod_cluster/TestFailAppover.java 2009-03-17 08:35:10 UTC (rev 2366) @@ -0,0 +1,151 @@ +/* + * mod_cluster + * + * Copyright(c) 2008 Red Hat Middleware, LLC, + * and individual contributors as indicated by the @authors tag. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library in the file COPYING.LIB; + * if not, write to the Free Software Foundation, Inc., + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * @author Jean-Frederic Clere + * @version $Revision$ + */ + +package org.jboss.mod_cluster; + +import java.io.IOException; + +import junit.framework.TestCase; + +import org.apache.catalina.Engine; +import org.apache.catalina.ServerFactory; +import org.apache.catalina.Service; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.LifecycleException; +import org.apache.catalina.connector.Connector; +import org.apache.catalina.core.StandardServer; + +public class TestFailAppover extends TestCase { + + StandardServer server = null; + + /* Test failAppover */ + public void testFailAppover() { + + boolean clienterror = false; + server = Maintest.getServer(); + JBossWeb service = null; + JBossWeb service2 = null; + Connector connector = null; + Connector connector2 = null; + LifecycleListener cluster = null; + System.out.println("TestFailAppover Started"); + try { + // server = (StandardServer) ServerFactory.getServer(); + + service = new JBossWeb("node3", "localhost"); + connector = service.addConnector(8011); + service.AddContext("/test", "/test"); + server.addService(service); + + service2 = new JBossWeb("node4", "localhost"); + connector2 = service2.addConnector(8010); + service2.AddContext("/test", "/test"); + server.addService(service2); + + cluster = Maintest.createClusterListener("232.0.0.2", 23364, false, "dom1"); + server.addLifecycleListener(cluster); + // Maintest.listServices(); + + } catch(IOException ex) { + ex.printStackTrace(); + fail("can't start service"); + } + + // start the server thread. + ServerThread wait = new ServerThread(3000, server); + wait.start(); + + // Wait until httpd as received the nodes information. + try { + Thread.sleep(30000); + } catch (InterruptedException ex) { + ex.printStackTrace(); + } + + // Start the client and wait for it. + Client client = new Client(); + + // Wait for it. + try { + if (client.runit("/ROOT/MyCount", 10, false, true) != 0) + clienterror = true; + } catch (Exception ex) { + ex.printStackTrace(); + clienterror = true; + } + if (clienterror) + fail("Client error"); + + // Stop the connector that has received the request... + String node = client.getnode(); + if ("node4".equals(node)) { + service2.removeContext("/"); + node = "node3"; + } else { + service.removeContext("/"); + node = "node4"; + } + + // Run a test on it. (it waits until httpd as received the nodes information). + client.setnode(node); + try { + client.setdelay(30000); + client.start(); + client.join(); + } catch (Exception ex) { + ex.printStackTrace(); + } + if (client.getresultok()) + System.out.println("Test DONE"); + else { + System.out.println("Test FAILED"); + clienterror = true; + } + + // Stop the server or services. + try { + wait.stopit(); + wait.join(); + server.removeService(service); + server.removeLifecycleListener(cluster); + } catch (InterruptedException ex) { + ex.printStackTrace(); + } + + // Wait until httpd as received the stop messages. + Maintest.TestForNodes(cluster, null); + + // Test client result. + if (clienterror) + fail("Client test failed"); + + Maintest.testPort(8011); + Maintest.testPort(8010); + System.out.println("TestFailAppover Done"); + } +}