Skip to content

Commit

Permalink
Merge pull request #10817 from rhusar/WFLY-9765
Browse files Browse the repository at this point in the history 
WFLY-9765 CdiFailoverTestCase should be based on generic web failover…
  • Loading branch information
@kabir
kabir committed Feb 8, 2018
2 parents 08e5abc + 0134ba4 commit 5537f57
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 144 deletions.
143 changes: 22 additions & 121 deletions ...lustering/src/test/java/org/jboss/as/test/clustering/cluster/cdi/CdiFailoverTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,155 +21,56 @@
*/
package org.jboss.as.test.clustering.cluster.cdi;

import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.utils.HttpClientUtils;
import org.apache.http.impl.client.CloseableHttpClient;
import org.infinispan.transaction.TransactionMode;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.container.test.api.TargetsContainer;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.as.test.clustering.cluster.AbstractClusteringTestCase;
import org.jboss.as.test.clustering.ClusterTestUtil;
import org.jboss.as.test.clustering.cluster.ejb.stateful.bean.Incrementor;
import org.jboss.as.test.http.util.TestHttpClientUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.as.test.clustering.cluster.web.AbstractWebFailoverTestCase;
import org.jboss.as.test.clustering.single.web.Mutable;
import org.jboss.as.test.clustering.single.web.SimpleServlet;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;

import static org.junit.Assert.assertEquals;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.runner.RunWith;

/**
* Test failover with CDI session bean.
*
* @author Tomas Remes
* @author Radoslav Husar
*/

