github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

migration to junit 5

Browse Source
pull/5099/head
Nikita Koksharov 2 years ago
parent 6e668db5d3
commit 066b5f2bb6
5 changed files with 239 additions and 190 deletions
Show Stats Download Patch File Download Diff File

11
redisson-tomcat/pom.xml
Unescape Escape View File

@ -46,11 +46,16 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<version>4.13.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

93
redisson-tomcat/redisson-tomcat-10/src/test/java/org/redisson/tomcat/RedissonSessionManagerTest.java
Unescape Escape View File

@ -4,11 +4,9 @@ import org.apache.http.client.fluent.Executor;
import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Request;
import org.apache.http.cookie.Cookie; import org.apache.http.cookie.Cookie;
import org.apache.http.impl.client.BasicCookieStore; import org.apache.http.impl.client.BasicCookieStore;
import org.junit.Assert; import org.junit.jupiter.api.Assertions;
import org.junit.Before; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.Test; import org.junit.jupiter.params.provider.MethodSource;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.redisson.Redisson; import org.redisson.Redisson;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.redisson.config.Config; import org.redisson.config.Config;
@ -20,10 +18,8 @@ import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@RunWith(Parameterized.class)
public class RedissonSessionManagerTest { public class RedissonSessionManagerTest {
@Parameterized.Parameters(name= "{index} - {0}")
public static Iterable<Object[]> data() { public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][] { return Arrays.asList(new Object[][] {
{"context_memory.xml"}, {"context_memory.xml"},
@ -33,18 +29,16 @@ public class RedissonSessionManagerTest {
}); });
} }
@Parameterized.Parameter(0) private void prepare(String contextName) throws IOException {
public String contextName;
@Before
public void before() throws IOException {
String basePath = "src/test/webapp/META-INF/"; String basePath = "src/test/webapp/META-INF/";
Files.deleteIfExists(Paths.get(basePath + "context.xml")); Files.deleteIfExists(Paths.get(basePath + "context.xml"));
Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml")); Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml"));
} }
@Test @ParameterizedTest
public void testUpdateTwoServers_readValue() throws Exception { @MethodSource("data")
public void testUpdateTwoServers_readValue(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try { try {
@ -68,8 +62,10 @@ public class RedissonSessionManagerTest {
} }
} }
@Test @ParameterizedTest
public void testHttpSessionListener() throws Exception { @MethodSource("data")
public void testHttpSessionListener(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
@ -92,8 +88,8 @@ public class RedissonSessionManagerTest {
Thread.sleep(500); Thread.sleep(500);
Assert.assertEquals(2, TestHttpSessionListener.CREATED_INVOCATION_COUNTER); Assertions.assertEquals(2, TestHttpSessionListener.CREATED_INVOCATION_COUNTER);
Assert.assertEquals(3, TestHttpSessionListener.DESTROYED_INVOCATION_COUNTER); Assertions.assertEquals(3, TestHttpSessionListener.DESTROYED_INVOCATION_COUNTER);
Executor.closeIdleConnections(); Executor.closeIdleConnections();
server1.stop(); server1.stop();
@ -101,8 +97,10 @@ public class RedissonSessionManagerTest {
server3.stop(); server3.stop();
} }
@Test @ParameterizedTest
public void testUpdateTwoServers_twoValues() throws Exception { @MethodSource("data")
public void testUpdateTwoServers_twoValues(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try { try {
@ -129,8 +127,10 @@ public class RedissonSessionManagerTest {
} }
} }
@Test @ParameterizedTest
public void testUpdateTwoServers() throws Exception { @MethodSource("data")
public void testUpdateTwoServers(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
@ -153,8 +153,10 @@ public class RedissonSessionManagerTest {
} }
@Test @ParameterizedTest
public void testExpiration() throws Exception { @MethodSource("data")
public void testExpiration(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
@ -181,8 +183,10 @@ public class RedissonSessionManagerTest {
server2.stop(); server2.stop();
} }
@Test @ParameterizedTest
public void testSwitchServer() throws Exception { @MethodSource("data")
public void testSwitchServer(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -213,8 +217,10 @@ public class RedissonSessionManagerTest {
} }
@Test @ParameterizedTest
public void testWriteReadRemove() throws Exception { @MethodSource("data")
public void testWriteReadRemove(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -229,8 +235,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@Test @ParameterizedTest
public void testRecreate() throws Exception { @MethodSource("data")
public void testRecreate(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -245,8 +253,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@Test @ParameterizedTest
public void testUpdate() throws Exception { @MethodSource("data")
public void testUpdate(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -262,9 +272,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@ParameterizedTest
@Test @MethodSource("data")
public void testInvalidate() throws Exception { public void testInvalidate(String contextName) throws Exception {
prepare(contextName);
File f = Paths.get("").toAbsolutePath().resolve("src/test/webapp/WEB-INF/redisson.yaml").toFile(); File f = Paths.get("").toAbsolutePath().resolve("src/test/webapp/WEB-INF/redisson.yaml").toFile();
Config config = Config.fromYAML(f); Config config = Config.fromYAML(f);
RedissonClient r = Redisson.create(config); RedissonClient r = Redisson.create(config);
@ -295,37 +306,37 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
TimeUnit.SECONDS.sleep(61); TimeUnit.SECONDS.sleep(61);
Assert.assertEquals(0, r.getKeys().count()); Assertions.assertEquals(0, r.getKeys().count());
} }
private void write(int port, Executor executor, String key, String value) throws IOException { private void write(int port, Executor executor, String key, String value) throws IOException {
String url = "http://localhost:" + port + "/myapp/write?key=" + key + "&value=" + value; String url = "http://localhost:" + port + "/myapp/write?key=" + key + "&value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }
private void read(int port, Executor executor, String key, String value) throws IOException { private void read(int port, Executor executor, String key, String value) throws IOException {
String url = "http://localhost:" + port + "/myapp/read?key=" + key; String url = "http://localhost:" + port + "/myapp/read?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals(value, response); Assertions.assertEquals(value, response);
} }
private void remove(Executor executor, String key, String value) throws IOException { private void remove(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/remove?key=" + key; String url = "http://localhost:8080/myapp/remove?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals(value, response); Assertions.assertEquals(value, response);
} }
private void invalidate(Executor executor) throws IOException { private void invalidate(Executor executor) throws IOException {
String url = "http://localhost:8080/myapp/invalidate"; String url = "http://localhost:8080/myapp/invalidate";
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }
private void recreate(Executor executor, String key, String value) throws IOException { private void recreate(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/recreate?key=" + key + "&value=" + value; String url = "http://localhost:8080/myapp/recreate?key=" + key + "&value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }

95
redisson-tomcat/redisson-tomcat-7/src/test/java/org/redisson/tomcat/RedissonSessionManagerTest.java
Unescape Escape View File

@ -4,11 +4,9 @@ import org.apache.http.client.fluent.Executor;
import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Request;
import org.apache.http.cookie.Cookie; import org.apache.http.cookie.Cookie;
import org.apache.http.impl.client.BasicCookieStore; import org.apache.http.impl.client.BasicCookieStore;
import org.junit.Assert; import org.junit.jupiter.api.Assertions;
import org.junit.Before; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.Test; import org.junit.jupiter.params.provider.MethodSource;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.redisson.Redisson; import org.redisson.Redisson;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.redisson.config.Config; import org.redisson.config.Config;
@ -20,10 +18,8 @@ import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@RunWith(Parameterized.class)
public class RedissonSessionManagerTest { public class RedissonSessionManagerTest {
@Parameterized.Parameters(name= "{index} - {0}")
public static Iterable<Object[]> data() { public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][] { return Arrays.asList(new Object[][] {
{"context_memory.xml"}, {"context_memory.xml"},
@ -33,18 +29,16 @@ public class RedissonSessionManagerTest {
}); });
} }
@Parameterized.Parameter(0) private void prepare(String contextName) throws IOException {
public String contextName;
@Before
public void before() throws IOException {
String basePath = "src/test/webapp/META-INF/"; String basePath = "src/test/webapp/META-INF/";
Files.deleteIfExists(Paths.get(basePath + "context.xml")); Files.deleteIfExists(Paths.get(basePath + "context.xml"));
Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml")); Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml"));
} }
@Test @ParameterizedTest
public void testUpdateTwoServers_readValue() throws Exception { @MethodSource("data")
public void testUpdateTwoServers_readValue(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try { try {
@ -68,8 +62,10 @@ public class RedissonSessionManagerTest {
} }
} }
@Test @ParameterizedTest
public void testHttpSessionListener() throws Exception { @MethodSource("data")
public void testHttpSessionListener(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
@ -92,8 +88,8 @@ public class RedissonSessionManagerTest {
Thread.sleep(500); Thread.sleep(500);
Assert.assertEquals(2, TestHttpSessionListener.CREATED_INVOCATION_COUNTER); Assertions.assertEquals(2, TestHttpSessionListener.CREATED_INVOCATION_COUNTER);
Assert.assertEquals(3, TestHttpSessionListener.DESTROYED_INVOCATION_COUNTER); Assertions.assertEquals(3, TestHttpSessionListener.DESTROYED_INVOCATION_COUNTER);
Executor.closeIdleConnections(); Executor.closeIdleConnections();
server1.stop(); server1.stop();
@ -101,8 +97,10 @@ public class RedissonSessionManagerTest {
server3.stop(); server3.stop();
} }
@Test @ParameterizedTest
public void testUpdateTwoServers_twoValues() throws Exception { @MethodSource("data")
public void testUpdateTwoServers_twoValues(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try { try {
@ -129,8 +127,10 @@ public class RedissonSessionManagerTest {
} }
} }
@Test @ParameterizedTest
public void testUpdateTwoServers() throws Exception { @MethodSource("data")
public void testUpdateTwoServers(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
@ -153,8 +153,10 @@ public class RedissonSessionManagerTest {
} }
@Test @ParameterizedTest
public void testExpiration() throws Exception { @MethodSource("data")
public void testExpiration(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
@ -181,8 +183,10 @@ public class RedissonSessionManagerTest {
server2.stop(); server2.stop();
} }
@Test @ParameterizedTest
public void testSwitchServer() throws Exception { @MethodSource("data")
public void testSwitchServer(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -213,8 +217,10 @@ public class RedissonSessionManagerTest {
} }
@Test @ParameterizedTest
public void testWriteReadRemove() throws Exception { @MethodSource("data")
public void testWriteReadRemove(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -229,8 +235,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@Test @ParameterizedTest
public void testRecreate() throws Exception { @MethodSource("data")
public void testRecreate(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -245,8 +253,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@Test @ParameterizedTest
public void testUpdate() throws Exception { @MethodSource("data")
public void testUpdate(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -262,9 +272,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@ParameterizedTest
@Test @MethodSource("data")
public void testInvalidate() throws Exception { public void testInvalidate(String contextName) throws Exception {
prepare(contextName);
File f = Paths.get("").toAbsolutePath().resolve("src/test/webapp/WEB-INF/redisson.yaml").toFile(); File f = Paths.get("").toAbsolutePath().resolve("src/test/webapp/WEB-INF/redisson.yaml").toFile();
Config config = Config.fromYAML(f); Config config = Config.fromYAML(f);
RedissonClient r = Redisson.create(config); RedissonClient r = Redisson.create(config);
@ -294,38 +305,38 @@ public class RedissonSessionManagerTest {
Executor.closeIdleConnections(); Executor.closeIdleConnections();
server.stop(); server.stop();
TimeUnit.SECONDS.sleep(60); TimeUnit.SECONDS.sleep(61);
Assert.assertEquals(0, r.getKeys().count()); Assertions.assertEquals(0, r.getKeys().count());
} }
private void write(int port, Executor executor, String key, String value) throws IOException { private void write(int port, Executor executor, String key, String value) throws IOException {
String url = "http://localhost:" + port + "/myapp/write?key=" + key + "&value=" + value; String url = "http://localhost:" + port + "/myapp/write?key=" + key + "&value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }
private void read(int port, Executor executor, String key, String value) throws IOException { private void read(int port, Executor executor, String key, String value) throws IOException {
String url = "http://localhost:" + port + "/myapp/read?key=" + key; String url = "http://localhost:" + port + "/myapp/read?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals(value, response); Assertions.assertEquals(value, response);
} }
private void remove(Executor executor, String key, String value) throws IOException { private void remove(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/remove?key=" + key; String url = "http://localhost:8080/myapp/remove?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals(value, response); Assertions.assertEquals(value, response);
} }
private void invalidate(Executor executor) throws IOException { private void invalidate(Executor executor) throws IOException {
String url = "http://localhost:8080/myapp/invalidate"; String url = "http://localhost:8080/myapp/invalidate";
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }
private void recreate(Executor executor, String key, String value) throws IOException { private void recreate(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/recreate?key=" + key + "&value=" + value; String url = "http://localhost:8080/myapp/recreate?key=" + key + "&value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }

95
redisson-tomcat/redisson-tomcat-8/src/test/java/org/redisson/tomcat/RedissonSessionManagerTest.java
Unescape Escape View File

@ -4,11 +4,9 @@ import org.apache.http.client.fluent.Executor;
import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Request;
import org.apache.http.cookie.Cookie; import org.apache.http.cookie.Cookie;
import org.apache.http.impl.client.BasicCookieStore; import org.apache.http.impl.client.BasicCookieStore;
import org.junit.Assert; import org.junit.jupiter.api.Assertions;
import org.junit.Before; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.Test; import org.junit.jupiter.params.provider.MethodSource;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.redisson.Redisson; import org.redisson.Redisson;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.redisson.config.Config; import org.redisson.config.Config;
@ -20,10 +18,8 @@ import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@RunWith(Parameterized.class)
public class RedissonSessionManagerTest { public class RedissonSessionManagerTest {
@Parameterized.Parameters(name= "{index} - {0}")
public static Iterable<Object[]> data() { public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][] { return Arrays.asList(new Object[][] {
{"context_memory.xml"}, {"context_memory.xml"},
@ -33,18 +29,16 @@ public class RedissonSessionManagerTest {
}); });
} }
@Parameterized.Parameter(0) private void prepare(String contextName) throws IOException {
public String contextName;
@Before
public void before() throws IOException {
String basePath = "src/test/webapp/META-INF/"; String basePath = "src/test/webapp/META-INF/";
Files.deleteIfExists(Paths.get(basePath + "context.xml")); Files.deleteIfExists(Paths.get(basePath + "context.xml"));
Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml")); Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml"));
} }
@Test @ParameterizedTest
public void testUpdateTwoServers_readValue() throws Exception { @MethodSource("data")
public void testUpdateTwoServers_readValue(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try { try {
@ -68,8 +62,10 @@ public class RedissonSessionManagerTest {
} }
} }
@Test @ParameterizedTest
public void testHttpSessionListener() throws Exception { @MethodSource("data")
public void testHttpSessionListener(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
@ -92,8 +88,8 @@ public class RedissonSessionManagerTest {
Thread.sleep(500); Thread.sleep(500);
Assert.assertEquals(2, TestHttpSessionListener.CREATED_INVOCATION_COUNTER); Assertions.assertEquals(2, TestHttpSessionListener.CREATED_INVOCATION_COUNTER);
Assert.assertEquals(3, TestHttpSessionListener.DESTROYED_INVOCATION_COUNTER); Assertions.assertEquals(3, TestHttpSessionListener.DESTROYED_INVOCATION_COUNTER);
Executor.closeIdleConnections(); Executor.closeIdleConnections();
server1.stop(); server1.stop();
@ -101,8 +97,10 @@ public class RedissonSessionManagerTest {
server3.stop(); server3.stop();
} }
@Test @ParameterizedTest
public void testUpdateTwoServers_twoValues() throws Exception { @MethodSource("data")
public void testUpdateTwoServers_twoValues(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try { try {
@ -129,8 +127,10 @@ public class RedissonSessionManagerTest {
} }
} }
@Test @ParameterizedTest
public void testUpdateTwoServers() throws Exception { @MethodSource("data")
public void testUpdateTwoServers(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
@ -153,8 +153,10 @@ public class RedissonSessionManagerTest {
} }
@Test @ParameterizedTest
public void testExpiration() throws Exception { @MethodSource("data")
public void testExpiration(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
@ -181,8 +183,10 @@ public class RedissonSessionManagerTest {
server2.stop(); server2.stop();
} }
@Test @ParameterizedTest
public void testSwitchServer() throws Exception { @MethodSource("data")
public void testSwitchServer(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -213,8 +217,10 @@ public class RedissonSessionManagerTest {
} }
@Test @ParameterizedTest
public void testWriteReadRemove() throws Exception { @MethodSource("data")
public void testWriteReadRemove(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -229,8 +235,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@Test @ParameterizedTest
public void testRecreate() throws Exception { @MethodSource("data")
public void testRecreate(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -245,8 +253,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@Test @ParameterizedTest
public void testUpdate() throws Exception { @MethodSource("data")
public void testUpdate(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -262,9 +272,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@ParameterizedTest
@Test @MethodSource("data")
public void testInvalidate() throws Exception { public void testInvalidate(String contextName) throws Exception {
prepare(contextName);
File f = Paths.get("").toAbsolutePath().resolve("src/test/webapp/WEB-INF/redisson.yaml").toFile(); File f = Paths.get("").toAbsolutePath().resolve("src/test/webapp/WEB-INF/redisson.yaml").toFile();
Config config = Config.fromYAML(f); Config config = Config.fromYAML(f);
RedissonClient r = Redisson.create(config); RedissonClient r = Redisson.create(config);
@ -294,38 +305,38 @@ public class RedissonSessionManagerTest {
Executor.closeIdleConnections(); Executor.closeIdleConnections();
server.stop(); server.stop();
TimeUnit.SECONDS.sleep(60); TimeUnit.SECONDS.sleep(61);
Assert.assertEquals(0, r.getKeys().count()); Assertions.assertEquals(0, r.getKeys().count());
} }
private void write(int port, Executor executor, String key, String value) throws IOException { private void write(int port, Executor executor, String key, String value) throws IOException {
String url = "http://localhost:" + port + "/myapp/write?key=" + key + "&value=" + value; String url = "http://localhost:" + port + "/myapp/write?key=" + key + "&value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }
private void read(int port, Executor executor, String key, String value) throws IOException { private void read(int port, Executor executor, String key, String value) throws IOException {
String url = "http://localhost:" + port + "/myapp/read?key=" + key; String url = "http://localhost:" + port + "/myapp/read?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals(value, response); Assertions.assertEquals(value, response);
} }
private void remove(Executor executor, String key, String value) throws IOException { private void remove(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/remove?key=" + key; String url = "http://localhost:8080/myapp/remove?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals(value, response); Assertions.assertEquals(value, response);
} }
private void invalidate(Executor executor) throws IOException { private void invalidate(Executor executor) throws IOException {
String url = "http://localhost:8080/myapp/invalidate"; String url = "http://localhost:8080/myapp/invalidate";
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }
private void recreate(Executor executor, String key, String value) throws IOException { private void recreate(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/recreate?key=" + key + "&value=" + value; String url = "http://localhost:8080/myapp/recreate?key=" + key + "&value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }

95
redisson-tomcat/redisson-tomcat-9/src/test/java/org/redisson/tomcat/RedissonSessionManagerTest.java
Unescape Escape View File

@ -4,11 +4,9 @@ import org.apache.http.client.fluent.Executor;
import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Request;
import org.apache.http.cookie.Cookie; import org.apache.http.cookie.Cookie;
import org.apache.http.impl.client.BasicCookieStore; import org.apache.http.impl.client.BasicCookieStore;
import org.junit.Assert; import org.junit.jupiter.api.Assertions;
import org.junit.Before; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.Test; import org.junit.jupiter.params.provider.MethodSource;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.redisson.Redisson; import org.redisson.Redisson;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.redisson.config.Config; import org.redisson.config.Config;
@ -20,10 +18,8 @@ import java.nio.file.Paths;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@RunWith(Parameterized.class)
public class RedissonSessionManagerTest { public class RedissonSessionManagerTest {
@Parameterized.Parameters(name= "{index} - {0}")
public static Iterable<Object[]> data() { public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][] { return Arrays.asList(new Object[][] {
{"context_memory.xml"}, {"context_memory.xml"},
@ -33,18 +29,16 @@ public class RedissonSessionManagerTest {
}); });
} }
@Parameterized.Parameter(0) private void prepare(String contextName) throws IOException {
public String contextName;
@Before
public void before() throws IOException {
String basePath = "src/test/webapp/META-INF/"; String basePath = "src/test/webapp/META-INF/";
Files.deleteIfExists(Paths.get(basePath + "context.xml")); Files.deleteIfExists(Paths.get(basePath + "context.xml"));
Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml")); Files.copy(Paths.get(basePath + contextName), Paths.get(basePath + "context.xml"));
} }
@Test @ParameterizedTest
public void testUpdateTwoServers_readValue() throws Exception { @MethodSource("data")
public void testUpdateTwoServers_readValue(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try { try {
@ -68,8 +62,10 @@ public class RedissonSessionManagerTest {
} }
} }
@Test @ParameterizedTest
public void testHttpSessionListener() throws Exception { @MethodSource("data")
public void testHttpSessionListener(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
@ -92,8 +88,8 @@ public class RedissonSessionManagerTest {
Thread.sleep(500); Thread.sleep(500);
Assert.assertEquals(2, TestHttpSessionListener.CREATED_INVOCATION_COUNTER); Assertions.assertEquals(2, TestHttpSessionListener.CREATED_INVOCATION_COUNTER);
Assert.assertEquals(3, TestHttpSessionListener.DESTROYED_INVOCATION_COUNTER); Assertions.assertEquals(3, TestHttpSessionListener.DESTROYED_INVOCATION_COUNTER);
Executor.closeIdleConnections(); Executor.closeIdleConnections();
server1.stop(); server1.stop();
@ -101,8 +97,10 @@ public class RedissonSessionManagerTest {
server3.stop(); server3.stop();
} }
@Test @ParameterizedTest
public void testUpdateTwoServers_twoValues() throws Exception { @MethodSource("data")
public void testUpdateTwoServers_twoValues(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
try { try {
@ -129,8 +127,10 @@ public class RedissonSessionManagerTest {
} }
} }
@Test @ParameterizedTest
public void testUpdateTwoServers() throws Exception { @MethodSource("data")
public void testUpdateTwoServers(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/"); TomcatServer server2 = new TomcatServer("myapp", 8081, "src/test/");
@ -153,8 +153,10 @@ public class RedissonSessionManagerTest {
} }
@Test @ParameterizedTest
public void testExpiration() throws Exception { @MethodSource("data")
public void testExpiration(String contextName) throws Exception {
prepare(contextName);
TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server1 = new TomcatServer("myapp", 8080, "src/test/");
server1.start(); server1.start();
@ -181,8 +183,10 @@ public class RedissonSessionManagerTest {
server2.stop(); server2.stop();
} }
@Test @ParameterizedTest
public void testSwitchServer() throws Exception { @MethodSource("data")
public void testSwitchServer(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -213,8 +217,10 @@ public class RedissonSessionManagerTest {
} }
@Test @ParameterizedTest
public void testWriteReadRemove() throws Exception { @MethodSource("data")
public void testWriteReadRemove(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -229,8 +235,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@Test @ParameterizedTest
public void testRecreate() throws Exception { @MethodSource("data")
public void testRecreate(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -245,8 +253,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@Test @ParameterizedTest
public void testUpdate() throws Exception { @MethodSource("data")
public void testUpdate(String contextName) throws Exception {
prepare(contextName);
// start the server at http://localhost:8080/myapp // start the server at http://localhost:8080/myapp
TomcatServer server = new TomcatServer("myapp", 8080, "src/test/"); TomcatServer server = new TomcatServer("myapp", 8080, "src/test/");
server.start(); server.start();
@ -262,9 +272,10 @@ public class RedissonSessionManagerTest {
server.stop(); server.stop();
} }
@ParameterizedTest
@Test @MethodSource("data")
public void testInvalidate() throws Exception { public void testInvalidate(String contextName) throws Exception {
prepare(contextName);
File f = Paths.get("").toAbsolutePath().resolve("src/test/webapp/WEB-INF/redisson.yaml").toFile(); File f = Paths.get("").toAbsolutePath().resolve("src/test/webapp/WEB-INF/redisson.yaml").toFile();
Config config = Config.fromYAML(f); Config config = Config.fromYAML(f);
RedissonClient r = Redisson.create(config); RedissonClient r = Redisson.create(config);
@ -294,38 +305,38 @@ public class RedissonSessionManagerTest {
Executor.closeIdleConnections(); Executor.closeIdleConnections();
server.stop(); server.stop();
TimeUnit.SECONDS.sleep(60); TimeUnit.SECONDS.sleep(61);
Assert.assertEquals(0, r.getKeys().count()); Assertions.assertEquals(0, r.getKeys().count());
} }
private void write(int port, Executor executor, String key, String value) throws IOException { private void write(int port, Executor executor, String key, String value) throws IOException {
String url = "http://localhost:" + port + "/myapp/write?key=" + key + "&value=" + value; String url = "http://localhost:" + port + "/myapp/write?key=" + key + "&value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }
private void read(int port, Executor executor, String key, String value) throws IOException { private void read(int port, Executor executor, String key, String value) throws IOException {
String url = "http://localhost:" + port + "/myapp/read?key=" + key; String url = "http://localhost:" + port + "/myapp/read?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals(value, response); Assertions.assertEquals(value, response);
} }
private void remove(Executor executor, String key, String value) throws IOException { private void remove(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/remove?key=" + key; String url = "http://localhost:8080/myapp/remove?key=" + key;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals(value, response); Assertions.assertEquals(value, response);
} }
private void invalidate(Executor executor) throws IOException { private void invalidate(Executor executor) throws IOException {
String url = "http://localhost:8080/myapp/invalidate"; String url = "http://localhost:8080/myapp/invalidate";
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }
private void recreate(Executor executor, String key, String value) throws IOException { private void recreate(Executor executor, String key, String value) throws IOException {
String url = "http://localhost:8080/myapp/recreate?key=" + key + "&value=" + value; String url = "http://localhost:8080/myapp/recreate?key=" + key + "&value=" + value;
String response = executor.execute(Request.Get(url)).returnContent().asString(); String response = executor.execute(Request.Get(url)).returnContent().asString();
Assert.assertEquals("OK", response); Assertions.assertEquals("OK", response);
} }

Write Preview
Loading…
Cancel
Save