Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/78-lset-to-list' into 78-lset-to…
Browse files Browse the repository at this point in the history
…-list

# Conflicts:
#	src/main/java/org/fungover/haze/Command.java
#	src/main/java/org/fungover/haze/Main.java
#	src/test/java/org/fungover/haze/HazeListTest.java
#	src/test/java/org/fungover/haze/integration/HazeIT.java
  • Loading branch information
cmatlak committed Feb 12, 2024
2 parents ea51a23 + 00ebc1e commit b49c0e4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
5 changes: 0 additions & 5 deletions src/main/java/org/fungover/haze/Command.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@ public enum Command {


}





2 changes: 1 addition & 1 deletion src/test/java/org/fungover/haze/HazeListTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,6 @@ void callingLindexWithIndexOutOfBoundsReturnNil(){
void callingLindexWithValidIndexZeroReturnFirstValue(){
hazeList.rPush(List.of("", "key2", "val1", "val2", "val3"));
assertThat(hazeList.lIndex(List.of("", "key2", "0"))).isEqualTo("$4\r\nval1\r\n");

}
}

9 changes: 4 additions & 5 deletions src/test/java/org/fungover/haze/integration/HazeIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import redis.clients.jedis.Protocol;
import redis.clients.jedis.util.SafeEncoder;


import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down Expand Up @@ -107,9 +107,8 @@ void lindexReturnCorrectIndex() {
assertThat(pool.rpush("test", "hej")).isEqualTo(4);
assertThat(pool.lindex("test", 0)).isEqualTo("hello");
assertThat(pool.lindex("test", -1)).isEqualTo("hej");

pool.del("test");
assertThat(pool.exists("right")).isFalse();}
assertThat(pool.exists("right")).isFalse();
}
}



0 comments on commit b49c0e4

Please sign in to comment.