Author: markt
Date: Wed Apr 6 20:10:49 2016
New Revision: 1738042
URL: http://svn.apache.org/viewvc?rev=1738042&view=rev
Log:
Refactor ready for testing the session managers
Added:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
- copied, changed from r1738014,
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TesterStore.java
- copied, changed from r1738015,
tomcat/trunk/test/org/apache/catalina/session/TesterStore.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterHost.java
- copied unchanged from r1738022,
tomcat/trunk/test/org/apache/tomcat/unittest/TesterHost.java
Removed:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 6 20:10:49 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022
Copied:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
(from r1738014,
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java?p2=tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java&p1=tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java&r1=1738014&r2=1738042&rev=1738042&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TestPersistentManagerIntegration.java
Wed Apr 6 20:10:49 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());
- }
-
- }
}
Copied: tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TesterStore.java
(from r1738015, tomcat/trunk/test/org/apache/catalina/session/TesterStore.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TesterStore.java?p2=tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TesterStore.java&p1=tomcat/trunk/test/org/apache/catalina/session/TesterStore.java&r1=1738015&r2=1738042&rev=1738042&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/session/TesterStore.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/session/TesterStore.java Wed
Apr 6 20:10:49 2016
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.catalina.session;
import java.beans.PropertyChangeListener;
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java?rev=1738042&r1=1738041&r2=1738042&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/tomcat/unittest/TesterContext.java Wed
Apr 6 20:10:49 2016
@@ -155,24 +155,26 @@ public class TesterContext implements Co
// NO-OP
}
+ private String name = "/test";
@Override
public String getName() {
- return null;
+ return name;
}
@Override
public void setName(String name) {
- // NO-OP
+ this.name = name;
}
+ private Container parent = null;
@Override
public Container getParent() {
- return null;
+ return parent;
}
@Override
public void setParent(Container container) {
- // NO-OP
+ this.parent = container;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
