[jboss-cvs] JBossAS SVN: r71791 - in trunk/testsuite/src/main/org/jboss/test/cluster: multicfg/web/field/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 8 10:21:17 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-04-08 10:21:17 -0400 (Tue, 08 Apr 2008)
New Revision: 71791
Modified:
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ScopedSetAttributeTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ScopedSetTriggerTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SimpleTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/FieldBasedTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/StateTransferTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/ScopedTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/WebTestBase.java
Log:
Refactor some session cookie stuff into a utility method
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ScopedSetAttributeTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ScopedSetAttributeTestCase.java 2008-04-08 14:00:11 UTC (rev 71790)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ScopedSetAttributeTestCase.java 2008-04-08 14:21:17 UTC (rev 71791)
@@ -27,6 +27,7 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.multicfg.web.test.ScopedTestCase;
+import org.jboss.test.cluster.testutil.SessionTestUtil;
/**
* Clustering test case of get/set under scoped class loader.
@@ -92,7 +93,7 @@
sleepThread(DEFAULT_SLEEP);
// Make connection to server 1 and get
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
String attr2 = makeGet(client, baseURL1_ +getUrl);
// Check the result
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ScopedSetTriggerTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ScopedSetTriggerTestCase.java 2008-04-08 14:00:11 UTC (rev 71790)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/ScopedSetTriggerTestCase.java 2008-04-08 14:21:17 UTC (rev 71791)
@@ -27,6 +27,7 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.multicfg.web.test.ScopedTestCase;
+import org.jboss.test.cluster.testutil.SessionTestUtil;
/**
* Clustering test case of get/set under scoped class loader.
@@ -93,7 +94,7 @@
sleepThread(DEFAULT_SLEEP);
// Make connection to server 1 and get
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
String attr2 = makeGet(client, baseURL1_ +getUrl);
// Check the result
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java 2008-04-08 14:00:11 UTC (rev 71790)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java 2008-04-08 14:21:17 UTC (rev 71791)
@@ -116,7 +116,7 @@
{
try
{
- setCookieDomainToThisServer(client, servers_[0]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[0]);
makeGet(client, baseURL0_ +invalidateUrl);
}
catch (Exception e)
@@ -154,7 +154,7 @@
// activate the session by requesting the attribute
// Make connection to server 0 and get
- setCookieDomainToThisServer(client, servers_[0]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[0]);
String attr2 = checkDeserialization(client, baseURL0_ + getUrl, true);
assertEquals("attribute match after activation", attr0, attr2);
@@ -244,7 +244,7 @@
sleep(2000);
// Get the Attribute using the same session ID
- setCookieDomainToThisServer(client, servers_[0]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[0]);
String attr0 = makeGet(client, baseURL0_ +getUrl);
assertEquals("attributeMatches after activation", attr0, attr);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SimpleTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SimpleTestCase.java 2008-04-08 14:00:11 UTC (rev 71790)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SimpleTestCase.java 2008-04-08 14:21:17 UTC (rev 71791)
@@ -82,7 +82,7 @@
sleepThread(DEFAULT_SLEEP);
// Let's switch to server 2 to retrieve the session attribute.
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
String attr2 = makeGet(client, baseURL1_ +getURLName);
// Check the result
@@ -135,7 +135,7 @@
sleepThread(15000);
// Switch to the other server and check if 1st session is alive
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
attr2 = makeGetWithState(client, baseURL1_ +getURLName);
// Check the result
@@ -196,7 +196,7 @@
sleepThread(17000);
// Switch servers
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
// Get the Attribute set by testsessionreplication.jsp
String attr1 = makeGetWithState(client, baseURL1_ +getURLName);
@@ -230,7 +230,7 @@
sleepThread(2000);
// Switch servers
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
String ver1 = makeGetWithState(client, baseURL1_ +versionURLName);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/FieldBasedTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/FieldBasedTestCase.java 2008-04-08 14:00:11 UTC (rev 71790)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/FieldBasedTestCase.java 2008-04-08 14:21:17 UTC (rev 71791)
@@ -146,7 +146,7 @@
// Switch over to server1 and get the POJO, which will also
// cause it to be stored in the servlet context on that server
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
makeGet(client, baseURL1_ + getUrl);
this.sleepThread(DEFAULT_SLEEP);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/StateTransferTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/StateTransferTestCase.java 2008-04-08 14:00:11 UTC (rev 71790)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/StateTransferTestCase.java 2008-04-08 14:21:17 UTC (rev 71791)
@@ -25,7 +25,6 @@
import java.util.Set;
import javax.management.MBeanServerConnection;
-import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import junit.framework.Test;
@@ -50,23 +49,6 @@
public class StateTransferTestCase extends WebTestBase
{
- private static final Object[] NULL_ARGS = new Object[] {};
- private static final String[] NULL_TYPES = new String[] {};
-
- private static final ObjectName CACHE_OBJECT_NAME;
- static
- {
- try
- {
- CACHE_OBJECT_NAME =
- new ObjectName("jboss.cache:service=TomcatClusteringCache");
- }
- catch (MalformedObjectNameException e)
- {
- throw new ExceptionInInitializerError(e);
- }
- }
-
private static boolean deployed0 = true;
private static boolean deployed1 = true;
@@ -169,7 +151,7 @@
makeGet(clients[i], baseURL0_ +setUrl_);
attrs[i] = makeGet(clients[i], baseURL0_ + getUrl_);
// Set cookie domain to server1
- this.setCookieDomainToThisServer(clients[i], servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(clients[i], servers_[1]);
}
getLog().debug("Sessions created");
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/ScopedTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/ScopedTestCase.java 2008-04-08 14:00:11 UTC (rev 71790)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/ScopedTestCase.java 2008-04-08 14:21:17 UTC (rev 71791)
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.net.HttpURLConnection;
-import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import junit.framework.Test;
@@ -35,8 +34,8 @@
import org.apache.commons.httpclient.HttpState;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.jboss.cache.Fqn;
import org.jboss.test.JBossClusteredTestCase;
+import org.jboss.test.cluster.testutil.SessionTestUtil;
import org.jboss.test.cluster.testutil.WebTestBase;
/**
@@ -79,7 +78,6 @@
protected String getSecuritySubjectUrlBase_;
private ObjectName warObjectName;
- private String warFqn_;
public ScopedTestCase(String name)
{
@@ -142,12 +140,6 @@
String oname = "jboss.web:J2EEApplication=none,J2EEServer=none," +
"j2eeType=WebModule,name=//localhost/" + getWarName();
warObjectName = new ObjectName(oname);
-
- MBeanServerConnection[] adaptors = getAdaptors();
-
- Object[] names = {"JSESSION", "localhost", getWarName() };
- Fqn fqn = new Fqn(names);
- warFqn_ = fqn.toString();
}
}
@@ -468,7 +460,7 @@
sleepThread(DEFAULT_SLEEP);
// Check if the attribute replicated
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
String attrRepl = makeGet(client, baseURL1_ +getSecuritySubjectUrl_);
assertTrue("javax.security.Subject did not replicate", attrRepl.indexOf("java.lang.String") > -1);
}
@@ -493,13 +485,13 @@
sleepThread(DEFAULT_SLEEP);
// Let's switch to server 2 to retrieve the session attribute.
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
assertFalse("Session is not new", checkNew(client, baseURL1_ + getUrl));
sleepThread(DEFAULT_SLEEP);
// Let's switch to server 1 to ensure its correct there as well.
- setCookieDomainToThisServer(client, servers_[0]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[0]);
assertFalse("Session is not new", checkNew(client, baseURL0_ + getUrl));
}
@@ -551,7 +543,7 @@
sleepThread(DEFAULT_SLEEP);
// Make connection to server 1 and get
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
String attr1 = makeGet(client, baseURL1_ + getUrl);
assertEquals("attributes match", attr0, attr1);
@@ -625,7 +617,7 @@
fail("get of "+baseURL0_ + protectedUrl_+" redirected to login page");
// Switch to the second server
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
sleepThread(DEFAULT_SLEEP);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2008-04-08 14:00:11 UTC (rev 71790)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2008-04-08 14:21:17 UTC (rev 71791)
@@ -29,6 +29,9 @@
import javax.management.MBeanServerConnection;
import org.apache.catalina.core.StandardContext;
+import org.apache.commons.httpclient.Cookie;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpState;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.config.BuddyReplicationConfig;
@@ -42,7 +45,6 @@
import org.jboss.cache.pojo.PojoCacheFactory;
import org.jboss.metadata.web.jboss.SnapshotMode;
import org.jboss.test.cluster.web.CacheHelper;
-import org.jboss.test.cluster.web.MockContainer;
import org.jboss.test.cluster.web.MockEngine;
import org.jboss.test.cluster.web.MockHost;
import org.jboss.web.tomcat.service.session.JBossCacheManager;
@@ -271,8 +273,35 @@
return true;
}
+
+ public static Cookie getSessionCookie(HttpClient client)
+ {
+ // Get the state for the JSESSIONID
+ HttpState state = client.getState();
+ // Get the JSESSIONID so we can reset the host
+ Cookie[] cookies = state.getCookies();
+ Cookie sessionID = null;
+ for(int c = 0; c < cookies.length; c ++)
+ {
+ Cookie k = cookies[c];
+ if( k.getName().equalsIgnoreCase("JSESSIONID") )
+ sessionID = k;
+ }
+ return sessionID;
+ }
+ public static void setCookieDomainToThisServer(HttpClient client, String server)
+ {
+ // Get the session cookie
+ Cookie sessionID = getSessionCookie(client);
+ if (sessionID == null)
+ throw new IllegalStateException("No session cookie found on " + client);
+ // Reset the domain so that the cookie will be sent to server1
+ sessionID.setDomain(server);
+ client.getState().addCookie(sessionID);
+ }
+
/**
* Puts the current thread to sleep for the desired number of ms, suppressing
* any exceptions.
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/WebTestBase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/WebTestBase.java 2008-04-08 14:00:11 UTC (rev 71790)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/WebTestBase.java 2008-04-08 14:21:17 UTC (rev 71791)
@@ -211,15 +211,6 @@
// Use caution: ensure correct character encoding and is not binary data
return attr;
}
-
- protected void setCookieDomainToThisServer(HttpClient client, String server)
- {
- // Get the session cookie
- Cookie sessionID = getSessionCookie(client, server);
- // Reset the domain so that the cookie will be sent to server1
- sessionID.setDomain(server);
- client.getState().addCookie(sessionID);
- }
protected String getSessionID(HttpClient client, String server)
{
@@ -229,17 +220,7 @@
protected Cookie getSessionCookie(HttpClient client, String server)
{
- // Get the state for the JSESSIONID
- HttpState state = client.getState();
- // Get the JSESSIONID so we can reset the host
- Cookie[] cookies = state.getCookies();
- Cookie sessionID = null;
- for(int c = 0; c < cookies.length; c ++)
- {
- Cookie k = cookies[c];
- if( k.getName().equalsIgnoreCase("JSESSIONID") )
- sessionID = k;
- }
+ Cookie sessionID = SessionTestUtil.getSessionCookie(client);
if(sessionID == null)
{
fail("setCookieDomainToThisServer(): fail to find session id. Server name: " +server);
More information about the jboss-cvs-commits
mailing list