GH-1658: Use Custom Prefix for Redis Tests

eclipse-leshan · Jan 20, 2025 · 7aeac15 · 7aeac15
1 parent 388a4d0
commit 7aeac15
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 129 deletions.
diff --git a/...ion-tests/src/test/java/org/eclipse/leshan/integration/tests/RedisMultiEndpointsTest.java b/...ion-tests/src/test/java/org/eclipse/leshan/integration/tests/RedisMultiEndpointsTest.java
@@ -17,24 +17,13 @@
 
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.integration.tests.util.RedisTestUtil;
-import org.eclipse.leshan.server.redis.RedisRegistrationStore;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.util.Pool;
 
 public class RedisMultiEndpointsTest extends MultiEndpointsTest {
 
     @Override
     public LeshanTestServerBuilder givenServerWithTwoEndpoint(Protocol givenProtocol,
             String givenServerEndpointProvider) {
-        LeshanTestServerBuilder builder = super.givenServerWithTwoEndpoint(givenProtocol, givenServerEndpointProvider);
-
-        // Create redis store
-        Pool<Jedis> jedis = RedisTestUtil.createJedisPool();
-        // TODO use custom key when https://github.com/eclipse/leshan/issues/1249 will be available
-        builder.setRegistrationStore(new RedisRegistrationStore(jedis));
-
-        return builder;
+        return super.givenServerWithTwoEndpoint(givenProtocol, givenServerEndpointProvider)
+                .withRedisRegistrationStore();
     }
 }
diff --git a/...ation-tests/src/test/java/org/eclipse/leshan/integration/tests/RedisRegistrationTest.java b/...ation-tests/src/test/java/org/eclipse/leshan/integration/tests/RedisRegistrationTest.java
@@ -17,23 +17,11 @@
 
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.integration.tests.util.RedisTestUtil;
-import org.eclipse.leshan.server.redis.RedisRegistrationStore;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.util.Pool;
 
 public class RedisRegistrationTest extends RegistrationTest {
 
     @Override
     protected LeshanTestServerBuilder givenServerUsing(Protocol givenProtocol) {
-        LeshanTestServerBuilder builder = super.givenServerUsing(givenProtocol);
-
-        // Create redis store
-        Pool<Jedis> jedis = RedisTestUtil.createJedisPool();
-        // TODO use custom key when https://github.com/eclipse/leshan/issues/1249 will be available
-        builder.setRegistrationStore(new RedisRegistrationStore(jedis));
-
-        return builder;
+        return super.givenServerUsing(givenProtocol).withRedisRegistrationStore();
     }
 }
diff --git a/...src/test/java/org/eclipse/leshan/integration/tests/observe/RedisDynamicIPObserveTest.java b/...src/test/java/org/eclipse/leshan/integration/tests/observe/RedisDynamicIPObserveTest.java
@@ -17,23 +17,11 @@
 
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.integration.tests.util.RedisTestUtil;
-import org.eclipse.leshan.server.redis.RedisRegistrationStore;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.util.Pool;
 
 public class RedisDynamicIPObserveTest extends DynamicIPObserveTest {
 
     @Override
     protected LeshanTestServerBuilder givenServerUsing(Protocol givenProtocol) {
-        LeshanTestServerBuilder builder = super.givenServerUsing(givenProtocol);
-
-        // Create redis store
-        Pool<Jedis> jedis = RedisTestUtil.createJedisPool();
-        // TODO use custom key when https://github.com/eclipse/leshan/issues/1249 will be available
-        builder.setRegistrationStore(new RedisRegistrationStore(jedis));
-
-        return builder;
+        return super.givenServerUsing(givenProtocol).withRedisRegistrationStore();
     }
 }
diff --git a/...on-tests/src/test/java/org/eclipse/leshan/integration/tests/observe/RedisObserveTest.java b/...on-tests/src/test/java/org/eclipse/leshan/integration/tests/observe/RedisObserveTest.java
@@ -17,23 +17,11 @@
 
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.integration.tests.util.RedisTestUtil;
-import org.eclipse.leshan.server.redis.RedisRegistrationStore;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.util.Pool;
 
 public class RedisObserveTest extends ObserveTest {
 
     @Override
     protected LeshanTestServerBuilder givenServerUsing(Protocol givenProtocol) {
-        LeshanTestServerBuilder builder = super.givenServerUsing(givenProtocol);
-
-        // Create redis store
-        Pool<Jedis> jedis = RedisTestUtil.createJedisPool();
-        // TODO use custom key when https://github.com/eclipse/leshan/issues/1249 will be available
-        builder.setRegistrationStore(new RedisRegistrationStore(jedis));
-
-        return builder;
+        return super.givenServerUsing(givenProtocol).withRedisRegistrationStore();
     }
 }
