updates redis to use test container

otaviojava · otaviojava · commit f6c4ed0e60e2 · 2018-10-15T19:42:43.000-03:00
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/DefaultCounterTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/DefaultCounterTest.java
@@ -30,7 +30,7 @@ public class DefaultCounterTest {
 
     @BeforeEach
     public void init() {
-        keyValueEntityManagerFactory = RedisTestUtils.get();
+        keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();
         counter = keyValueEntityManagerFactory.getCounter("counter-redis");
         counter.delete();
     }
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/DefaultSortedSetTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/DefaultSortedSetTest.java
@@ -38,7 +38,7 @@ public class DefaultSortedSetTest {
 
     @BeforeEach
     public void init() {
-        keyValueEntityManagerFactory = RedisTestUtils.get();
+        keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();
         sortedSet = keyValueEntityManagerFactory.getSortedSet("world-cup-2018");
         sortedSet.clear();
     }
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisBucketManagerTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisBucketManagerTest.java
@@ -52,7 +52,7 @@ public class RedisBucketManagerTest {
 
     @BeforeEach
     public void init() {
-        keyValueEntityManagerFactory = RedisTestUtils.get();
+        keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();
         keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager("users-entity");
     }
 
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisListStringTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisListStringTest.java
@@ -39,7 +39,7 @@ public class RedisListStringTest {
 
     @BeforeEach
     public void init() {
-        keyValueEntityManagerFactory = RedisTestUtils.get();
+        keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();
         fruits = keyValueEntityManagerFactory.getList(FRUITS, String.class);
     }
 
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisListTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisListTest.java
@@ -45,7 +45,7 @@ public class RedisListTest {
 
     @BeforeEach
     public void init() {
-        keyValueEntityManagerFactory = RedisTestUtils.get();
+        keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();
         fruits = keyValueEntityManagerFactory.getList(FRUITS, ProductCart.class);
     }
 
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisMapStringTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisMapStringTest.java
@@ -43,7 +43,7 @@ public class RedisMapStringTest {
 
     @BeforeEach
     public void init() {
-        entityManagerFactory = RedisTestUtils.get();
+        entityManagerFactory = RedisTestUtils.INSTANCE.get();
         vertebrates = entityManagerFactory.getMap(BUCKET_NAME, String.class, String.class);
     }
 
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisMapTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisMapTest.java
@@ -42,7 +42,7 @@ public class RedisMapTest {
 
     @BeforeEach
     public void init() {
-        entityManagerFactory = RedisTestUtils.get();
+        entityManagerFactory = RedisTestUtils.INSTANCE.get();
         vertebrates = entityManagerFactory.getMap("vertebrates", String.class, Species.class);
     }
 
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisQueueStringTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisQueueStringTest.java
@@ -35,7 +35,7 @@ public class RedisQueueStringTest {
 
     @BeforeEach
     public void init() {
-        keyValueEntityManagerFactory = RedisTestUtils.get();
+        keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();
         lineBank = keyValueEntityManagerFactory.getQueue("physical-bank-string", String.class);
     }
 
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisQueueTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisQueueTest.java
@@ -35,7 +35,7 @@ public class RedisQueueTest {
 
     @BeforeEach
     public void init() {
-        keyValueEntityManagerFactory = RedisTestUtils.get();
+        keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();
         lineBank = keyValueEntityManagerFactory.getQueue("physical-bank", LineBank.class);
     }
 
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisSetStringTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisSetStringTest.java
@@ -36,7 +36,7 @@ public class RedisSetStringTest {
 
     @BeforeEach
     public void init() {
-        keyValueEntityManagerFactory = RedisTestUtils.get();
+        keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();
         users = keyValueEntityManagerFactory.getSet("social-media-string", String.class);
     }
 
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisSetTest.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisSetTest.java
@@ -40,7 +40,7 @@ public class RedisSetTest {
 
     @BeforeEach
     public void init() {
-        keyValueEntityManagerFactory = RedisTestUtils.get();
+        keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();
         users = keyValueEntityManagerFactory.getSet("social-media", User.class);
     }
 
diff --git a/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisTestUtils.java b/redis-driver/src/test/java/org/jnosql/diana/redis/key/RedisTestUtils.java
@@ -16,11 +16,32 @@
 package org.jnosql.diana.redis.key;
 
 
-public class RedisTestUtils {
+import org.jnosql.diana.api.Settings;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 
-    public static RedisBucketManagerFactory get() {
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+
+public enum RedisTestUtils implements Supplier<RedisBucketManagerFactory> {
+    INSTANCE;
+
+    private GenericContainer redis =
+            new GenericContainer("redis:latest")
+                    .withExposedPorts(6379)
+                    .waitingFor(Wait.defaultWaitStrategy());
+
+    {
+        redis.start();
+    }
+
+    @Override
+    public RedisBucketManagerFactory get() {
         RedisConfiguration configuration = new RedisConfiguration();
-        RedisBucketManagerFactory managerFactory = configuration.get();
-        return managerFactory;
+        Map<String, Object> settings = new HashMap<>();
+        settings.put("redis-master-host", redis.getContainerIpAddress());
+        settings.put("redis-master-port", redis.getFirstMappedPort());
+        return configuration.get(Settings.of(settings));
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class DefaultCounterTest {`
`30`	`30`
`31`	`31`	`@BeforeEach`
`32`	`32`	`public void init() {`
`33`		`- keyValueEntityManagerFactory = RedisTestUtils.get();`
	`33`	`+ keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();`
`34`	`34`	`counter = keyValueEntityManagerFactory.getCounter("counter-redis");`
`35`	`35`	`counter.delete();`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class DefaultSortedSetTest {`
`38`	`38`
`39`	`39`	`@BeforeEach`
`40`	`40`	`public void init() {`
`41`		`- keyValueEntityManagerFactory = RedisTestUtils.get();`
	`41`	`+ keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();`
`42`	`42`	`sortedSet = keyValueEntityManagerFactory.getSortedSet("world-cup-2018");`
`43`	`43`	`sortedSet.clear();`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public class RedisBucketManagerTest {`
`52`	`52`
`53`	`53`	`@BeforeEach`
`54`	`54`	`public void init() {`
`55`		`- keyValueEntityManagerFactory = RedisTestUtils.get();`
	`55`	`+ keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();`
`56`	`56`	`keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager("users-entity");`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public class RedisListStringTest {`
`39`	`39`
`40`	`40`	`@BeforeEach`
`41`	`41`	`public void init() {`
`42`		`- keyValueEntityManagerFactory = RedisTestUtils.get();`
	`42`	`+ keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();`
`43`	`43`	`fruits = keyValueEntityManagerFactory.getList(FRUITS, String.class);`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public class RedisListTest {`
`45`	`45`
`46`	`46`	`@BeforeEach`
`47`	`47`	`public void init() {`
`48`		`- keyValueEntityManagerFactory = RedisTestUtils.get();`
	`48`	`+ keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();`
`49`	`49`	`fruits = keyValueEntityManagerFactory.getList(FRUITS, ProductCart.class);`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public class RedisMapStringTest {`
`43`	`43`
`44`	`44`	`@BeforeEach`
`45`	`45`	`public void init() {`
`46`		`- entityManagerFactory = RedisTestUtils.get();`
	`46`	`+ entityManagerFactory = RedisTestUtils.INSTANCE.get();`
`47`	`47`	`vertebrates = entityManagerFactory.getMap(BUCKET_NAME, String.class, String.class);`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public class RedisMapTest {`
`42`	`42`
`43`	`43`	`@BeforeEach`
`44`	`44`	`public void init() {`
`45`		`- entityManagerFactory = RedisTestUtils.get();`
	`45`	`+ entityManagerFactory = RedisTestUtils.INSTANCE.get();`
`46`	`46`	`vertebrates = entityManagerFactory.getMap("vertebrates", String.class, Species.class);`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class RedisQueueStringTest {`
`35`	`35`
`36`	`36`	`@BeforeEach`
`37`	`37`	`public void init() {`
`38`		`- keyValueEntityManagerFactory = RedisTestUtils.get();`
	`38`	`+ keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();`
`39`	`39`	`lineBank = keyValueEntityManagerFactory.getQueue("physical-bank-string", String.class);`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public class RedisSetStringTest {`
`36`	`36`
`37`	`37`	`@BeforeEach`
`38`	`38`	`public void init() {`
`39`		`- keyValueEntityManagerFactory = RedisTestUtils.get();`
	`39`	`+ keyValueEntityManagerFactory = RedisTestUtils.INSTANCE.get();`
`40`	`40`	`users = keyValueEntityManagerFactory.getSet("social-media-string", String.class);`
`41`	`41`	`}`
`42`	`42`