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

refactoring

Browse Source
pull/5688/head
Nikita Koksharov 11 months ago
parent ef35c2a63e
commit 8af2cc114b
12 changed files with 88 additions and 95 deletions
Show Stats Download Patch File Download Diff File

30
redisson-helidon/pom.xml
Unescape Escape View File

@ -19,4 +19,34 @@
<module>redisson-helidon-40</module>
</modules>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

20
redisson-helidon/redisson-helidon-20/pom.xml
Unescape Escape View File

@ -96,26 +96,6 @@
<version>2.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

20
redisson-helidon/redisson-helidon-30/pom.xml
Unescape Escape View File

@ -96,26 +96,6 @@
<version>3.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

20
redisson-helidon/redisson-helidon-40/pom.xml
Unescape Escape View File

@ -108,26 +108,6 @@
<version>4.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

10
redisson-helidon/redisson-helidon-40/src/test/java/org/redisson/RedissonExtensionTest.java
Unescape Escape View File

@ -12,6 +12,10 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.redisson.api.RBucket;
import org.redisson.api.RedissonClient;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import static org.assertj.core.api.Assertions.assertThat;
@ -21,8 +25,14 @@ import static org.assertj.core.api.Assertions.assertThat;
*
*/
@ApplicationScoped
@Testcontainers
public class RedissonExtensionTest {
@Container
public static final GenericContainer REDIS = new FixedHostPortGenericContainer("redis:latest")
.withFixedExposedPort(6379, 6379);
@BeforeEach
void startCdiContainer() {
System.setProperty("org.redisson.Redisson.simple.singleServerConfig.address", "redis://127.0.0.1:6379");

14
redisson-micronaut/redisson-micronaut-40/src/test/java/org/redisson/micronaut/RedissonCacheTest.java
Unescape Escape View File

@ -1,12 +1,11 @@
package org.redisson.micronaut;
import com.github.dockerjava.api.model.PortBinding;
import com.github.dockerjava.api.model.Ports;
import io.micronaut.context.ApplicationContext;
import io.micronaut.inject.qualifiers.Qualifiers;
import org.junit.jupiter.api.Test;
import org.redisson.api.RedissonClient;
import org.redisson.micronaut.cache.RedissonSyncCache;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@ -25,15 +24,8 @@ import static org.assertj.core.api.Assertions.assertThat;
public class RedissonCacheTest {
@Container
private static final GenericContainer<?> REDIS =
new GenericContainer<>("redis:latest")
.withExposedPorts(6379)
.withCreateContainerCmdModifier(cmd -> {
cmd.getHostConfig().withPortBindings(
new PortBinding(Ports.Binding.bindPort(6379),
cmd.getExposedPorts()[0]));
});
public static final GenericContainer REDIS = new FixedHostPortGenericContainer("redis:latest")
.withFixedExposedPort(6379, 6379);
@Test
public void testCache() throws InterruptedException {

25
redisson-micronaut/redisson-micronaut-40/src/test/java/org/redisson/micronaut/RedissonSessionTest.java
Unescape Escape View File

@ -1,7 +1,6 @@
package org.redisson.micronaut;
import com.github.dockerjava.api.model.PortBinding;
import com.github.dockerjava.api.model.Ports;
import com.github.dockerjava.api.command.CreateContainerCmd;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.event.ApplicationEventListener;
import io.micronaut.session.event.AbstractSessionEvent;
@ -12,6 +11,7 @@ import org.junit.jupiter.api.Test;
import org.redisson.api.RedissonClient;
import org.redisson.micronaut.session.RedissonSession;
import org.redisson.micronaut.session.RedissonSessionStore;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@ -21,6 +21,7 @@ import java.time.Duration;
import java.time.Instant;
import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.function.Consumer;
import static org.assertj.core.api.Assertions.assertThat;
@ -31,15 +32,11 @@ import static org.assertj.core.api.Assertions.assertThat;
public class RedissonSessionTest {
@Container
private static final GenericContainer<?> REDIS =
new GenericContainer<>("redis:latest")
.withExposedPorts(6379)
.withCreateContainerCmdModifier(cmd -> {
cmd.withCmd("redis-server", "--notify-keyspace-events", "Egx");
cmd.getHostConfig().withPortBindings(
new PortBinding(Ports.Binding.bindPort(6379),
cmd.getExposedPorts()[0]));
});
public static final GenericContainer REDIS = new FixedHostPortGenericContainer("redis:latest")
.withFixedExposedPort(6380, 6379)
.withCreateContainerCmdModifier((Consumer<CreateContainerCmd>) cmd -> {
cmd.withCmd("redis-server", "--notify-keyspace-events", "Egx");
});
public static class MyObject implements Serializable {
@ -83,7 +80,7 @@ public class RedissonSessionTest {
map.put("micronaut.session.http.redisson.enabled", "true");
map.put("micronaut.session.http.redisson.updateMode", "WRITE_BEHIND");
map.put("redisson.singleServerConfig.address", "redis://127.0.0.1:6379");
map.put("redisson.singleServerConfig.address", "redis://127.0.0.1:6380");
ApplicationContext ac = ApplicationContext.run(map);
RedissonClient rc = ac.getBean(RedissonClient.class);
@ -112,7 +109,7 @@ public class RedissonSessionTest {
Map<String, Object> map = new HashMap<>();
map.put("redisson.threads", "10");
map.put("micronaut.session.http.redisson.enabled", "true");
map.put("redisson.singleServerConfig.address", "redis://127.0.0.1:6379");
map.put("redisson.singleServerConfig.address", "redis://127.0.0.1:6380");
ApplicationContext ac = ApplicationContext.run(map);
RedissonClient rc = ac.getBean(RedissonClient.class);
@ -144,7 +141,7 @@ public class RedissonSessionTest {
Map<String, Object> map = new HashMap<>();
map.put("redisson.threads", "10");
map.put("micronaut.session.http.redisson.enabled", "true");
map.put("redisson.singleServerConfig.address", "redis://127.0.0.1:6379");
map.put("redisson.singleServerConfig.address", "redis://127.0.0.1:6380");
ApplicationContext ac = ApplicationContext.run(map);
RedissonClient rc = ac.getBean(RedissonClient.class);
AppListener listener = ac.getBean(AppListener.class);

6
redisson-mybatis/pom.xml
Unescape Escape View File

@ -69,6 +69,12 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>

10
redisson-mybatis/src/test/java/org/redisson/mybatis/RedissonCacheTest.java
Unescape Escape View File

@ -2,6 +2,10 @@ package org.redisson.mybatis;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import static org.assertj.core.api.Assertions.assertThat;
@ -10,8 +14,14 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Nikita Koksharov
*
*/
@Testcontainers
public class RedissonCacheTest {
@Container
public static final GenericContainer REDIS = new FixedHostPortGenericContainer("redis:latest")
.withFixedExposedPort(6379, 6379);
private RedissonCache cache;
@BeforeEach

5
redisson-quarkus/redisson-quarkus-30/integration-tests/pom.xml
Unescape Escape View File

@ -38,6 +38,11 @@
<artifactId>commons-logging-jboss-logging</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>

10
redisson-quarkus/redisson-quarkus-30/integration-tests/src/test/java/org/redisson/quarkus/client/it/QuarkusRedissonClientResourceTest.java
Unescape Escape View File

@ -7,10 +7,20 @@ import static org.hamcrest.Matchers.is;
import org.junit.jupiter.api.Test;
import io.quarkus.test.junit.QuarkusTest;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@QuarkusTest
@Testcontainers
public class QuarkusRedissonClientResourceTest {
@Container
public static final GenericContainer REDIS = new FixedHostPortGenericContainer("redis:latest")
.withFixedExposedPort(6379, 6379);
@Test
public void testRemoteService() {
given()

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

@ -1,7 +1,5 @@
package org.redisson.tomcat;
import com.github.dockerjava.api.model.PortBinding;
import com.github.dockerjava.api.model.Ports;
import org.apache.http.client.fluent.Executor;
import org.apache.http.client.fluent.Request;
import org.apache.http.cookie.Cookie;
@ -10,6 +8,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.redisson.api.RedissonClient;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@ -24,14 +23,8 @@ import java.util.concurrent.TimeUnit;
public class RedissonSessionManagerTest {
@Container
private static final GenericContainer<?> REDIS =
new GenericContainer<>("redis:latest")
.withExposedPorts(6379)
.withCreateContainerCmdModifier(cmd -> {
cmd.getHostConfig().withPortBindings(
new PortBinding(Ports.Binding.bindPort(6379),
cmd.getExposedPorts()[0]));
});
public static final GenericContainer REDIS = new FixedHostPortGenericContainer("redis:latest")
.withFixedExposedPort(6379, 6379);
public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][] {

Write Preview
Loading…
Cancel
Save