You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/04/06 20:23:26 UTC
svn commit: r1738015 - in /tomcat/trunk/test/org/apache/catalina/session:
TestPersistentManagerIntegration.java TesterStore.java
Author: markt
Date: Wed Apr 6 18:23:26 2016
New Revision: 1738015
URL: http://svn.apache.org/viewvc?rev=1738015&view=rev
Log:
Extract DummyStore into a separate class so it can be easily re-used
Added:
tomcat/trunk/test/org/apache/catalina/session/TesterStore.java (with props)
Modified:
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
Modified: tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java?rev=1738015&r1=1738014&r2=1738015&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java (original)
+++ tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java Wed Apr 6 18:23:26 2016
@@ -16,13 +16,8 @@
*/
package org.apache.catalina.session;
-import java.beans.PropertyChangeListener;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletException;
@@ -38,9 +33,7 @@ import org.junit.Test;
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.Manager;
import org.apache.catalina.Session;
-import org.apache.catalina.Store;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -112,7 +105,7 @@ public class TestPersistentManagerIntegr
ctx.addServletMapping("/dummy", "DummyServlet");
PersistentManager manager = new PersistentManager();
- DummyStore store = new DummyStore();
+ TesterStore store = new TesterStore();
manager.setStore(store);
manager.setMaxIdleBackup(0);
@@ -144,7 +137,7 @@ public class TestPersistentManagerIntegr
ctx.addServletMapping("/dummy", "DummyServlet");
PersistentManager manager = new PersistentManager();
- DummyStore store = new DummyStore();
+ TesterStore store = new TesterStore();
manager.setStore(store);
manager.setMaxIdleBackup(0);
@@ -176,7 +169,7 @@ public class TestPersistentManagerIntegr
ctx.addServletMapping("/dummy", "DummyServlet");
PersistentManager manager = new PersistentManager();
- DummyStore store = new DummyStore();
+ TesterStore store = new TesterStore();
manager.setStore(store);
manager.setMaxIdleBackup(0);
@@ -245,65 +238,4 @@ public class TestPersistentManagerIntegr
}
}
-
- private static class DummyStore implements Store {
-
- private Manager manager;
- private Map<String, Session> sessions = new HashMap<>();
- private List<String> savedIds = new ArrayList<>();
-
- List<String> getSavedIds() {
- return savedIds;
- }
-
- @Override
- public Manager getManager() {
- return this.manager;
- }
-
- @Override
- public void setManager(Manager manager) {
- this.manager = manager;
- }
-
- @Override
- public int getSize() throws IOException {
- return savedIds.size();
- }
-
- @Override
- public void addPropertyChangeListener(PropertyChangeListener listener) {
- }
-
- @Override
- public String[] keys() throws IOException {
- return new ArrayList<>(sessions.keySet()).toArray(new String[] {});
- }
-
- @Override
- public Session load(String id) throws ClassNotFoundException,
- IOException {
- return sessions.get(id);
- }
-
- @Override
- public void remove(String id) throws IOException {
- sessions.remove(id);
- }
-
- @Override
- public void clear() throws IOException {
- }
-
- @Override
- public void removePropertyChangeListener(PropertyChangeListener listener) {
- }
-
- @Override
- public void save(Session session) throws IOException {
- sessions.put(session.getId(), session);
- savedIds.add(session.getId());
- }
-
- }
}
Added: tomcat/trunk/test/org/apache/catalina/session/TesterStore.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/TesterStore.java?rev=1738015&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/session/TesterStore.java (added)
+++ tomcat/trunk/test/org/apache/catalina/session/TesterStore.java Wed Apr 6 18:23:26 2016
@@ -0,0 +1,74 @@
+package org.apache.catalina.session;
+
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.catalina.Manager;
+import org.apache.catalina.Session;
+import org.apache.catalina.Store;
+
+class TesterStore implements Store {
+
+ private Manager manager;
+ private Map<String, Session> sessions = new HashMap<>();
+ private List<String> savedIds = new ArrayList<>();
+
+ List<String> getSavedIds() {
+ return savedIds;
+ }
+
+ @Override
+ public Manager getManager() {
+ return this.manager;
+ }
+
+ @Override
+ public void setManager(Manager manager) {
+ this.manager = manager;
+ }
+
+ @Override
+ public int getSize() throws IOException {
+ return savedIds.size();
+ }
+
+ @Override
+ public void addPropertyChangeListener(PropertyChangeListener listener) {
+ }
+
+ @Override
+ public String[] keys() throws IOException {
+ return new ArrayList<>(sessions.keySet()).toArray(new String[] {});
+ }
+
+ @Override
+ public Session load(String id) throws ClassNotFoundException,
+ IOException {
+ return sessions.get(id);
+ }
+
+ @Override
+ public void remove(String id) throws IOException {
+ sessions.remove(id);
+ }
+
+ @Override
+ public void clear() throws IOException {
+ }
+
+ @Override
+ public void removePropertyChangeListener(PropertyChangeListener listener) {
+ }
+
+ @Override
+ public void save(Session session) throws IOException {
+ sessions.put(session.getId(), session);
+ savedIds.add(session.getId());
+ }
+
+}
+
Propchange: tomcat/trunk/test/org/apache/catalina/session/TesterStore.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org