Convert common.lua into cjson-misc module

5 files changed, 43 insertions, 35 deletions

diff --git a/tests/bench.lua b/tests/bench.lua
index c81213d..2b5177b 100755
--- a/tests/bench.lua
+++ b/tests/bench.lua
@@ -6,10 +6,9 @@
 --
 -- Mark Pulford <mark@kyne.com.au>
 
-require "common"
 require "socket"
-
 local json = require "cjson"
+local misc = require "cjson-misc"
 
 function benchmark(tests, seconds, rep)
     local function bench(func, iter)
@@ -54,7 +53,7 @@ function benchmark(tests, seconds, rep)
 end
 
 function bench_file(filename)
-    local data_json = file_load(filename)
+    local data_json = misc.file_load(filename)
     local data_obj = json.decode(data_json)
 
     local function test_encode ()
diff --git a/tests/common.lua b/tests/cjson-misc.lua
index 7472a10..d8bfe5e 100644
--- a/tests/common.lua
+++ b/tests/cjson-misc.lua
@@ -10,7 +10,7 @@ local json = require "cjson"
 -- -1   Not an array
 -- 0    Empty table
 -- >0   Highest index in the array
-function is_array(table)
+local function is_array(table)
     local max = 0
     local count = 0
     for k, v in pairs(table) do
@@ -28,7 +28,9 @@ function is_array(table)
     return max
 end
 
-function serialise_table(value, indent, depth)
+local serialise_value
+
+local function serialise_table(value, indent, depth)
     local spacing, spacing2, indent2
     if indent then
         spacing = "\n" .. indent
@@ -91,11 +93,7 @@ function serialise_value(value, indent, depth)
     end
 end
 
-function dump_value(value)
-    print(serialise_value(value))
-end
-
-function file_load(filename)
+local function file_load(filename)
     local file
     if filename == nil then
         file = io.stdin
@@ -119,7 +117,7 @@ function file_load(filename)
     return data
 end
 
-function file_save(filename, data)
+local function file_save(filename, data)
     local file
     if filename == nil then
         file = io.stdout
@@ -136,7 +134,7 @@ function file_save(filename, data)
     end
 end
 
-function compare_values(val1, val2)
+local function compare_values(val1, val2)
     local type1 = type(val1)
     local type2 = type(val2)
     if type1 ~= type2 then
@@ -179,11 +177,11 @@ end
 local test_count_pass = 0
 local test_count_total = 0
 
-function run_test_summary()
+local function run_test_summary()
     return test_count_pass, test_count_total
 end
 
-function run_test(testname, func, input, should_work, output)
+local function run_test(testname, func, input, should_work, output)
     local function status_line(name, status, value)
         local statusmap = { [true] = ":success", [false] = ":error" }
         if status ~= nil then
@@ -216,7 +214,7 @@ function run_test(testname, func, input, should_work, output)
     return correct, result
 end
 
-function run_test_group(testgroup, tests)
+local function run_test_group(testgroup, tests)
     local function run_config(configname, func)
         local success, msg = pcall(func)
         if msg then
@@ -241,4 +239,15 @@ function run_test_group(testgroup, tests)
     end
 end
 
+-- Export functions
+return {
+    serialise_value = serialise_value,
+    file_load = file_load,
+    file_save = file_save,
+    compare_values = compare_values,
+    run_test_summary = run_test_summary,
+    run_test = run_test,
+    run_test_group = run_test_group
+}
+
 -- vi:ai et sw=4 ts=4:
diff --git a/tests/decode.lua b/tests/decode.lua
index 89354cd..18f3fc5 100755
--- a/tests/decode.lua
+++ b/tests/decode.lua
@@ -6,9 +6,9 @@
 -- echo '[ "testing" ]' | ./decode.lua
 -- ./decode.lua test.json
 
-require "common"
 local json = require "cjson"
+local misc = require "cjson-misc"
 
-local json_text = file_load(arg[1])
+local json_text = misc.file_load(arg[1])
 local t = json.decode(json_text)
-print(serialise_value(t))
+print(misc.serialise_value(t))
diff --git a/tests/encode.lua b/tests/encode.lua
index a8d749a..6b767cb 100755
--- a/tests/encode.lua
+++ b/tests/encode.lua
@@ -6,11 +6,11 @@
 -- echo '{ "testing" }' | ./encode.lua
 -- ./encode.lua lua_data.lua
 
-require "common"
 local json = require "cjson"
+local misc = require "cjson-misc"
 
 function get_lua_table(file)
-        local func = loadstring("data = " .. file_load(file))
+        local func = loadstring("data = " .. misc.file_load(file))
         if func == nil then
                 error("Invalid syntax? Lua table required.")
         end
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 @@
 --
 -- Note: The output of this script is easier to read with "less -S"
 
-require "common"
 local json = require "cjson"
+local misc = require "cjson-misc"
 
 local function gen_ascii()
     local chars = {}
@@ -50,14 +50,14 @@ end
 function test_decode_cycle(filename)
     local obj1 = json.decode(file_load(filename))
     local obj2 = json.decode(json.encode(obj1))
-    return compare_values(obj1, obj2)
+    return misc.compare_values(obj1, obj2)
 end
 
 local Inf = math.huge;
 local NaN = math.huge * 0;
 local octets_raw = gen_ascii()
-local octets_escaped = file_load("octets-escaped.dat")
-local utf8_loaded, utf8_raw = pcall(file_load, "utf8.dat")
+local octets_escaped = misc.file_load("octets-escaped.dat")
+local utf8_loaded, utf8_raw = pcall(misc.file_load, "utf8.dat")
 if not utf8_loaded then
     utf8_raw = "Failed to load utf8.dat"
 end
@@ -224,23 +224,23 @@ local locale_tests = {
 
 print(string.format("Testing Lua CJSON version %s\n", json.version))
 
-run_test_group("decode simple value", decode_simple_tests)
-run_test_group("encode simple value", encode_simple_tests)
-run_test_group("decode numeric", decode_numeric_tests)
-run_test_group("encode table", encode_table_tests)
-run_test_group("decode error", decode_error_tests)
-run_test_group("encode error", encode_error_tests)
-run_test_group("escape", escape_tests)
-run_test_group("locale", locale_tests)
+misc.run_test_group("decode simple value", decode_simple_tests)
+misc.run_test_group("encode simple value", encode_simple_tests)
+misc.run_test_group("decode numeric", decode_numeric_tests)
+misc.run_test_group("encode table", encode_table_tests)
+misc.run_test_group("decode error", decode_error_tests)
+misc.run_test_group("encode error", encode_error_tests)
+misc.run_test_group("escape", escape_tests)
+misc.run_test_group("locale", locale_tests)
 
 json.refuse_invalid_numbers(false)
 json.encode_max_depth(20)
 for i = 1, #arg do
-    run_test("decode cycle " .. arg[i], test_decode_cycle, { arg[i] },
-             true, { true })
+    misc.run_test("decode cycle " .. arg[i], test_decode_cycle, { arg[i] },
+                  true, { true })
 end
 
-local pass, total = run_test_summary()
+local pass, total = misc.run_test_summary()
 
 if pass == total then
     print("==> Summary: all tests succeeded")