This is an automated email from the ASF dual-hosted git repository.
ringles pushed a commit to branch
GEODE-9892-Create-Infrastructure-for-Redis-Lists
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to
refs/heads/GEODE-9892-Create-Infrastructure-for-Redis-Lists by this push:
new 362bfb4 Make DUnit tests meaningful
362bfb4 is described below
commit 362bfb4991c21982f0f293518e07a3289c098464
Author: Ray Ingles <[email protected]>
AuthorDate: Tue Jan 11 16:41:10 2022 -0500
Make DUnit tests meaningful
---
.../commands/executor/list/LPopDUnitTest.java | 51 +++++++++-------------
.../commands/executor/list/LPushDUnitTest.java | 6 +--
2 files changed, 24 insertions(+), 33 deletions(-)
diff --git
a/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java
b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java
index 5bb8c33..ad17e12 100644
---
a/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java
+++
b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java
@@ -19,9 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
-import com.sun.org.apache.xml.internal.serializer.utils.SerializerMessages_sv;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -30,7 +28,6 @@ import org.junit.Test;
import redis.clients.jedis.HostAndPort;
import redis.clients.jedis.JedisCluster;
-import org.apache.geode.internal.concurrent.LI;
import org.apache.geode.redis.ConcurrentLoopingThreads;
import org.apache.geode.test.awaitility.GeodeAwaitility;
import org.apache.geode.test.dunit.rules.MemberVM;
@@ -79,39 +76,34 @@ public class LPopDUnitTest {
@Test
public void shouldDistributeDataAmongCluster_thenRemoveHalfOfData() {
-
String key = "key";
- List<String> members = makeElementList(LIST_SIZE, "element1-");
- List<String> halfOfMembers = makeElementList(LIST_SIZE / 2, "element1-");
- List<String> otherHalfOfMembers = new ArrayList<>(members);
- otherHalfOfMembers.removeAll(halfOfMembers);
+ List<String> elements = makeElementList(LIST_SIZE, "element1-");
+ List<String> halfOfElements = makeElementList(LIST_SIZE / 2, "element1-");
- jedis.lpush(key, members.toArray(new String[]{}));
- for (int i = 0; i < halfOfMembers.size(); i++) {
+ jedis.lpush(key, elements.toArray(new String[]{}));
+ for (int i = 0; i < halfOfElements.size(); i++) {
jedis.lpop(key);
}
List<String> result = getAllElements(key);
- assertThat(result.toArray().length).isEqualTo(otherHalfOfMembers.size());
-
assertThat(result.toArray()).containsExactlyInAnyOrder(otherHalfOfMembers.toArray());
-
+ assertThat(result.toArray().length).isEqualTo(halfOfElements.size());
+
assertThat(result.toArray()).containsExactlyInAnyOrder(halfOfElements.toArray());
}
@Test
public void
shouldDistributeDataAmongCluster_thenRemoveDifferentDataFromSameSetConcurrently()
{
-
String key = "key";
- List<String> members1 = makeElementList(LIST_SIZE, "element1-");
- List<String> members2 = makeElementList(LIST_SIZE, "element2-");
+ List<String> elements1 = makeElementList(LIST_SIZE, "element1-");
+ List<String> elements2 = makeElementList(LIST_SIZE, "element2-");
- List<String> allMembers = new ArrayList<>();
- allMembers.addAll(members1);
- allMembers.addAll(members2);
+ List<String> allElements = new ArrayList<>();
+ allElements.addAll(elements1);
+ allElements.addAll(elements2);
- jedis.lpush(key, allMembers.toArray(new String[]{}));
+ jedis.lpush(key, allElements.toArray(new String[]{}));
new ConcurrentLoopingThreads(LIST_SIZE,
(i) -> jedis.lpop(key),
@@ -124,33 +116,32 @@ public class LPopDUnitTest {
@Test
public void
shouldDistributeDataAmongCluster_thenRemoveFromDifferentSetsConcurrently() {
-
String key1 = "key1";
String key2 = "key2";
- List<String> members1 = makeElementList(LIST_SIZE, "element1-");
- List<String> members2 = makeElementList(LIST_SIZE, "element2-");
+ List<String> elements1 = makeElementList(LIST_SIZE, "element1-");
+ List<String> elements2 = makeElementList(LIST_SIZE, "element2-");
- jedis.lpush(key1, members1.toArray(new String[]{}));
- jedis.lpush(key2, members2.toArray(new String[]{}));
+ jedis.lpush(key1, elements1.toArray(new String[]{}));
+ jedis.lpush(key2, elements2.toArray(new String[]{}));
new ConcurrentLoopingThreads(LIST_SIZE,
(i) -> jedis.lpop(key1),
(i) -> jedis.lpop(key2)).run();
- Set<String> results1 = jedis.smembers(key1);
- Set<String> results2 = jedis.smembers(key2);
+ List<String> results1 = getAllElements(key1);
+ List<String> results2 = getAllElements(key2);
assertThat(results1).isEmpty();
assertThat(results2).isEmpty();
}
private List<String> makeElementList(int setSize, String baseString) {
- List<String> members = new ArrayList<>();
+ List<String> elements = new ArrayList<>();
for (int i = 0; i < setSize; i++) {
- members.add(baseString + i);
+ elements.add(baseString + i);
}
- return members;
+ return elements;
}
private List<String> getAllElements(String key) {
diff --git
a/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPushDUnitTest.java
b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPushDUnitTest.java
index 248a51d..91a3432 100644
---
a/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPushDUnitTest.java
+++
b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPushDUnitTest.java
@@ -128,11 +128,11 @@ public class LPushDUnitTest {
}
private List<String> makeElementList(int setSize, String baseString) {
- List<String> members = new ArrayList<>();
+ List<String> elements = new ArrayList<>();
for (int i = 0; i < setSize; i++) {
- members.add(baseString + i);
+ elements.add(baseString + i);
}
- return members;
+ return elements;
}
private List<String> getAllElements(String key) {