@RunWith(Arquillian.class)
@RunAsClient
public class CdiFailoverTestCase extends AbstractClusteringTestCase {
public class CdiFailoverTestCase extends AbstractWebFailoverTestCase {

private static final String MODULE_NAME = CdiFailoverTestCase.class.getSimpleName();
private static final String DEPLOYMENT_NAME = MODULE_NAME + ".war";

private static final String MODULE_NAME = "cdi-failover";
public CdiFailoverTestCase() {
super(DEPLOYMENT_NAME, TransactionMode.TRANSACTIONAL);
}

@Deployment(name = DEPLOYMENT_1, managed = false, testable = false)
@TargetsContainer(NODE_1)
public static Archive<?> deployment0() {
public static Archive<?> deployment1() {
return createDeployment();
}

@Deployment(name = DEPLOYMENT_2, managed = false, testable = false)
@TargetsContainer(NODE_2)
public static Archive<?> deployment1() {
public static Archive<?> deployment2() {
return createDeployment();
}

private static Archive<?> createDeployment() {
WebArchive war = ShrinkWrap.create(WebArchive.class, MODULE_NAME + ".war");
war.addClasses(Incrementor.class, CdiIncrementorBean.class, CdiServlet.class, IncrementorDecorator.class);
WebArchive war = ShrinkWrap.create(WebArchive.class, DEPLOYMENT_NAME);
war.addClasses(Incrementor.class, CdiIncrementorBean.class, CdiServlet.class, SimpleServlet.class, Mutable.class, IncrementorDecorator.class);
ClusterTestUtil.addTopologyListenerDependencies(war);
war.setWebXML(CdiFailoverTestCase.class.getPackage(), "web.xml");
return war;
}

/**
* Test simple graceful shutdown failover:
* <p/>
* 1/ Start 2 containers and deploy <distributable/> webapp.
* 2/ Query first container creating a web session.
* 3/ Shutdown first container.
* 4/ Query second container verifying sessions got replicated.
* 5/ Bring up the first container.
* 6/ Query first container verifying that updated sessions replicated back.
*
* @throws java.io.IOException
* @throws InterruptedException
* @throws java.net.URISyntaxException
*/
@Test
public void testGracefulSimpleFailover(
@ArquillianResource(CdiServlet.class) @OperateOnDeployment(DEPLOYMENT_1) URL baseURL1,
@ArquillianResource(CdiServlet.class) @OperateOnDeployment(DEPLOYMENT_2) URL baseURL2)
throws IOException, URISyntaxException {
testFailover(new RestartLifecycle(), baseURL1, baseURL2);
}

/**
* Test simple undeploy failover:
* <p/>
* 1/ Start 2 containers and deploy <distributable/> webapp.
* 2/ Query first container creating a web session.
* 3/ Undeploy application from the first container.
* 4/ Query second container verifying sessions got replicated.
* 5/ Redeploy application to the first container.
* 6/ Query first container verifying that updated sessions replicated back.
*
* @throws IOException
* @throws InterruptedException
* @throws URISyntaxException
*/
@Test
public void testGracefulUndeployFailover(
@ArquillianResource(CdiServlet.class) @OperateOnDeployment(DEPLOYMENT_1) URL baseURL1,
@ArquillianResource(CdiServlet.class) @OperateOnDeployment(DEPLOYMENT_2) URL baseURL2)
throws IOException, URISyntaxException {
testFailover(new RedeployLifecycle(), baseURL1, baseURL2);
}

private static void testFailover(Lifecycle lifecycle, URL baseURL1, URL baseURL2) throws IOException, URISyntaxException {

URI uri1 = CdiServlet.createURI(baseURL1);
URI uri2 = CdiServlet.createURI(baseURL2);

try (CloseableHttpClient client = TestHttpClientUtils.promiscuousCookieHttpClient()){
assertEquals(1, queryCount(client, uri1));
assertEquals(2, queryCount(client, uri1));

assertEquals(3, queryCount(client, uri2));
assertEquals(4, queryCount(client, uri2));

lifecycle.stop(NODE_2);

assertEquals(5, queryCount(client, uri1));
assertEquals(6, queryCount(client, uri1));

lifecycle.start(NODE_2);

assertEquals(7, queryCount(client, uri1));
assertEquals(8, queryCount(client, uri1));

assertEquals(9, queryCount(client, uri2));
assertEquals(10, queryCount(client, uri2));

lifecycle.stop(NODE_1);

assertEquals(11, queryCount(client, uri2));
assertEquals(12, queryCount(client, uri2));

lifecycle.start(NODE_1);

assertEquals(13, queryCount(client, uri1));
assertEquals(14, queryCount(client, uri1));

assertEquals(15, queryCount(client, uri2));
assertEquals(16, queryCount(client, uri2));
}
}

private static int queryCount(HttpClient client, URI uri) throws IOException {
HttpResponse response = client.execute(new HttpGet(uri));
try {
assertEquals(HttpServletResponse.SC_OK, response.getStatusLine().getStatusCode());
return Integer.parseInt(response.getFirstHeader("count").getValue());
} finally {
HttpClientUtils.closeQuietly(response);
}
}
}
6 changes: 3 additions & 3 deletions ...clustering/src/test/java/org/jboss/as/test/clustering/cluster/cdi/CdiIncrementorBean.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
*/
package org.jboss.as.test.clustering.cluster.cdi;

import org.jboss.as.test.clustering.cluster.ejb.stateful.bean.Incrementor;
import java.util.concurrent.atomic.AtomicInteger;

import javax.ejb.Stateful;
import javax.enterprise.context.SessionScoped;
import java.util.concurrent.atomic.AtomicInteger;

import org.jboss.as.test.clustering.cluster.ejb.stateful.bean.Incrementor;

/**
* @author Tomas Remes
*/

@Stateful
@SessionScoped
public class CdiIncrementorBean implements Incrementor {
Expand Down
35 changes: 16 additions & 19 deletions ...gration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/cdi/CdiServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,25 @@
*/
package org.jboss.as.test.clustering.cluster.cdi;

import org.jboss.as.test.clustering.cluster.ejb.stateful.bean.Incrementor;
import java.io.IOException;

import javax.inject.Inject;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;

import org.jboss.as.test.clustering.cluster.ejb.stateful.bean.Incrementor;
import org.jboss.as.test.clustering.single.web.SimpleServlet;

/**
* Note that the servlet is mapped to /simple using web.xml servlet-mapping overriding @WebServlet of the SimpleServlet.
*
* @author Tomas Remes
* @author Radoslav Husar
*/
@WebServlet(urlPatterns = CdiServlet.SERVLET_PATH)
public class CdiServlet extends HttpServlet {
private static final long serialVersionUID = 5167789049451718160L;
public class CdiServlet extends SimpleServlet {

public static final String SERVLET_NAME = "cdi";
public static final String SERVLET_PATH = "/" + SERVLET_NAME;
public static final String SESSION_ID_HEADER = "sessionId";
public static final String COUNT = "count";
private static final long serialVersionUID = 5167789049451718160L;

@Inject
private Incrementor incrementor;
Expand All @@ -53,11 +48,13 @@ public class CdiServlet extends HttpServlet {
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
HttpSession session = req.getSession(true);
resp.addHeader(SESSION_ID_HEADER, session.getId());
resp.setIntHeader(COUNT, this.incrementor.increment());
resp.getWriter().write("Success");
}

public static URI createURI(URL baseURL) throws URISyntaxException {
return baseURL.toURI().resolve(SERVLET_NAME);
int value = this.incrementor.increment();

resp.setIntHeader(VALUE_HEADER, value);

this.getServletContext().log(req.getRequestURI() + ", value = " + value);

resp.getWriter().write("Success");
}
}
11 changes: 11 additions & 0 deletions ...ite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/cdi/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,15 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<distributable/>

<!-- Use mapping in the web.xml to override /simple servlet URL mapping defined in the @WebServlet annotation -->
<servlet>
<servlet-name>org.jboss.as.test.clustering.cluster.cdi.CdiServlet</servlet-name>
<servlet-class>org.jboss.as.test.clustering.cluster.cdi.CdiServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>org.jboss.as.test.clustering.cluster.cdi.CdiServlet</servlet-name>
<url-pattern>/simple</url-pattern>
</servlet-mapping>

</web-app>
2 changes: 1 addition & 1 deletion ...ation/clustering/src/test/java/org/jboss/as/test/clustering/single/web/SimpleServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class SimpleServlet extends HttpServlet {
public static final String HEADER_SERIALIZED = "serialized";
public static final String VALUE_HEADER = "value";
public static final String SESSION_ID_HEADER = "sessionId";
private static final String ATTRIBUTE = "test";
public static final String ATTRIBUTE = "test";

public static URI createURI(URL baseURL) throws URISyntaxException {
return createURI(baseURL.toURI());
Expand Down

0 comments on commit 5537f57

Please sign in to comment.