aboutsummaryrefslogtreecommitdiff
path: root/tests/test.lua
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test.lua')
-rwxr-xr-xtests/test.lua30
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/test.lua b/tests/test.lua
index f471289..c860878 100755
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -6,8 +6,8 @@
6-- 6--
7-- Note: The output of this script is easier to read with "less -S" 7-- Note: The output of this script is easier to read with "less -S"
8 8
9require "common"
10local json = require "cjson" 9local json = require "cjson"
10local misc = require "cjson-misc"
11 11
12local function gen_ascii() 12local function gen_ascii()
13 local chars = {} 13 local chars = {}
@@ -50,14 +50,14 @@ end
50function test_decode_cycle(filename) 50function test_decode_cycle(filename)
51 local obj1 = json.decode(file_load(filename)) 51 local obj1 = json.decode(file_load(filename))
52 local obj2 = json.decode(json.encode(obj1)) 52 local obj2 = json.decode(json.encode(obj1))
53 return compare_values(obj1, obj2) 53 return misc.compare_values(obj1, obj2)
54end 54end
55 55
56local Inf = math.huge; 56local Inf = math.huge;
57local NaN = math.huge * 0; 57local NaN = math.huge * 0;
58local octets_raw = gen_ascii() 58local octets_raw = gen_ascii()
59local octets_escaped = file_load("octets-escaped.dat") 59local octets_escaped = misc.file_load("octets-escaped.dat")
60local utf8_loaded, utf8_raw = pcall(file_load, "utf8.dat") 60local utf8_loaded, utf8_raw = pcall(misc.file_load, "utf8.dat")
61if not utf8_loaded then 61if not utf8_loaded then
62 utf8_raw = "Failed to load utf8.dat" 62 utf8_raw = "Failed to load utf8.dat"
63end 63end
@@ -224,23 +224,23 @@ local locale_tests = {
224 224
225print(string.format("Testing Lua CJSON version %s\n", json.version)) 225print(string.format("Testing Lua CJSON version %s\n", json.version))
226 226
227run_test_group("decode simple value", decode_simple_tests) 227misc.run_test_group("decode simple value", decode_simple_tests)
228run_test_group("encode simple value", encode_simple_tests) 228misc.run_test_group("encode simple value", encode_simple_tests)
229run_test_group("decode numeric", decode_numeric_tests) 229misc.run_test_group("decode numeric", decode_numeric_tests)
230run_test_group("encode table", encode_table_tests) 230misc.run_test_group("encode table", encode_table_tests)
231run_test_group("decode error", decode_error_tests) 231misc.run_test_group("decode error", decode_error_tests)
232run_test_group("encode error", encode_error_tests) 232misc.run_test_group("encode error", encode_error_tests)
233run_test_group("escape", escape_tests) 233misc.run_test_group("escape", escape_tests)
234run_test_group("locale", locale_tests) 234misc.run_test_group("locale", locale_tests)
235 235
236json.refuse_invalid_numbers(false) 236json.refuse_invalid_numbers(false)
237json.encode_max_depth(20) 237json.encode_max_depth(20)
238for i = 1, #arg do 238for i = 1, #arg do
239 run_test("decode cycle " .. arg[i], test_decode_cycle, { arg[i] }, 239 misc.run_test("decode cycle " .. arg[i], test_decode_cycle, { arg[i] },
240 true, { true }) 240 true, { true })
241end 241end
242 242
243local pass, total = run_test_summary() 243local pass, total = misc.run_test_summary()
244 244
245if pass == total then 245if pass == total then
246 print("==> Summary: all tests succeeded") 246 print("==> Summary: all tests succeeded")