From 418ee3fe24150c59c9afa6746aab7f09edcb894c Mon Sep 17 00:00:00 2001
From: Mark Pulford <mark@kyne.com.au>
Date: Thu, 12 Jan 2012 21:28:39 +1030
Subject: Add option to encode invalid numbers as "null"

Deprecate and replace refuse_invalid_numbers() with
encode_invalid_numbers() and decode_invalid_numbers().
---
 tests/test.lua | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/test.lua b/tests/test.lua
index 0434a38..a4ebafe 100755
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -138,22 +138,28 @@ local encode_error_tests = {
     { json.encode, { function () end },
       false, { "Cannot serialise function: type not supported" } },
     function ()
-        json.refuse_invalid_numbers("encode")
-        return 'Setting refuse_invalid_numbers("encode")'
+        json.encode_invalid_numbers(false)
+        return 'Setting encode_invalid_numbers(false)'
     end,
     { json.encode, { NaN },
       false, { "Cannot serialise number: must not be NaN or Inf" } },
     { json.encode, { Inf },
       false, { "Cannot serialise number: must not be NaN or Inf" } },
     function ()
-        json.refuse_invalid_numbers(false)
-        return 'Setting refuse_invalid_numbers(false).'
+        json.encode_invalid_numbers("null")
+        return 'Setting encode_invalid_numbers("null").'
+    end,
+    { json.encode, { NaN }, true, { "null" } },
+    { json.encode, { Inf }, true, { "null" } },
+    function ()
+        json.encode_invalid_numbers(true)
+        return 'Setting encode_invalid_numbers(true).'
     end,
     { json.encode, { NaN }, true, { "nan" } },
     { json.encode, { Inf }, true, { "inf" } },
     function ()
-        json.refuse_invalid_numbers("encode")
-        return 'Setting refuse_invalid_numbers("encode")'
+        json.encode_invalid_numbers(false)
+        return 'Setting encode_invalid_numbers(false)'
     end,
 }
 
@@ -233,7 +239,8 @@ util.run_test_group("encode error", encode_error_tests)
 util.run_test_group("escape", escape_tests)
 util.run_test_group("locale", locale_tests)
 
-json.refuse_invalid_numbers(false)
+json.encode_invalid_numbers(true)
+json.decode_invalid_numbers(true)
 json.encode_max_depth(20)
 for i = 1, #arg do
     util.run_test("decode cycle " .. arg[i], test_decode_cycle, { arg[i] },
-- 
cgit v1.2.3-55-g6feb