You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2020/04/22 13:11:35 UTC
[geode] branch develop updated: GEODE-7994: Refactor naming for
Native Redis Acceptance Tests (#4964)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 33a890e GEODE-7994: Refactor naming for Native Redis Acceptance Tests (#4964)
33a890e is described below
commit 33a890e73803618ceb05897ae3de443243c49ae1
Author: Murtuza Boxwala <1m...@gmail.com>
AuthorDate: Wed Apr 22 09:11:11 2020 -0400
GEODE-7994: Refactor naming for Native Redis Acceptance Tests (#4964)
---
...rAcceptanceTest.java => ExpireAtNativeRedisAcceptanceTest.java} | 2 +-
...kerAcceptanceTest.java => ExpireNativeRedisAcceptanceTest.java} | 2 +-
...DockerAcceptanceTest.java => GeoNativeRedisAcceptanceTest.java} | 2 +-
...kerAcceptanceTest.java => HashesNativeRedisAcceptanceTest.java} | 2 +-
...ckerAcceptanceTest.java => ListsNativeRedisAcceptanceTest.java} | 2 +-
...erAcceptanceTest.java => PersistNativeRedisAcceptanceTest.java} | 7 +++----
...erAcceptanceTest.java => PexpireNativeRedisAcceptanceTest.java} | 6 ++----
...kerAcceptanceTest.java => PubSubNativeRedisAcceptanceTest.java} | 2 +-
...kerAcceptanceTest.java => RenameNativeRedisAcceptanceTest.java} | 2 +-
...ockerAcceptanceTest.java => SetsNativeRedisAcceptanceTest.java} | 2 +-
...AcceptanceTest.java => SortedSetNativeRedisAcceptanceTest.java} | 2 +-
...erAcceptanceTest.java => StringsNativeRedisAcceptanceTest.java} | 2 +-
.../java/org/apache/geode/redis/HashesIntegrationTest.java | 1 -
.../java/org/apache/geode/redis/StringsIntegrationTest.java | 1 -
.../org/apache/geode/redis/general/PersistIntegrationTest.java | 1 +
15 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireAtDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireAtNativeRedisAcceptanceTest.java
similarity index 95%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireAtDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireAtNativeRedisAcceptanceTest.java
index 32e2785..4cd3f5b 100644
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireAtDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireAtNativeRedisAcceptanceTest.java
@@ -28,7 +28,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class ExpireAtDockerAcceptanceTest extends ExpireAtIntegrationTest {
+public class ExpireAtNativeRedisAcceptanceTest extends ExpireAtIntegrationTest {
// Docker compose does not work on windows in CI. Ignore this test on windows
// Using a RuleChain to make sure we ignore the test before the rule comes into play
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireNativeRedisAcceptanceTest.java
similarity index 96%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireNativeRedisAcceptanceTest.java
index 03982b8..96c26ce 100644
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ExpireNativeRedisAcceptanceTest.java
@@ -28,7 +28,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class ExpireDockerAcceptanceTest extends ExpireIntegrationTest {
+public class ExpireNativeRedisAcceptanceTest extends ExpireIntegrationTest {
private static GenericContainer redisContainer;
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/GeoDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/GeoNativeRedisAcceptanceTest.java
similarity index 97%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/GeoDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/GeoNativeRedisAcceptanceTest.java
index 462f9b8..6f4ab88 100755
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/GeoDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/GeoNativeRedisAcceptanceTest.java
@@ -27,7 +27,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class GeoDockerAcceptanceTest extends GeoIntegrationTest {
+public class GeoNativeRedisAcceptanceTest extends GeoIntegrationTest {
// Docker compose does not work on windows in CI. Ignore this test on windows
// Using a RuleChain to make sure we ignore the test before the rule comes into play
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/HashesDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/HashesNativeRedisAcceptanceTest.java
similarity index 96%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/HashesDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/HashesNativeRedisAcceptanceTest.java
index f7d84f8..557519b 100755
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/HashesDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/HashesNativeRedisAcceptanceTest.java
@@ -28,7 +28,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class HashesDockerAcceptanceTest extends HashesIntegrationTest {
+public class HashesNativeRedisAcceptanceTest extends HashesIntegrationTest {
// Docker compose does not work on windows in CI. Ignore this test on windows
// Using a RuleChain to make sure we ignore the test before the rule comes into play
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ListsDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ListsNativeRedisAcceptanceTest.java
similarity index 96%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ListsDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ListsNativeRedisAcceptanceTest.java
index 5f76619..a1798c5 100755
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ListsDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/ListsNativeRedisAcceptanceTest.java
@@ -27,7 +27,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class ListsDockerAcceptanceTest extends ListsIntegrationTest {
+public class ListsNativeRedisAcceptanceTest extends ListsIntegrationTest {
// Docker compose does not work on windows in CI. Ignore this test on windows
// Using a RuleChain to make sure we ignore the test before the rule comes into play
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PersistDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PersistNativeRedisAcceptanceTest.java
similarity index 90%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PersistDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PersistNativeRedisAcceptanceTest.java
index 7b4121e..1a22872 100644
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PersistDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PersistNativeRedisAcceptanceTest.java
@@ -28,9 +28,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class PersistDockerAcceptanceTest extends PersistIntegrationTest {
-
- private static GenericContainer redisContainer;
+public class PersistNativeRedisAcceptanceTest extends PersistIntegrationTest {
// Docker compose does not work on windows in CI. Ignore this test on windows
// Using a RuleChain to make sure we ignore the test before the rule comes into play
@@ -39,7 +37,7 @@ public class PersistDockerAcceptanceTest extends PersistIntegrationTest {
@BeforeClass
public static void setUp() {
- redisContainer = new GenericContainer<>("redis:5.0.6").withExposedPorts(6379);
+ GenericContainer redisContainer = new GenericContainer<>("redis:5.0.6").withExposedPorts(6379);
redisContainer.start();
jedis = new Jedis("localhost", redisContainer.getFirstMappedPort(), REDIS_CLIENT_TIMEOUT);
jedis2 = new Jedis("localhost", redisContainer.getFirstMappedPort(), REDIS_CLIENT_TIMEOUT);
@@ -48,6 +46,7 @@ public class PersistDockerAcceptanceTest extends PersistIntegrationTest {
@AfterClass
public static void tearDown() {
jedis.close();
+ jedis2.close();
}
}
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PexpireDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PexpireNativeRedisAcceptanceTest.java
similarity index 89%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PexpireDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PexpireNativeRedisAcceptanceTest.java
index 9c605aa..ec3a875 100644
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PexpireDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PexpireNativeRedisAcceptanceTest.java
@@ -28,9 +28,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class PexpireDockerAcceptanceTest extends PexpireIntegrationTest {
-
- private static GenericContainer redisContainer;
+public class PexpireNativeRedisAcceptanceTest extends PexpireIntegrationTest {
// Docker compose does not work on windows in CI. Ignore this test on windows
// Using a RuleChain to make sure we ignore the test before the rule comes into play
@@ -39,7 +37,7 @@ public class PexpireDockerAcceptanceTest extends PexpireIntegrationTest {
@BeforeClass
public static void setUp() {
- redisContainer = new GenericContainer<>("redis:5.0.6").withExposedPorts(6379);
+ GenericContainer redisContainer = new GenericContainer<>("redis:5.0.6").withExposedPorts(6379);
redisContainer.start();
jedis = new Jedis("localhost", redisContainer.getFirstMappedPort(), REDIS_CLIENT_TIMEOUT);
}
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PubSubDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PubSubNativeRedisAcceptanceTest.java
similarity index 96%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PubSubDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PubSubNativeRedisAcceptanceTest.java
index d132134..e6518ca 100644
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PubSubDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/PubSubNativeRedisAcceptanceTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class PubSubDockerAcceptanceTest extends PubSubIntegrationTest {
+public class PubSubNativeRedisAcceptanceTest extends PubSubIntegrationTest {
private static GenericContainer redisContainer;
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/RenameDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/RenameNativeRedisAcceptanceTest.java
similarity index 96%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/RenameDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/RenameNativeRedisAcceptanceTest.java
index 40df38c..008eef5 100644
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/RenameDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/RenameNativeRedisAcceptanceTest.java
@@ -32,7 +32,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class RenameDockerAcceptanceTest extends RenameIntegrationTest {
+public class RenameNativeRedisAcceptanceTest extends RenameIntegrationTest {
private static GenericContainer redisContainer;
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SetsDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SetsNativeRedisAcceptanceTest.java
similarity index 96%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SetsDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SetsNativeRedisAcceptanceTest.java
index c70579e..f89d5ae 100755
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SetsDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SetsNativeRedisAcceptanceTest.java
@@ -27,7 +27,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class SetsDockerAcceptanceTest extends SetsIntegrationTest {
+public class SetsNativeRedisAcceptanceTest extends SetsIntegrationTest {
// Docker compose does not work on windows in CI. Ignore this test on windows
// Using a RuleChain to make sure we ignore the test before the rule comes into play
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SortedSetsDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SortedSetNativeRedisAcceptanceTest.java
similarity index 95%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SortedSetsDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SortedSetNativeRedisAcceptanceTest.java
index d5f2584..fa591db 100755
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SortedSetsDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/SortedSetNativeRedisAcceptanceTest.java
@@ -26,7 +26,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class SortedSetsDockerAcceptanceTest extends SortedSetsIntegrationTest {
+public class SortedSetNativeRedisAcceptanceTest extends SortedSetsIntegrationTest {
// Docker compose does not work on windows in CI. Ignore this test on windows
// Using a RuleChain to make sure we ignore the test before the rule comes into play
diff --git a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/StringsDockerAcceptanceTest.java b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/StringsNativeRedisAcceptanceTest.java
similarity index 96%
rename from geode-redis/src/acceptanceTest/java/org/apache/geode/redis/StringsDockerAcceptanceTest.java
rename to geode-redis/src/acceptanceTest/java/org/apache/geode/redis/StringsNativeRedisAcceptanceTest.java
index b7a1832..ce4bdd6 100755
--- a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/StringsDockerAcceptanceTest.java
+++ b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/StringsNativeRedisAcceptanceTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.test.junit.categories.RedisTest;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
@Category({RedisTest.class})
-public class StringsDockerAcceptanceTest extends StringsIntegrationTest {
+public class StringsNativeRedisAcceptanceTest extends StringsIntegrationTest {
// Docker compose does not work on windows in CI. Ignore this test on windows
// Using a RuleChain to make sure we ignore the test before the rule comes into play
diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/HashesIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/HashesIntegrationTest.java
index 776d6ee..98f7486 100755
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/HashesIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/HashesIntegrationTest.java
@@ -670,7 +670,6 @@ public class HashesIntegrationTest {
@After
public void flushAll() {
jedis.flushAll();
- jedis2.flushAll();
}
@AfterClass
diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/StringsIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/StringsIntegrationTest.java
index 48a461a..efb1b56 100755
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/StringsIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/StringsIntegrationTest.java
@@ -84,7 +84,6 @@ public class StringsIntegrationTest {
@After
public void flushAll() {
jedis.flushAll();
- jedis2.flushAll();
}
@AfterClass
diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/general/PersistIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/general/PersistIntegrationTest.java
index 2eafcd0..4f0d0fc 100644
--- a/geode-redis/src/integrationTest/java/org/apache/geode/redis/general/PersistIntegrationTest.java
+++ b/geode-redis/src/integrationTest/java/org/apache/geode/redis/general/PersistIntegrationTest.java
@@ -67,6 +67,7 @@ public class PersistIntegrationTest {
@AfterClass
public static void tearDown() {
jedis.close();
+ jedis2.close();
cache.close();
server.shutdown();
}