[jboss-cvs] JBossAS SVN: r109806 - in trunk/testsuite/src/main/org/jboss/test/cluster: web/mocks and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 8 17:06:08 EST 2010
Author: smcgowan at redhat.com
Date: 2010-12-08 17:06:08 -0500 (Wed, 08 Dec 2010)
New Revision: 109806
Modified:
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/JvmRouteValveUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionCountUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockClusteredManager.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockJBossManager.java
trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockRequest.java
Log:
Revert test suite changes associated with reverted JBossWeb 3.0.0-beta-8 upgrade
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/JvmRouteValveUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/JvmRouteValveUnitTestCase.java 2010-12-08 22:02:30 UTC (rev 109805)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/JvmRouteValveUnitTestCase.java 2010-12-08 22:06:08 UTC (rev 109806)
@@ -73,7 +73,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(NON_FAILOVER_ID, null);
+ Session session = mgr.createSession(NON_FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(session.getId());
@@ -101,7 +101,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(FAILOVER_ID, null);
+ Session session = mgr.createSession(FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(session.getId());
@@ -130,7 +130,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(FAILOVER_ID, null);
+ Session session = mgr.createSession(FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(session.getId());
@@ -159,7 +159,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(NON_FAILOVER_ID, null);
+ Session session = mgr.createSession(NON_FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(FAILOVER_ID);
@@ -187,7 +187,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(NON_FAILOVER_ID, null);
+ Session session = mgr.createSession(NON_FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(FAILOVER_ID);
@@ -216,7 +216,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(FAILOVER_ID, null);
+ Session session = mgr.createSession(FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(NON_FAILOVER_ID);
@@ -244,7 +244,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(FAILOVER_ID, null);
+ Session session = mgr.createSession(FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(NON_FAILOVER_ID);
@@ -379,7 +379,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(NON_FAILOVER_ID, null);
+ Session session = mgr.createSession(NON_FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
@@ -406,7 +406,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(NON_FAILOVER_ID, null);
+ Session session = mgr.createSession(NON_FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionIdFromURL(true);
@@ -434,7 +434,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(FAILOVER_ID, null);
+ Session session = mgr.createSession(FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
@@ -461,7 +461,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(FAILOVER_ID, null);
+ Session session = mgr.createSession(FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionIdFromURL(true);
@@ -489,7 +489,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(NO_JVMROUTE_ID, null);
+ Session session = mgr.createSession(NO_JVMROUTE_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(session.getId());
@@ -517,7 +517,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(NO_JVMROUTE_ID, null);
+ Session session = mgr.createSession(NO_JVMROUTE_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(session.getId());
@@ -546,7 +546,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(NON_FAILOVER_ID, null);
+ Session session = mgr.createSession(NON_FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(NO_JVMROUTE_ID);
@@ -574,7 +574,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(NON_FAILOVER_ID, null);
+ Session session = mgr.createSession(NON_FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(NO_JVMROUTE_ID);
@@ -603,7 +603,7 @@
jvmRouteValve.setNext(mockValve);
- Session session = mgr.createSession(DOMAIN_FAILOVER_ID, null);
+ Session session = mgr.createSession(DOMAIN_FAILOVER_ID);
MockRequest req = new MockRequest();
req.setSession(session.getSession());
req.setRequestedSessionId(session.getId());
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionCountUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionCountUnitTestCase.java 2010-12-08 22:02:30 UTC (rev 109805)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionCountUnitTestCase.java 2010-12-08 22:06:08 UTC (rev 109806)
@@ -686,7 +686,7 @@
assertNull("session does not exist", sess);
try
{
- sess = mgr.createSession(id, null);
+ sess = mgr.createSession(id);
if (!canCreate)
fail("Could not create session" + id);
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java 2010-12-08 22:02:30 UTC (rev 109805)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java 2010-12-08 22:06:08 UTC (rev 109806)
@@ -799,7 +799,7 @@
assertNull("session does not exist", sess);
try
{
- sess = mgr.createSession(id, null);
+ sess = mgr.createSession(id);
if (!canCreate)
fail("Could not create session" + id);
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java 2010-12-08 22:02:30 UTC (rev 109805)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java 2010-12-08 22:06:08 UTC (rev 109806)
@@ -122,7 +122,7 @@
Session sess = managers[0].findSession(id);
assertNull("session does not exist", sess);
- sess = managers[0].createSession(id, null);
+ sess = managers[0].createSession(id);
sess.access();
sess.getSession().setAttribute("test", "test");
managers[0].storeSession(sess);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java 2010-12-08 22:02:30 UTC (rev 109805)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java 2010-12-08 22:06:08 UTC (rev 109806)
@@ -106,8 +106,8 @@
assertNull(manager.findSession("2"));
assertNull(manager.findSessions());
assertNull(manager.createEmptySession());
- assertNull(manager.createSession(null, null));
- assertNull(manager.createSession("3", null));
+ assertNull(manager.createSession());
+ assertNull(manager.createSession("3"));
assertFalse(sess1.isValid());
assertFalse(sess2.isValid());
@@ -125,7 +125,7 @@
assertNull("session does not exist", sess);
try
{
- sess = mgr.createSession(id, null);
+ sess = mgr.createSession(id);
if (!canCreate)
fail("Could not create session" + id);
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockClusteredManager.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockClusteredManager.java 2010-12-08 22:02:30 UTC (rev 109805)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockClusteredManager.java 2010-12-08 22:06:08 UTC (rev 109806)
@@ -24,7 +24,6 @@
import java.beans.PropertyChangeListener;
import java.io.IOException;
-import java.util.Random;
import javax.servlet.http.HttpServletResponse;
@@ -78,11 +77,11 @@
return newCookieIdSession;
}
- public void changeSessionId(Session session, Random random)
+ public void changeSessionId(Session session)
{
}
- public Session createSession(String s, Random random)
+ public Session createSession(String s)
{
Session session = new MockSession(this);
session.setId(s);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockJBossManager.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockJBossManager.java 2010-12-08 22:02:30 UTC (rev 109805)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockJBossManager.java 2010-12-08 22:06:08 UTC (rev 109806)
@@ -23,7 +23,6 @@
package org.jboss.test.cluster.web.mocks;
import java.io.IOException;
-import java.util.Random;
import org.apache.catalina.Session;
import org.jboss.web.tomcat.service.session.JBossManager;
@@ -72,7 +71,7 @@
// no-op
}
- public void changeSessionId(Session session, Random random)
+ public void changeSessionId(Session session)
{
// no-op
}
@@ -87,7 +86,7 @@
return null;
}
- public Session createSession(String sessionId, Random random)
+ public Session createSession(String sessionId)
{
return null;
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockRequest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockRequest.java 2010-12-08 22:02:30 UTC (rev 109805)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockRequest.java 2010-12-08 22:06:08 UTC (rev 109806)
@@ -75,7 +75,7 @@
if (session == null && create)
{
- session = manager.createSession(requestedSessionId, getRandom());
+ session = manager.createSession(requestedSessionId);
}
if (session != null)
More information about the jboss-cvs-commits
mailing list