diff --git a/...ation-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RedisPskTest.java b/...ation-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RedisPskTest.java
@@ -17,25 +17,11 @@
 
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.integration.tests.util.RedisTestUtil;
-import org.eclipse.leshan.server.redis.RedisSecurityStore;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.util.Pool;
 
 public class RedisPskTest extends PskTest {
 
     @Override
     protected LeshanTestServerBuilder givenServerUsing(Protocol givenProtocol) {
-        LeshanTestServerBuilder builder = super.givenServerUsing(givenProtocol);
-
-        // Create redis store
-        Pool<Jedis> jedis = RedisTestUtil.createJedisPool();
-        // TODO use custom key when https://github.com/eclipse/leshan/issues/1249 will be available
-
-        // TODO should we also use RedisRegistrationStore ?
-        // builder.setRegistrationStore(new RedisRegistrationStore(jedis));
-        builder.setSecurityStore(new RedisSecurityStore(jedis));
-        return builder;
+        return super.givenServerUsing(givenProtocol).withRedisRegistrationStore();
     }
 }
diff --git a/...ation-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RedisRpkTest.java b/...ation-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RedisRpkTest.java
@@ -17,25 +17,11 @@
 
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.integration.tests.util.RedisTestUtil;
-import org.eclipse.leshan.server.redis.RedisSecurityStore;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.util.Pool;
 
 public class RedisRpkTest extends RpkTest {
 
     @Override
     protected LeshanTestServerBuilder givenServerUsing(Protocol givenProtocol) {
-        LeshanTestServerBuilder builder = super.givenServerUsing(givenProtocol);
-
-        // Create redis store
-        Pool<Jedis> jedis = RedisTestUtil.createJedisPool();
-        // TODO use custom key when https://github.com/eclipse/leshan/issues/1249 will be available
-
-        // TODO should we also use RedisRegistrationStore ?
-        // builder.setRegistrationStore(new RedisRegistrationStore(jedis));
-        builder.setSecurityStore(new RedisSecurityStore(jedis));
-        return builder;
+        return super.givenServerUsing(givenProtocol).withRedisRegistrationStore();
     }
 }
diff --git a/...n-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RedisRpkX509Test.java b/...n-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RedisRpkX509Test.java
@@ -17,25 +17,11 @@
 
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.integration.tests.util.RedisTestUtil;
-import org.eclipse.leshan.server.redis.RedisSecurityStore;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.util.Pool;
 
 public class RedisRpkX509Test extends RpkX509Test {
 
     @Override
     protected LeshanTestServerBuilder givenServerUsing(Protocol givenProtocol) {
-        LeshanTestServerBuilder builder = super.givenServerUsing(givenProtocol);
-
-        // Create redis store
-        Pool<Jedis> jedis = RedisTestUtil.createJedisPool();
-        // TODO use custom key when https://github.com/eclipse/leshan/issues/1249 will be available
-
-        // TODO should we also use RedisRegistrationStore ?
-        // builder.setRegistrationStore(new RedisRegistrationStore(jedis));
-        builder.setSecurityStore(new RedisSecurityStore(jedis));
-        return builder;
+        return super.givenServerUsing(givenProtocol).withRedisRegistrationStore();
     }
 }
diff --git a/...s/src/test/java/org/eclipse/leshan/integration/tests/security/RedisSecurityStoreTest.java b/...s/src/test/java/org/eclipse/leshan/integration/tests/security/RedisSecurityStoreTest.java
@@ -17,25 +17,11 @@
 
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.integration.tests.util.RedisTestUtil;
-import org.eclipse.leshan.server.redis.RedisSecurityStore;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.util.Pool;
 
 public class RedisSecurityStoreTest extends SecurityStoreTest {
 
     @Override
     protected LeshanTestServerBuilder givenServerUsing(Protocol givenProtocol) {
-        LeshanTestServerBuilder builder = super.givenServerUsing(givenProtocol);
-
-        // Create redis store
-        Pool<Jedis> jedis = RedisTestUtil.createJedisPool();
-        // TODO use custom key when https://github.com/eclipse/leshan/issues/1249 will be available
-
-        // TODO should we also use RedisRegistrationStore ?
-        // builder.setRegistrationStore(new RedisRegistrationStore(jedis));
-        builder.setSecurityStore(new RedisSecurityStore(jedis));
-        return builder;
+        return super.givenServerUsing(givenProtocol).withRedisRegistrationStore();
     }
 }
