Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP move session tests to ee9 before duplicating for ee10

This commit is contained in:
Jan Bartel 2022-05-05 16:47:28 +02:00
parent 6fb717b1b4
commit d1583c166f
29 changed files with 118 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/AbstractSessionDataStoreTest.java
View File

@ -94,7 +94,7 @@ public abstract class AbstractSessionDataStoreTest
/**
* Cannot be a BeforeEach, because this
* BeforeEach is executed before the subclass one, but it
* one relies on BeforeEach behaviour in the subclass!
* relies on BeforeEach behaviour in the subclass!
*/
public void setUp()
{

8
jetty-ee9/test-ee9-sessions/pom.xml
View File

@ -15,10 +15,10 @@
<module>test-ee9-file-sessions</module>
<module>test-ee9-jdbc-sessions</module>
<module>test-ee9-mongodb-sessions</module>
<!-- module>test-ee9-infinispan-sessions</module -->
<!-- module>test-ee9-gcloud-sessions</module -->
<!-- module>test-ee9-memcached-sessions</module -->
<!-- module>test-ee9-hazelcast-sessions</module -->
<module>test-ee9-infinispan-sessions</module>
<module>test-ee9-gcloud-sessions</module>
<module>test-ee9-memcached-sessions</module>
<module>test-ee9-hazelcast-sessions</module>
</modules>
<dependencyManagement>
<dependencies>

7
jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/pom.xml
View File

@ -5,6 +5,7 @@
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>test-ee9-sessions</artifactId>
<version>12.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>test-ee9-gcloud-sessions</artifactId>
<name>Jetty EE9 Tests :: Sessions :: GCloud</name>
@ -29,6 +30,12 @@
<artifactId>jetty-session</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-session</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-webapp</artifactId>

4
jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java
View File

@ -13,15 +13,17 @@
package org.eclipse.jetty.gcloud.session;
import org.eclipse.jetty.session.AbstractClusteredOrphanedSessionTest;
import org.eclipse.jetty.ee9.session.AbstractClusteredOrphanedSessionTest;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.testcontainers.junit.jupiter.Testcontainers;
/**
* ClusteredOrphanedSessionTest
*/
@Disabled
@Testcontainers(disabledWithoutDocker = true)
public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessionTest
{

4
jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java
View File

@ -13,15 +13,17 @@
package org.eclipse.jetty.gcloud.session;
import org.eclipse.jetty.session.AbstractClusteredSessionScavengingTest;
import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.testcontainers.junit.jupiter.Testcontainers;
/**
* ClusteredSessionScavengingTest
*/
@Disabled
@Testcontainers(disabledWithoutDocker = true)
public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest
{

2
jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java
View File

@ -36,7 +36,7 @@ public class GCloudSessionDataStoreTest extends AbstractSessionDataStoreTest
public static GCloudSessionTestSupport __testSupport;
@BeforeAll
public static void setUp() throws Exception
public static void configure() throws Exception
{
__testSupport = new GCloudSessionTestSupport();
__testSupport.setUp();

6
jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java
View File

@ -41,7 +41,7 @@ import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
import org.eclipse.jetty.gcloud.session.GCloudSessionDataStore.EntityDataModel;
import org.eclipse.jetty.session.SessionData;
import org.eclipse.jetty.session.SessionDataStore;
import org.eclipse.jetty.session.SessionHandler;
import org.eclipse.jetty.session.SessionManager;
import org.eclipse.jetty.util.ClassLoadingObjectInputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -98,9 +98,9 @@ public class GCloudSessionTestSupport
}
@Override
public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception
public SessionDataStore getSessionDataStore(SessionManager manager) throws Exception
{
GCloudSessionDataStore ds = (GCloudSessionDataStore)super.getSessionDataStore(handler);
GCloudSessionDataStore ds = (GCloudSessionDataStore)super.getSessionDataStore(manager);
ds.setMaxRetries(GCloudSessionDataStore.DEFAULT_MAX_RETRIES);
ds.setDatastore(_d);
return ds;

5
jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java
View File

@ -13,15 +13,18 @@
package org.eclipse.jetty.gcloud.session;
import org.eclipse.jetty.session.AbstractClusteredInvalidationSessionTest;
import org.eclipse.jetty.ee9.session.AbstractClusteredInvalidationSessionTest;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.testcontainers.junit.jupiter.Testcontainers;
/**
* InvalidationSessionTest
*/
//TODO
@Disabled
@Testcontainers(disabledWithoutDocker = true)
public class InvalidationSessionTest extends AbstractClusteredInvalidationSessionTest
{

7
jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml
View File

@ -5,6 +5,7 @@
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>test-ee9-sessions</artifactId>
<version>12.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>test-ee9-hazelcast-sessions</artifactId>
<name>Jetty EE9 Tests :: Sessions :: Hazelcast</name>
@ -65,6 +66,12 @@
<artifactId>jetty-session</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-session</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-webapp</artifactId>

5
jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java
View File

@ -13,14 +13,17 @@
package org.eclipse.jetty.hazelcast.session;
import org.eclipse.jetty.session.AbstractClusteredOrphanedSessionTest;
import org.eclipse.jetty.ee9.session.AbstractClusteredOrphanedSessionTest;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
/**
* ClusteredOrphanedSessionTest
*/
//TODO
@Disabled
public class ClusteredOrphanedSessionTest
extends AbstractClusteredOrphanedSessionTest
{

5
jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java
View File

@ -13,14 +13,17 @@
package org.eclipse.jetty.hazelcast.session;
import org.eclipse.jetty.session.AbstractClusteredSessionScavengingTest;
import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
/**
* ClusteredSessionScavengingTest
*/
//TODO
@Disabled
public class ClusteredSessionScavengingTest
extends AbstractClusteredSessionScavengingTest
{

5
jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastClusteredInvalidationSessionTest.java
View File

@ -13,11 +13,14 @@
package org.eclipse.jetty.hazelcast.session;
import org.eclipse.jetty.session.AbstractClusteredInvalidationSessionTest;
import org.eclipse.jetty.ee9.session.AbstractClusteredInvalidationSessionTest;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
//TODO
@Disabled
public class HazelcastClusteredInvalidationSessionTest
extends AbstractClusteredInvalidationSessionTest
{

10
jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java
View File

@ -14,8 +14,10 @@
package org.eclipse.jetty.hazelcast.session;
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.session.AbstractSessionDataStoreFactory;
import org.eclipse.jetty.session.AbstractSessionDataStoreTest;
import org.eclipse.jetty.session.DefaultSessionIdManager;
import org.eclipse.jetty.session.SessionContext;
import org.eclipse.jetty.session.SessionData;
import org.eclipse.jetty.session.SessionDataStore;
@ -46,7 +48,7 @@ public class HazelcastSessionDataStoreTest extends AbstractSessionDataStoreTest
}
@BeforeEach
public void setUp()
public void configure()
{
_testHelper = new HazelcastTestHelper();
}
@ -107,13 +109,15 @@ public class HazelcastSessionDataStoreTest extends AbstractSessionDataStoreTest
@Test
public void testLoadSessionFails() throws Exception
{
DefaultSessionIdManager idMgr = new DefaultSessionIdManager(new Server());
// create the SessionDataStore
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/test");
context.getSessionHandler().getSessionManager().setSessionIdManager(idMgr);
SessionDataStoreFactory factory = createSessionDataStoreFactory();
((AbstractSessionDataStoreFactory)factory).setGracePeriodSec(GRACE_PERIOD_SEC);
SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler());
SessionContext sessionContext = new SessionContext("foo", context.getServletContext());
SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler().getSessionManager());
SessionContext sessionContext = new SessionContext(context.getSessionHandler().getSessionManager());
store.initialize(sessionContext);
// persist a session

5
jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java
View File

@ -13,12 +13,15 @@
package org.eclipse.jetty.hazelcast.session.client;
import org.eclipse.jetty.ee9.session.AbstractClusteredOrphanedSessionTest;
import org.eclipse.jetty.hazelcast.session.HazelcastTestHelper;
import org.eclipse.jetty.session.AbstractClusteredOrphanedSessionTest;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
//TODO
@Disabled
public class ClientOrphanedSessionTest
extends AbstractClusteredOrphanedSessionTest
{

5
jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java
View File

@ -13,12 +13,15 @@
package org.eclipse.jetty.hazelcast.session.client;
import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
import org.eclipse.jetty.hazelcast.session.HazelcastTestHelper;
import org.eclipse.jetty.session.AbstractClusteredSessionScavengingTest;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
//TODO
@Disabled
public class ClientSessionScavengingTest
extends AbstractClusteredSessionScavengingTest
{

10
jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/HazelcastSessionDataStoreTest.java
View File

@ -16,8 +16,10 @@ package org.eclipse.jetty.hazelcast.session.client;
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
import org.eclipse.jetty.hazelcast.session.HazelcastSessionDataStore;
import org.eclipse.jetty.hazelcast.session.HazelcastTestHelper;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.session.AbstractSessionDataStoreFactory;
import org.eclipse.jetty.session.AbstractSessionDataStoreTest;
import org.eclipse.jetty.session.DefaultSessionIdManager;
import org.eclipse.jetty.session.SessionContext;
import org.eclipse.jetty.session.SessionData;
import org.eclipse.jetty.session.SessionDataStore;
@ -48,7 +50,7 @@ public class HazelcastSessionDataStoreTest extends AbstractSessionDataStoreTest
}
@BeforeEach
public void setUp()
public void configure()
{
_testHelper = new HazelcastTestHelper();
}
@ -109,13 +111,15 @@ public class HazelcastSessionDataStoreTest extends AbstractSessionDataStoreTest
@Test
public void testLoadSessionFails() throws Exception
{
DefaultSessionIdManager idMgr = new DefaultSessionIdManager(new Server());
// create the SessionDataStore
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/test");
context.getSessionHandler().getSessionManager().setSessionIdManager(idMgr);
SessionDataStoreFactory factory = createSessionDataStoreFactory();
((AbstractSessionDataStoreFactory)factory).setGracePeriodSec(GRACE_PERIOD_SEC);
SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler());
SessionContext sessionContext = new SessionContext("foo", context.getServletContext());
SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler().getSessionManager());
SessionContext sessionContext = new SessionContext(context.getSessionHandler().getSessionManager());
store.initialize(sessionContext);
// persist a session

7
jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml
View File

@ -5,6 +5,7 @@
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>test-ee9-sessions</artifactId>
<version>12.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>test-ee9-infinispan-sessions</artifactId>
<name>Jetty EE9 Tests :: Sessions :: Infinispan</name>
@ -73,6 +74,12 @@
<artifactId>jetty-session</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-session</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>jetty-ee9-webapp</artifactId>

4
jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java
View File

@ -13,16 +13,20 @@
package org.eclipse.jetty.session;
import org.eclipse.jetty.ee9.session.AbstractClusteredOrphanedSessionTest;
import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.extension.ExtendWith;
/**
* ClusteredOrphanedSessionTest
*/
//TODO
@Disabled
@ExtendWith(WorkDirExtension.class)
public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessionTest
{

4
jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSerializedSessionScavengingTest.java
View File

@ -13,17 +13,21 @@
package org.eclipse.jetty.session;
import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
/**
* ClusteredSerializedSessionScavengingTest
*/
//TODO
@Disabled
@ExtendWith(WorkDirExtension.class)
public class ClusteredSerializedSessionScavengingTest extends AbstractClusteredSessionScavengingTest
{

4
jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java
View File

@ -13,17 +13,21 @@
package org.eclipse.jetty.session;
import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
/**
* ClusteredSessionScavengingTest
*/
//TODO
@Disabled
@ExtendWith(WorkDirExtension.class)
public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest
{

2
jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanFileSessionDataStoreTest.java
View File

@ -35,7 +35,7 @@ public class InfinispanFileSessionDataStoreTest extends InfinispanSessionDataSto
}
@BeforeEach
public void setup() throws Exception
public void configure() throws Exception
{
_testSupport = new InfinispanTestSupport();
_testSupport.setUseFileStore(true);

9
jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanSessionDataStoreTest.java
View File

@ -54,7 +54,7 @@ public class InfinispanSessionDataStoreTest extends AbstractSessionDataStoreTest
}
@BeforeEach
public void setup() throws Exception
public void configure() throws Exception
{
_testSupport = new InfinispanTestSupport();
_testSupport.setup(workDir.getEmptyPathDir());
@ -119,14 +119,17 @@ public class InfinispanSessionDataStoreTest extends AbstractSessionDataStoreTest
@Override
public void testLoadSessionFails() throws Exception
{
setUp();
//create the SessionDataStore
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/test");
context.getSessionHandler().getSessionManager().setSessionIdManager(_sessionIdManager);
context.setClassLoader(_contextClassLoader);
SessionDataStoreFactory factory = createSessionDataStoreFactory();
((AbstractSessionDataStoreFactory)factory).setGracePeriodSec(GRACE_PERIOD_SEC);
SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler());
SessionContext sessionContext = new SessionContext("foo", context.getServletContext());
SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler().getSessionManager());
SessionContext sessionContext = new SessionContext(context.getSessionHandler().getSessionManager());
store.initialize(sessionContext);
//persist a session

7
jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/SerializedInfinispanSessionDataStoreTest.java
View File

@ -14,6 +14,7 @@
package org.eclipse.jetty.session;
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.session.infinispan.EmbeddedQueryManager;
import org.eclipse.jetty.session.infinispan.InfinispanSessionData;
import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStore;
@ -116,14 +117,16 @@ public class SerializedInfinispanSessionDataStoreTest extends AbstractSessionDat
@Override
public void testLoadSessionFails() throws Exception
{
DefaultSessionIdManager idMgr = new DefaultSessionIdManager(new Server());
//create the SessionDataStore
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/test");
context.getSessionHandler().getSessionManager().setSessionIdManager(idMgr);
context.setClassLoader(_contextClassLoader);
SessionDataStoreFactory factory = createSessionDataStoreFactory();
((AbstractSessionDataStoreFactory)factory).setGracePeriodSec(GRACE_PERIOD_SEC);
SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler());
SessionContext sessionContext = new SessionContext("foo", context.getServletContext());
SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler().getSessionManager());
SessionContext sessionContext = new SessionContext(context.getSessionHandler().getSessionManager());
store.initialize(sessionContext);
//persist a session

5
jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredInvalidationSessionTest.java
View File

@ -13,17 +13,20 @@
package org.eclipse.jetty.session.remote;
import org.eclipse.jetty.session.AbstractClusteredInvalidationSessionTest;
import org.eclipse.jetty.ee9.session.AbstractClusteredInvalidationSessionTest;
import org.eclipse.jetty.session.LoggingUtil;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.testcontainers.junit.jupiter.Testcontainers;
/**
* InvalidationSessionTest
*/
//TODO
@Disabled
@Testcontainers(disabledWithoutDocker = true)
public class RemoteClusteredInvalidationSessionTest extends AbstractClusteredInvalidationSessionTest
{

5
jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredSessionScavengingTest.java
View File

@ -13,17 +13,20 @@
package org.eclipse.jetty.session.remote;
import org.eclipse.jetty.session.AbstractClusteredSessionScavengingTest;
import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
import org.eclipse.jetty.session.LoggingUtil;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.testcontainers.junit.jupiter.Testcontainers;
/**
* ClusteredSessionScavengingTest
*/
//TODO
@Disabled
@Testcontainers(disabledWithoutDocker = true)
public class RemoteClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest
{

10
jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanSessionDataStoreTest.java
View File

@ -14,8 +14,10 @@
package org.eclipse.jetty.session.remote;
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.session.AbstractSessionDataStoreFactory;
import org.eclipse.jetty.session.AbstractSessionDataStoreTest;
import org.eclipse.jetty.session.DefaultSessionIdManager;
import org.eclipse.jetty.session.LoggingUtil;
import org.eclipse.jetty.session.SessionContext;
import org.eclipse.jetty.session.SessionData;
@ -65,7 +67,7 @@ public class RemoteInfinispanSessionDataStoreTest extends AbstractSessionDataSto
}
@BeforeEach
public void setup() throws Exception
public void configure() throws Exception
{
__testSupport.setup();
}
@ -150,13 +152,15 @@ public class RemoteInfinispanSessionDataStoreTest extends AbstractSessionDataSto
@Override
public void testLoadSessionFails() throws Exception
{
DefaultSessionIdManager idMgr = new DefaultSessionIdManager(new Server());
//create the SessionDataStore
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/test");
context.getSessionHandler().getSessionManager().setSessionIdManager(idMgr);
SessionDataStoreFactory factory = createSessionDataStoreFactory();
((AbstractSessionDataStoreFactory)factory).setGracePeriodSec(GRACE_PERIOD_SEC);
SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler());
SessionContext sessionContext = new SessionContext("foo", context.getServletContext());
SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler().getSessionManager());
SessionContext sessionContext = new SessionContext(context.getSessionHandler().getSessionManager());
store.initialize(sessionContext);
//persist a session

3
jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/pom.xml
View File

@ -5,6 +5,7 @@
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>test-ee9-sessions</artifactId>
<version>12.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>test-ee9-memcached-sessions</artifactId>
<name>Jetty EE9 Tests :: Sessions :: Memcached</name>
@ -40,7 +41,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.tests</groupId>
<groupId>org.eclipse.jetty.ee9</groupId>
<artifactId>test-ee9-sessions-common</artifactId>
<scope>test</scope>
</dependency>

2
jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java
View File

@ -24,6 +24,7 @@ import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
import org.eclipse.jetty.ee9.session.SessionTestSupport;
import org.eclipse.jetty.memcached.sessions.MemcachedTestHelper.MockDataStore;
import org.eclipse.jetty.session.CachingSessionDataStore;
import org.eclipse.jetty.session.DefaultSessionCacheFactory;
@ -31,7 +32,6 @@ import org.eclipse.jetty.session.SessionData;
import org.eclipse.jetty.session.SessionDataMap;
import org.eclipse.jetty.session.SessionDataStore;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.eclipse.jetty.session.SessionTestSupport;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Test;
import org.testcontainers.junit.jupiter.Testcontainers;

4
jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java
View File

@ -29,7 +29,7 @@ import org.eclipse.jetty.session.CachingSessionDataStoreFactory;
import org.eclipse.jetty.session.SessionData;
import org.eclipse.jetty.session.SessionDataStore;
import org.eclipse.jetty.session.SessionDataStoreFactory;
import org.eclipse.jetty.session.SessionHandler;
import org.eclipse.jetty.session.SessionManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
@ -136,7 +136,7 @@ public class MemcachedTestHelper
{
@Override
public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception
public SessionDataStore getSessionDataStore(SessionManager manager) throws Exception
{
return new MockDataStore();
}