[jboss-cvs] JBossAS SVN: r109754 - in trunk/testsuite/src/main/org/jboss/test/cluster: web/mocks and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2010-12-07 10:42:16 -0500 (Tue, 07 Dec 2010)
New Revision: 109754

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/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:
- Update testsuite for Manager API change.

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-07 15:22:27 UTC (rev 109753)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/PersistentStoreSessionCountUnitTestCase.java	2010-12-07 15:42:16 UTC (rev 109754)
@@ -686,7 +686,7 @@
       assertNull("session does not exist", sess);
       try
       {
-         sess = mgr.createSession(id);
+         sess = mgr.createSession(id, null);
          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-07 15:22:27 UTC (rev 109753)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionCountUnitTestCase.java	2010-12-07 15:42:16 UTC (rev 109754)
@@ -799,7 +799,7 @@
       assertNull("session does not exist", sess);
       try
       {
-         sess = mgr.createSession(id);
+         sess = mgr.createSession(id, null);
          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-07 15:22:27 UTC (rev 109753)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/SessionExpirationUnitTestCase.java	2010-12-07 15:42:16 UTC (rev 109754)
@@ -122,7 +122,7 @@
       Session sess = managers[0].findSession(id);
       assertNull("session does not exist", sess);
       
-      sess = managers[0].createSession(id);
+      sess = managers[0].createSession(id, null);
       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-07 15:22:27 UTC (rev 109753)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/StoppedManagerUnitTestCase.java	2010-12-07 15:42:16 UTC (rev 109754)
@@ -106,8 +106,8 @@
       assertNull(manager.findSession("2"));
       assertNull(manager.findSessions());
       assertNull(manager.createEmptySession());
-      assertNull(manager.createSession());
-      assertNull(manager.createSession("3"));
+      assertNull(manager.createSession(null, null));
+      assertNull(manager.createSession("3", null));
       
       assertFalse(sess1.isValid());
       assertFalse(sess2.isValid());
@@ -125,7 +125,7 @@
       assertNull("session does not exist", sess);
       try
       {
-         sess = mgr.createSession(id);
+         sess = mgr.createSession(id, null);
          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-07 15:22:27 UTC (rev 109753)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockClusteredManager.java	2010-12-07 15:42:16 UTC (rev 109754)
@@ -24,6 +24,7 @@
 
 import java.beans.PropertyChangeListener;
 import java.io.IOException;
+import java.util.Random;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -77,11 +78,11 @@
       return newCookieIdSession;
    }
 
-   public void changeSessionId(Session session)
+   public void changeSessionId(Session session, Random random)
    {
    }
 
-   public Session createSession(String s)
+   public Session createSession(String s, Random random)
    {
       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-07 15:22:27 UTC (rev 109753)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockJBossManager.java	2010-12-07 15:42:16 UTC (rev 109754)
@@ -23,6 +23,7 @@
 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;
@@ -71,7 +72,7 @@
       // no-op
    }
 
-   public void changeSessionId(Session session)
+   public void changeSessionId(Session session, Random random)
    {
       // no-op
    }
@@ -86,7 +87,7 @@
       return null;
    }
 
-   public Session createSession(String sessionId)
+   public Session createSession(String sessionId, Random random)
    {
       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-07 15:22:27 UTC (rev 109753)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/web/mocks/MockRequest.java	2010-12-07 15:42:16 UTC (rev 109754)
@@ -75,7 +75,7 @@
          
          if (session == null && create)
          {
-            session = manager.createSession(requestedSessionId);
+            session = manager.createSession(requestedSessionId, getRandom());
          }
          
          if (session != null)