diff --git a/...tion-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RedisX509Test.java b/...tion-tests/src/test/java/org/eclipse/leshan/integration/tests/security/RedisX509Test.java
@@ -17,25 +17,11 @@
 
 import org.eclipse.leshan.core.endpoint.Protocol;
 import org.eclipse.leshan.integration.tests.util.LeshanTestServerBuilder;
-import org.eclipse.leshan.integration.tests.util.RedisTestUtil;
-import org.eclipse.leshan.server.redis.RedisSecurityStore;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.util.Pool;
 
 public class RedisX509Test extends X509Test {
 
     @Override
     protected LeshanTestServerBuilder givenServerUsing(Protocol givenProtocol) {
-        LeshanTestServerBuilder builder = super.givenServerUsing(givenProtocol);
-
-        // Create redis store
-        Pool<Jedis> jedis = RedisTestUtil.createJedisPool();
-        // TODO use custom key when https://github.com/eclipse/leshan/issues/1249 will be available
-
-        // TODO should we also use RedisRegistrationStore ?
-        // builder.setRegistrationStore(new RedisRegistrationStore(jedis));
-        builder.setSecurityStore(new RedisSecurityStore(jedis));
-        return builder;
+        return super.givenServerUsing(givenProtocol).withRedisRegistrationStore();
     }
 }
diff --git a/...st/java/org/eclipse/leshan/integration/tests/server/redis/RedisRegistrationStoreTest.java b/...st/java/org/eclipse/leshan/integration/tests/server/redis/RedisRegistrationStoreTest.java
@@ -55,7 +55,6 @@
 import org.eclipse.leshan.server.endpoint.EffectiveEndpointUriProvider;
 import org.eclipse.leshan.server.observation.LwM2mNotificationReceiver;
 import org.eclipse.leshan.server.profile.ClientProfile;
-import org.eclipse.leshan.server.redis.RedisRegistrationStore;
 import org.eclipse.leshan.server.registration.Registration;
 import org.eclipse.leshan.server.registration.RegistrationStore;
 import org.eclipse.leshan.transport.californium.ObserveUtil;
@@ -86,7 +85,7 @@ public class RedisRegistrationStoreTest {
     @BeforeEach
     public void setUp() throws UnknownHostException {
         address = InetAddress.getLocalHost();
-        store = new RedisRegistrationStore(RedisTestUtil.createJedisPool());
+        store = RedisTestUtil.createRedisRegistrationStore();
         observationStore = new LwM2mObservationStore(new EffectiveEndpointUriProvider() {
             @Override
             public EndpointUri getEndpointUri() {

diff --git a/...ests/src/test/java/org/eclipse/leshan/integration/tests/util/LeshanTestServerBuilder.java b/...ests/src/test/java/org/eclipse/leshan/integration/tests/util/LeshanTestServerBuilder.java
@@ -220,6 +220,11 @@ public LeshanTestServerBuilder withUpdateOnSendOperation() {
         return this;
     }
 
+    public LeshanTestServerBuilder withRedisRegistrationStore() {
+        setRegistrationStore(RedisTestUtil.createRedisRegistrationStore());
+        return this;
+    }
+
     protected ServerProtocolProvider getCaliforniumProtocolProvider(Protocol protocol) {
         if (protocol.equals(Protocol.COAP)) {
             return new CoapServerProtocolProvider();

diff --git a/...egration-tests/src/test/java/org/eclipse/leshan/integration/tests/util/RedisTestUtil.java b/...egration-tests/src/test/java/org/eclipse/leshan/integration/tests/util/RedisTestUtil.java
@@ -15,6 +15,8 @@
  *******************************************************************************/
 package org.eclipse.leshan.integration.tests.util;
 
+import org.eclipse.leshan.server.redis.RedisRegistrationStore;
+
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.util.Pool;
@@ -28,4 +30,10 @@ public static Pool<Jedis> createJedisPool() {
             return new JedisPool();
         }
     }
+
+    public static RedisRegistrationStore createRedisRegistrationStore() {
+        return new RedisRegistrationStore.Builder(RedisTestUtil.createJedisPool()) //
+                .setPrefix("LESHAN_TEST_REGSTORE#") //
+                .build();
+    }
 }