aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-03-04 22:28:15 +0000
committerMatthew Wild <mwild1@gmail.com>2016-03-04 22:28:15 +0000
commit3e0686f349b7aea1478bf54dc3ec1ab403ab8c2f (patch)
tree3a2a3a3b984030b3f04665ea994437f9c09addf4 /tests
parentae606b2cdfedf41a2b6f8fd5e90fe5ddac3892e4 (diff)
parentdf618247d3fb899b69668dfcc084a154e04c34c6 (diff)
downloadprosody-3e0686f349b7aea1478bf54dc3ec1ab403ab8c2f.tar.gz
prosody-3e0686f349b7aea1478bf54dc3ec1ab403ab8c2f.zip
Merge 0.10->trunk
Diffstat (limited to 'tests')
-rw-r--r--tests/test.lua1
-rw-r--r--tests/test_util_json.lua21
2 files changed, 22 insertions, 0 deletions
diff --git a/tests/test.lua b/tests/test.lua
index 0fcc4907..4172b363 100644
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -18,6 +18,7 @@ function run_all_tests()
dotest "core.s2smanager"
dotest "core.configmanager"
dotest "util.ip"
+ dotest "util.json"
dotest "util.stanza"
dotest "util.sasl.scram"
dotest "util.cache"
diff --git a/tests/test_util_json.lua b/tests/test_util_json.lua
new file mode 100644
index 00000000..2c1a9ce9
--- /dev/null
+++ b/tests/test_util_json.lua
@@ -0,0 +1,21 @@
+
+function encode(encode, json)
+ local function test(f, j, e)
+ if e then
+ assert_equal(f(j), e);
+ end
+ assert_equal(f(j), f(json.decode(f(j))));
+ end
+ test(encode, json.null, "null")
+ test(encode, {}, "{}")
+ test(encode, {a=1});
+ test(encode, {a={1,2,3}});
+ test(encode, {1}, "[1]");
+end
+
+function decode(decode)
+ local empty_array = decode("[]");
+ assert_equal(type(empty_array), "table");
+ assert_equal(#empty_array, 0);
+ assert_equal(next(empty_array), nil);
+end