[jboss-cvs] JBossAS SVN: r71795 - in trunk/testsuite/src/main/org/jboss/test/cluster: multicfg/web/field/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 8 11:48:42 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-04-08 11:48:42 -0400 (Tue, 08 Apr 2008)
New Revision: 71795
Modified:
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/test/ScopedTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/SessionBasedConcurrentTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/UndeployTestCase.java
Log:
Refactor some session cookie stuff into a utility method
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 15:25:52 UTC (rev 71794)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SimpleTestCase.java 2008-04-08 15:48:42 UTC (rev 71795)
@@ -147,7 +147,7 @@
sleepThread(6000);
// Confirm first session is expired on node 0
- setCookieDomainToThisServer(client, servers_[0]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[0]);
attr = makeGetWithState(client, baseURL0_ +getURLName);
assertFalse("Original session not present", attr2.equals(attr));
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 15:25:52 UTC (rev 71794)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/FieldBasedTestCase.java 2008-04-08 15:48:42 UTC (rev 71795)
@@ -152,7 +152,7 @@
this.sleepThread(DEFAULT_SLEEP);
// Now switch back to server0 and remove the POJO from the session
- setCookieDomainToThisServer(client, servers_[0]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[0]);
makeGet(client, baseURL0_ + removeUrl);
MBeanServerConnection[] adaptors = getAdaptors();
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 15:25:52 UTC (rev 71794)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/ScopedTestCase.java 2008-04-08 15:48:42 UTC (rev 71795)
@@ -175,7 +175,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);
assertEquals("Get attribute should be but is ", attr, attr2);
@@ -213,7 +213,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
@@ -254,7 +254,7 @@
sleepThread(DEFAULT_SLEEP);
// Make connection to server 1 and get
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
String attr2 = makeGetWithState(client, baseURL1_ +getUrl);
// Check the result
@@ -272,7 +272,7 @@
sleepThread(DEFAULT_SLEEP);
// Make connection to server 1 and get
- setCookieDomainToThisServer(client, servers_[0]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[0]);
attr2 = makeGetWithState(client, baseURL0_ +getUrl);
// Check the result
@@ -312,7 +312,7 @@
sleepThread(DEFAULT_SLEEP);
// Make connection to server 1 and get
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
// Get the Attribute set
makeGet(client, baseURL1_ +getUrl);
// Get the list of attributes
@@ -332,7 +332,7 @@
sleepThread(DEFAULT_SLEEP);
// Make connection to server 1 and get
- setCookieDomainToThisServer(client, servers_[0]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[0]);
// Attribute is now null. Should have not OK response.
makeGetFailed(client, baseURL0_ +getUrl);
@@ -370,7 +370,7 @@
sleepThread(DEFAULT_SLEEP);
// Switch to server 1 and get the attribute
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
String attrOld1 = makeGet(client, baseURL1_ +getUrl);
assertEquals("Attributes should be the same", attrOld, attrOld1);
@@ -382,7 +382,7 @@
sleepThread(400);
// Switch back to server 0 and get the attribute
- setCookieDomainToThisServer(client, servers_[0]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[0]);
attr = makeGet(client, baseURL0_ +getUrl);
assertEquals("Attributes should be the same", attr, attr2);
@@ -554,7 +554,7 @@
sleepThread(DEFAULT_SLEEP + 200); // wait a bit longer to propagate
// Make connection to server 0 and get
- setCookieDomainToThisServer(client, servers_[0]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[0]);
// Session is invalidated. Should have not OK response.
makeGetFailed(client, baseURL0_ + getUrl);
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/SessionBasedConcurrentTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/SessionBasedConcurrentTestCase.java 2008-04-08 15:25:52 UTC (rev 71794)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/SessionBasedConcurrentTestCase.java 2008-04-08 15:48:42 UTC (rev 71795)
@@ -26,6 +26,7 @@
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.GetMethod;
import org.jboss.test.JBossClusteredTestCase;
+import org.jboss.test.cluster.testutil.SessionTestUtil;
import org.jboss.test.cluster.testutil.WebTestBase;
import java.util.Random;
@@ -154,7 +155,7 @@
// Let's switch to server 2 to retrieve the session attribute.
getLog().debug("Switching to server " +server2);
- setCookieDomainToThisServer(client, server2);
+ SessionTestUtil.setCookieDomainToThisServer(client, server2);
String attr2 = makeGet(client, baseURL1 +getURLName);
// Check the result
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/UndeployTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/UndeployTestCase.java 2008-04-08 15:25:52 UTC (rev 71794)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/UndeployTestCase.java 2008-04-08 15:48:42 UTC (rev 71795)
@@ -6,6 +6,7 @@
import org.apache.commons.httpclient.HttpClient;
import org.jboss.test.JBossClusteredTestCase;
+import org.jboss.test.cluster.testutil.SessionTestUtil;
import org.jboss.test.cluster.testutil.WebTestBase;
/**
@@ -81,7 +82,7 @@
sleepThread(DEFAULT_SLEEP);
// Make connection to server 1 and get
- setCookieDomainToThisServer(client, servers_[1]);
+ SessionTestUtil.setCookieDomainToThisServer(client, servers_[1]);
String attr2 = makeGetWithState(client, baseURL1_ + getUrl_);
assertEquals("Get attribute should be but is ", attr, attr2);
More information about the jboss-cvs-commits
mailing list