Type mismatch errors are now prefixed with WRONGTYPE.

[redis.git] / tests / unit / basic.tcl

diff --git a/tests/unit/basic.tcl b/tests/unit/basic.tcl
index 9d556594f538be412aa057c12276c85fceb6cfb9..86498d1fa53905516e60f1c3115c85b4efd5ccfe 100644 (file)
--- a/tests/unit/basic.tcl
+++ b/tests/unit/basic.tcl
@@ -120,7 +120,19 @@ start_server {tags {"basic"}} {
         r incrby novar 17179869184
     } {34359738368}
 
-    test {INCR fails against key with spaces (no integer encoded)} {
+    test {INCR fails against key with spaces (left)} {
+        r set novar "    11"
+        catch {r incr novar} err
+        format $err
+    } {ERR*}
+
+    test {INCR fails against key with spaces (right)} {
+        r set novar "11    "
+        catch {r incr novar} err
+        format $err
+    } {ERR*}
+
+    test {INCR fails against key with spaces (both)} {
         r set novar "    11    "
         catch {r incr novar} err
         format $err
@@ -131,7 +143,7 @@ start_server {tags {"basic"}} {
         catch {r incr mylist} err
         r rpop mylist
         format $err
-    } {ERR*}
+    } {WRONGTYPE*}
 
     test {DECRBY over 32bit value with over 32bit increment, negative res} {
         r set novar 17179869184
@@ -140,13 +152,15 @@ start_server {tags {"basic"}} {
 
     test {INCRBYFLOAT against non existing key} {
         r del novar
-        list [r incrbyfloat novar 1] [r get novar] [r incrbyfloat novar 0.25] \
-             [r get novar]
+        list    [roundFloat [r incrbyfloat novar 1]] \
+                [roundFloat [r get novar]] \
+                [roundFloat [r incrbyfloat novar 0.25]] \
+                [roundFloat [r get novar]]
     } {1 1 1.25 1.25}
 
     test {INCRBYFLOAT against key originally set with SET} {
         r set novar 1.5
-        r incrbyfloat novar 1.5
+        roundFloat [r incrbyfloat novar 1.5]
     } {3}
 
     test {INCRBYFLOAT over 32bit value} {
@@ -187,7 +201,7 @@ start_server {tags {"basic"}} {
         catch {r incrbyfloat mylist 1.0} err
         r del mylist
         format $err
-    } {ERR*kind*}
+    } {WRONGTYPE*}
 
     test {INCRBYFLOAT does not allow NaN or Infinity} {
         r set foo 0
@@ -201,8 +215,8 @@ start_server {tags {"basic"}} {
 
     test {INCRBYFLOAT decrement} {
         r set foo 1
-        r incrbyfloat foo -1.256
-    } {-0.256}
+        roundFloat [r incrbyfloat foo -1.1]
+    } {-0.1}
 
     test "SETNX target key missing" {
         r del novar
@@ -517,7 +531,7 @@ start_server {tags {"basic"}} {
     test "SETBIT against key with wrong type" {
         r del mykey
         r lpush mykey "foo"
-        assert_error "*wrong kind*" {r setbit mykey 0 1}
+        assert_error "WRONGTYPE*" {r setbit mykey 0 1}
     }
 
     test "SETBIT with out of range bit offset" {
@@ -651,7 +665,7 @@ start_server {tags {"basic"}} {
     test "SETRANGE against key with wrong type" {
         r del mykey
         r lpush mykey "foo"
-        assert_error "*wrong kind*" {r setrange mykey 0 bar}
+        assert_error "WRONGTYPE*" {r setrange mykey 0 bar}
     }
 
     test "SETRANGE with out of range offset" {