Kris-10-0 commented on a change in pull request #7319:
URL: https://github.com/apache/geode/pull/7319#discussion_r794119136
##########
File path:
geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/set/AbstractSPopIntegrationTest.java
##########
@@ -52,213 +56,137 @@ public void tearDown() {
}
@Test
- public void givenKeyNotProvided_returnsWrongNumberOfArgumentsError() {
- assertThatThrownBy(() -> jedis.sendCommand("key", Protocol.Command.SPOP))
- .hasMessageContaining("ERR wrong number of arguments for 'spop'
command");
+ public void spopTooFewArgs_returnsError() {
+ assertAtLeastNArgs(jedis, Protocol.Command.SPOP, 1);
}
@Test
- public void givenMoreThanThreeArguments_returnsSyntaxError() {
+ public void spopTooManyArgs_returnsError() {
assertThatThrownBy(
- () -> jedis.sendCommand("key", Protocol.Command.SPOP, "key", "NaN",
"extraArg"))
+ () -> jedis.sendCommand(SET_KEY, Protocol.Command.SPOP, SET_KEY, "5",
"5"))
.hasMessageContaining(ERROR_SYNTAX);
}
@Test
- public void givenCountIsNotAnInteger_returnsNotIntegerError() {
- assertThatThrownBy(() -> jedis.sendCommand("key", Protocol.Command.SPOP,
"key", "NaN"))
+ public void spop_withNonNumericCount_returnsError() {
+ assertThatThrownBy(() -> jedis.sendCommand(SET_KEY, Protocol.Command.SPOP,
SET_KEY, "b"))
.hasMessageContaining(ERROR_VALUE_MUST_BE_POSITIVE);
}
@Test
- public void testSPop() {
- int ENTRIES = 10;
-
- List<String> masterSet = new ArrayList<>();
- for (int i = 0; i < ENTRIES; i++) {
- masterSet.add("master-" + i);
- }
-
- jedis.sadd("master", masterSet.toArray(new String[] {}));
- String poppy = jedis.spop("master");
-
- masterSet.remove(poppy);
-
assertThat(jedis.smembers("master").toArray()).containsExactlyInAnyOrder(masterSet.toArray());
-
- assertThat(jedis.spop("spopnonexistent")).isNull();
+ public void spop_withNegativeCount_returnsError() {
+ assertThatThrownBy(() -> jedis.spop(SET_KEY, -1))
+ .hasMessageContaining(ERROR_VALUE_MUST_BE_POSITIVE);
}
@Test
- public void testSPopAll() {
- int ENTRIES = 10;
-
- List<String> masterSet = new ArrayList<>();
- for (int i = 0; i < ENTRIES; i++) {
- masterSet.add("master-" + i);
- }
-
- jedis.sadd("master", masterSet.toArray(new String[] {}));
- Set<String> popped = jedis.spop("master", ENTRIES);
-
- assertThat(jedis.smembers("master").toArray()).isEmpty();
-
assertThat(popped.toArray()).containsExactlyInAnyOrder(masterSet.toArray());
+ public void spop_withoutCount_withNonExistentSet_returnsNull_setNotCreated()
{
+ assertThat(jedis.spop(NON_EXISTENT_SET_KEY)).isNull();
+ assertThat(jedis.exists(NON_EXISTENT_SET_KEY)).isFalse();
}
@Test
- public void testSPopAllPlusOne() {
- int ENTRIES = 10;
-
- List<String> masterSet = new ArrayList<>();
- for (int i = 0; i < ENTRIES; i++) {
- masterSet.add("master-" + i);
- }
-
- jedis.sadd("master", masterSet.toArray(new String[] {}));
- Set<String> popped = jedis.spop("master", ENTRIES + 1);
+ public void
spop_withoutCount_withExistentSet_returnsOneMember_removesReturnedMemberFromSet()
{
+ jedis.sadd(SET_KEY, SET_MEMBERS);
- assertThat(jedis.smembers("master").toArray()).isEmpty();
-
assertThat(popped.toArray()).containsExactlyInAnyOrder(masterSet.toArray());
+ String result = jedis.spop(SET_KEY);
+ assertThat(result).isIn(Arrays.asList(SET_MEMBERS));
+
assertThat(jedis.smembers(SET_KEY)).doesNotContain(result).isSubsetOf(SET_MEMBERS)
+ .doesNotHaveDuplicates();
Review comment:
If the result is removed from the setMembersList, would the
doesNotContain(result) be a necessary check, since
containsExactlyInAnyOrderElementsOf have to have the same exact members in any
oder.
##########
File path:
geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/set/AbstractSPopIntegrationTest.java
##########
@@ -52,213 +56,137 @@ public void tearDown() {
}
@Test
- public void givenKeyNotProvided_returnsWrongNumberOfArgumentsError() {
- assertThatThrownBy(() -> jedis.sendCommand("key", Protocol.Command.SPOP))
- .hasMessageContaining("ERR wrong number of arguments for 'spop'
command");
+ public void spopTooFewArgs_returnsError() {
+ assertAtLeastNArgs(jedis, Protocol.Command.SPOP, 1);
}
@Test
- public void givenMoreThanThreeArguments_returnsSyntaxError() {
+ public void spopTooManyArgs_returnsError() {
assertThatThrownBy(
- () -> jedis.sendCommand("key", Protocol.Command.SPOP, "key", "NaN",
"extraArg"))
+ () -> jedis.sendCommand(SET_KEY, Protocol.Command.SPOP, SET_KEY, "5",
"5"))
.hasMessageContaining(ERROR_SYNTAX);
}
@Test
- public void givenCountIsNotAnInteger_returnsNotIntegerError() {
- assertThatThrownBy(() -> jedis.sendCommand("key", Protocol.Command.SPOP,
"key", "NaN"))
+ public void spop_withNonNumericCount_returnsError() {
+ assertThatThrownBy(() -> jedis.sendCommand(SET_KEY, Protocol.Command.SPOP,
SET_KEY, "b"))
.hasMessageContaining(ERROR_VALUE_MUST_BE_POSITIVE);
}
@Test
- public void testSPop() {
- int ENTRIES = 10;
-
- List<String> masterSet = new ArrayList<>();
- for (int i = 0; i < ENTRIES; i++) {
- masterSet.add("master-" + i);
- }
-
- jedis.sadd("master", masterSet.toArray(new String[] {}));
- String poppy = jedis.spop("master");
-
- masterSet.remove(poppy);
-
assertThat(jedis.smembers("master").toArray()).containsExactlyInAnyOrder(masterSet.toArray());
-
- assertThat(jedis.spop("spopnonexistent")).isNull();
+ public void spop_withNegativeCount_returnsError() {
+ assertThatThrownBy(() -> jedis.spop(SET_KEY, -1))
+ .hasMessageContaining(ERROR_VALUE_MUST_BE_POSITIVE);
}
@Test
- public void testSPopAll() {
- int ENTRIES = 10;
-
- List<String> masterSet = new ArrayList<>();
- for (int i = 0; i < ENTRIES; i++) {
- masterSet.add("master-" + i);
- }
-
- jedis.sadd("master", masterSet.toArray(new String[] {}));
- Set<String> popped = jedis.spop("master", ENTRIES);
-
- assertThat(jedis.smembers("master").toArray()).isEmpty();
-
assertThat(popped.toArray()).containsExactlyInAnyOrder(masterSet.toArray());
+ public void spop_withoutCount_withNonExistentSet_returnsNull_setNotCreated()
{
+ assertThat(jedis.spop(NON_EXISTENT_SET_KEY)).isNull();
+ assertThat(jedis.exists(NON_EXISTENT_SET_KEY)).isFalse();
}
@Test
- public void testSPopAllPlusOne() {
- int ENTRIES = 10;
-
- List<String> masterSet = new ArrayList<>();
- for (int i = 0; i < ENTRIES; i++) {
- masterSet.add("master-" + i);
- }
-
- jedis.sadd("master", masterSet.toArray(new String[] {}));
- Set<String> popped = jedis.spop("master", ENTRIES + 1);
+ public void
spop_withoutCount_withExistentSet_returnsOneMember_removesReturnedMemberFromSet()
{
+ jedis.sadd(SET_KEY, SET_MEMBERS);
- assertThat(jedis.smembers("master").toArray()).isEmpty();
-
assertThat(popped.toArray()).containsExactlyInAnyOrder(masterSet.toArray());
+ String result = jedis.spop(SET_KEY);
+ assertThat(result).isIn(Arrays.asList(SET_MEMBERS));
+
assertThat(jedis.smembers(SET_KEY)).doesNotContain(result).isSubsetOf(SET_MEMBERS)
+ .doesNotHaveDuplicates();
Review comment:
If the result is removed from the setMembersList, would the
doesNotContain(result) be a necessary check, since
containsExactlyInAnyOrderElementsOf have to have the same exact members in any
oder?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@geode.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
