1
0
mirror of https://github.com/redis/go-redis.git synced 2025-07-28 06:42:00 +03:00

Fix ZRevRangeByScore signature. Fixes #22.

This commit is contained in:
Vladimir Mihailenco
2014-01-09 10:31:43 +02:00
parent 62e78627c1
commit 3e63a8337d
3 changed files with 70 additions and 47 deletions

View File

@ -2275,24 +2275,41 @@ func (t *RedisTest) TestZRevRangeWithScoresMap(c *C) {
}
func (t *RedisTest) TestZRevRangeByScore(c *C) {
zAdd := t.client.ZAdd("zset", redis.Z{1, "one"})
c.Assert(zAdd.Err(), IsNil)
zAdd = t.client.ZAdd("zset", redis.Z{2, "two"})
c.Assert(zAdd.Err(), IsNil)
zAdd = t.client.ZAdd("zset", redis.Z{3, "three"})
c.Assert(zAdd.Err(), IsNil)
zadd := t.client.ZAdd("zset", redis.Z{1, "one"})
c.Assert(zadd.Err(), IsNil)
zadd = t.client.ZAdd("zset", redis.Z{2, "two"})
c.Assert(zadd.Err(), IsNil)
zadd = t.client.ZAdd("zset", redis.Z{3, "three"})
c.Assert(zadd.Err(), IsNil)
zRevRangeByScore := t.client.ZRevRangeByScore("zset", "+inf", "-inf", 0, 0)
c.Assert(zRevRangeByScore.Err(), IsNil)
c.Assert(zRevRangeByScore.Val(), DeepEquals, []string{"three", "two", "one"})
vals, err := t.client.ZRevRangeByScore(
"zset", redis.ZRangeByScore{Max: "+inf", Min: "-inf"}).Result()
c.Assert(err, IsNil)
c.Assert(vals, DeepEquals, []string{"three", "two", "one"})
zRevRangeByScore = t.client.ZRevRangeByScore("zset", "2", "(1", 0, 0)
c.Assert(zRevRangeByScore.Err(), IsNil)
c.Assert(zRevRangeByScore.Val(), DeepEquals, []string{"two"})
vals, err = t.client.ZRevRangeByScore(
"zset", redis.ZRangeByScore{Max: "2", Min: "(1"}).Result()
c.Assert(err, IsNil)
c.Assert(vals, DeepEquals, []string{"two"})
zRevRangeByScore = t.client.ZRevRangeByScore("zset", "(2", "(1", 0, 0)
c.Assert(zRevRangeByScore.Err(), IsNil)
c.Assert(zRevRangeByScore.Val(), DeepEquals, []string{})
vals, err = t.client.ZRevRangeByScore(
"zset", redis.ZRangeByScore{Max: "(2", Min: "(1"}).Result()
c.Assert(err, IsNil)
c.Assert(vals, DeepEquals, []string{})
}
func (t *RedisTest) TestZRevRangeByScoreWithScores(c *C) {
zadd := t.client.ZAdd("zset", redis.Z{1, "one"})
c.Assert(zadd.Err(), IsNil)
zadd = t.client.ZAdd("zset", redis.Z{2, "two"})
c.Assert(zadd.Err(), IsNil)
zadd = t.client.ZAdd("zset", redis.Z{3, "three"})
c.Assert(zadd.Err(), IsNil)
vals, err := t.client.ZRevRangeByScoreWithScores(
"zset", redis.ZRangeByScore{Max: "+inf", Min: "-inf"}).Result()
c.Assert(err, IsNil)
c.Assert(vals, DeepEquals, []string{"three", "3", "two", "2", "one", "1"})
}
func (t *RedisTest) TestZRevRangeByScoreWithScoresMap(c *C) {
@ -2303,15 +2320,18 @@ func (t *RedisTest) TestZRevRangeByScoreWithScoresMap(c *C) {
zAdd = t.client.ZAdd("zset", redis.Z{3, "three"})
c.Assert(zAdd.Err(), IsNil)
zRevRangeByScore := t.client.ZRevRangeByScoreWithScoresMap("zset", "+inf", "-inf", 0, 0)
zRevRangeByScore := t.client.ZRevRangeByScoreWithScoresMap(
"zset", redis.ZRangeByScore{Max: "+inf", Min: "-inf"})
c.Assert(zRevRangeByScore.Err(), IsNil)
c.Assert(zRevRangeByScore.Val(), DeepEquals, map[string]float64{"three": 3, "two": 2, "one": 1})
zRevRangeByScore = t.client.ZRevRangeByScoreWithScoresMap("zset", "2", "(1", 0, 0)
zRevRangeByScore = t.client.ZRevRangeByScoreWithScoresMap(
"zset", redis.ZRangeByScore{Max: "2", Min: "(1"})
c.Assert(zRevRangeByScore.Err(), IsNil)
c.Assert(zRevRangeByScore.Val(), DeepEquals, map[string]float64{"two": 2})
zRevRangeByScore = t.client.ZRevRangeByScoreWithScoresMap("zset", "(2", "(1", 0, 0)
zRevRangeByScore = t.client.ZRevRangeByScoreWithScoresMap(
"zset", redis.ZRangeByScore{Max: "(2", Min: "(1"})
c.Assert(zRevRangeByScore.Err(), IsNil)
c.Assert(zRevRangeByScore.Val(), DeepEquals, map[string]float64{})
}