From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Simen =?UTF-8?Q?Heggest=C3=B8yl?= Newsgroups: gmane.emacs.bugs Subject: bug#21985: 25.0.50; PATCH] Extend the test suite for json.el Date: Sun, 22 Nov 2015 22:30:19 +0100 Message-ID: <1448227819.17458.0@smtp.gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-C2hVk1h1FxljcOswf6SI" X-Trace: ger.gmane.org 1448227913 15403 80.91.229.3 (22 Nov 2015 21:31:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 22 Nov 2015 21:31:53 +0000 (UTC) Cc: Dmitry Gutov To: 21985@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Nov 22 22:31:37 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1a0cE8-0005Zw-QV for geb-bug-gnu-emacs@m.gmane.org; Sun, 22 Nov 2015 22:31:17 +0100 Original-Received: from localhost ([::1]:57598 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0cE3-0003iD-SK for geb-bug-gnu-emacs@m.gmane.org; Sun, 22 Nov 2015 16:31:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0cDy-0003gG-8Z for bug-gnu-emacs@gnu.org; Sun, 22 Nov 2015 16:31:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0cDu-0000qI-Tv for bug-gnu-emacs@gnu.org; Sun, 22 Nov 2015 16:31:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:58888) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0cDu-0000qE-Pm for bug-gnu-emacs@gnu.org; Sun, 22 Nov 2015 16:31:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1a0cDu-0003fv-FK for bug-gnu-emacs@gnu.org; Sun, 22 Nov 2015 16:31:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Simen =?UTF-8?Q?Heggest=C3=B8yl?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 22 Nov 2015 21:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 21985 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.144822785514113 (code B ref -1); Sun, 22 Nov 2015 21:31:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 22 Nov 2015 21:30:55 +0000 Original-Received: from localhost ([127.0.0.1]:48596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a0cDl-0003fX-Is for submit@debbugs.gnu.org; Sun, 22 Nov 2015 16:30:54 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:52746) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a0cDP-0003eu-Vn for submit@debbugs.gnu.org; Sun, 22 Nov 2015 16:30:51 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0cDN-0000n1-2v for submit@debbugs.gnu.org; Sun, 22 Nov 2015 16:30:31 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:58242) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0cDM-0000mw-Se for submit@debbugs.gnu.org; Sun, 22 Nov 2015 16:30:28 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0cDK-0003di-Js for bug-gnu-emacs@gnu.org; Sun, 22 Nov 2015 16:30:28 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0cDH-0000mK-5l for bug-gnu-emacs@gnu.org; Sun, 22 Nov 2015 16:30:26 -0500 Original-Received: from mail-lf0-x22d.google.com ([2a00:1450:4010:c07::22d]:35240) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0cDG-0000mG-Of for bug-gnu-emacs@gnu.org; Sun, 22 Nov 2015 16:30:23 -0500 Original-Received: by lfdl133 with SMTP id l133so15750899lfd.2 for ; Sun, 22 Nov 2015 13:30:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:subject:to:cc:message-id:mime-version:content-type; bh=XFDig5znshpmacj/BVM9HtWYzwVbATqTuKYVhXNZUMI=; b=pbGuLD/YByNiV8RtFIZsPabIFlDUjinpEPyJFmtGQcn/H4bshNcV98+zZA6p82m+Dh LJ32+YjvRQ44JJqiid+waWvhMkCkema3ttMCbbKeumJxuBe/NoFt8jEFF7thuRkPX0RE lZqMJreMz2A6zluwMxutWVOaeb+i+VEcZzHuLB0Wz4YBXDUWlr7oYid1rILfWi4x88Xs t7sScVbmorexukmKSi5p1bRuw7a7Lwb4fweE6BJPbd6cZu219HMmYrF5eQqzvKk+OwVy hCQMCrciArfF8bO1YhhrGx5P+tmPGX1qVSUaRo1t6Wml7zvALEZzmltd3gOXab58fz0h 8v1A== X-Received: by 10.25.21.151 with SMTP id 23mr7699243lfv.165.1448227821692; Sun, 22 Nov 2015 13:30:21 -0800 (PST) Original-Received: from [192.168.100.5] (cm-84.210.143.4.getinternet.no. [84.210.143.4]) by smtp.gmail.com with ESMTPSA id tp5sm1360106lbb.27.2015.11.22.13.30.20 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Nov 2015 13:30:20 -0800 (PST) X-Mailer: geary/0.10.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:109104 Archived-At: --=-C2hVk1h1FxljcOswf6SI Content-Type: multipart/alternative; boundary="=-rNgtrAANeuHEEEmAN/BT" --=-rNgtrAANeuHEEEmAN/BT Content-Type: text/plain; charset=utf-8; format=flowed Hi, I've tried to strengthen the test suite for json.el a bit. Most of the public functions have now received a corresponding test. I was unsure how to best test `json-encode' without duplicating what the other tests (`test-json-encode-string', `test-json-encode-keyword', and so on) already do test. -- Simen --=-rNgtrAANeuHEEEmAN/BT Content-Type: text/html; charset=utf-8
Hi,

I've tried to strengthen the test suite for json.el a bit. Most of the
public functions have now received a corresponding test.

I was unsure how to best test `json-encode' without duplicating what
the other tests (`test-json-encode-string',
`test-json-encode-keyword', and so on) already do test.

-- Simen

--=-rNgtrAANeuHEEEmAN/BT-- --=-C2hVk1h1FxljcOswf6SI Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Extend-the-test-suite-for-json.el.patch Content-Transfer-Encoding: quoted-printable >From 8eef0bf1c9af5fd1b14a4a6f7f6f37a240122547 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Simen=3D20Heggest=3DC3=3DB8yl?=3D Date: Sat, 14 Nov 2015 17:54:38 +0100 Subject: [PATCH] Extend the test suite for json.el * lisp/json.el (json-plist-p): Clarify docstring. * test/automated/json-tests.el (json-tests--with-temp-buffer): New macro. (test-json-join, test-json-alist-p) (test-json-plist-p, test-json-advance, test-json-peek) (test-json-pop, test-json-skip-whitespace) (test-json-read-keyword, test-json-encode-keyword) (test-json-read-number, test-json-encode-number) (test-json-read-escaped-char, test-json-read-string) (test-json-encode-string, test-json-encode-key) (test-json-new-object, test-json-add-to-object) (test-json-read-object, test-json-encode-list) (test-json-read-array, test-json-encode-array) (test-json-read, test-json-read-from-string): New tests. (json-read-simple-alist): Merged into `test-json-read-object'. (json-encode-string-with-special-chars): Merged into `test-json-encode-string'. (json-read-string-with-special-chars): Split into `test-json-encode-string' and `test-json-read-from-string'. --- lisp/json.el | 2 +- test/automated/json-tests.el | 290 +++++++++++++++++++++++++++++++++++++--= ---- 2 files changed, 252 insertions(+), 40 deletions(-) diff --git a/lisp/json.el b/lisp/json.el index 0214a3e..85827b5 100644 --- a/lisp/json.el +++ b/lisp/json.el @@ -149,7 +149,7 @@ json-alist-p (null list)) =20 (defun json-plist-p (list) - "Non-null if and only if LIST is a plist." + "Non-null if and only if LIST is a plist with keyword keys." (while (consp list) (setq list (if (and (keywordp (car list)) (consp (cdr list))) diff --git a/test/automated/json-tests.el b/test/automated/json-tests.el index 8f0cd6f..6a6a18d 100644 --- a/test/automated/json-tests.el +++ b/test/automated/json-tests.el @@ -22,6 +22,38 @@ (require 'ert) (require 'json) =20 +(defmacro json-tests--with-temp-buffer (content &rest body) + "Create a temporary buffer with CONTENT and evaluate BODY there. +Point is moved to beginning of the buffer." + (declare (indent 1)) + `(with-temp-buffer + (insert ,content) + (goto-char (point-min)) + ,@body)) + +;;; Utilities + +(ert-deftest test-json-join () + (should (equal (json-join '() ", ") "")) + (should (equal (json-join '("a" "b" "c") ", ") "a, b, c"))) + +(ert-deftest test-json-alist-p () + (should (json-alist-p '())) + (should (json-alist-p '((a 1) (b 2) (c 3)))) + (should (json-alist-p '((:a 1) (:b 2) (:c 3)))) + (should (json-alist-p '(("a" 1) ("b" 2) ("c" 3)))) + (should-not (json-alist-p '(:a :b :c))) + (should-not (json-alist-p '(:a 1 :b 2 :c 3))) + (should-not (json-alist-p '((:a 1) (:b 2) 3)))) + +(ert-deftest test-json-plist-p () + (should (json-plist-p '())) + (should (json-plist-p '(:a 1 :b 2 :c 3))) + (should-not (json-plist-p '(a 1 b 2 c 3))) + (should-not (json-plist-p '("a" 1 "b" 2 "c" 3))) + (should-not (json-plist-p '(:a :b :c))) + (should-not (json-plist-p '((:a 1) (:b 2) (:c 3))))) + (ert-deftest test-json-plist-reverse () (should (equal (json--plist-reverse '()) '())) (should (equal (json--plist-reverse '(:a 1)) '(:a 1))) @@ -34,49 +66,32 @@ (should (equal (json--plist-to-alist '(:a 1 :b 2 :c 3)) '((:a . 1) (:b . 2) (:c . 3))))) =20 -(ert-deftest test-json-encode-plist () - (let ((plist '(:a 1 :b 2))) - (should (equal (json-encode plist) "{\"a\":1,\"b\":2}")))) +(ert-deftest test-json-advance () + (json-tests--with-temp-buffer "{ \"a\": 1 }" + (json-advance 0) + (should (=3D (point) (point-min))) + (json-advance 3) + (should (=3D (point) (+ (point-min) 3))))) =20 -(ert-deftest json-encode-simple-alist () - (should (equal (json-encode '((a . 1) - (b . 2))) - "{\"a\":1,\"b\":2}"))) +(ert-deftest test-json-peek () + (json-tests--with-temp-buffer "" + (should (eq (json-peek) :json-eof))) + (json-tests--with-temp-buffer "{ \"a\": 1 }" + (should (equal (json-peek) ?{)))) =20 -(ert-deftest test-json-encode-hash-table () - (let ((hash-table (make-hash-table)) - (json-encoding-object-sort-predicate 'string<)) - (puthash :a 1 hash-table) - (puthash :b 2 hash-table) - (puthash :c 3 hash-table) - (should (equal (json-encode hash-table) - "{\"a\":1,\"b\":2,\"c\":3}")))) +(ert-deftest test-json-pop () + (json-tests--with-temp-buffer "" + (should-error (json-pop) :type 'json-end-of-file)) + (json-tests--with-temp-buffer "{ \"a\": 1 }" + (should (equal (json-pop) ?{)) + (should (=3D (point) (+ (point-min) 1))))) =20 -(ert-deftest test-json-encode-alist-with-sort-predicate () - (let ((alist '((:c . 3) (:a . 1) (:b . 2))) - (json-encoding-object-sort-predicate 'string<)) - (should (equal (json-encode alist) "{\"a\":1,\"b\":2,\"c\":3}")))) +(ert-deftest test-json-skip-whitespace () + (json-tests--with-temp-buffer "\t\r\n\f\b { \"a\": 1 }" + (json-skip-whitespace) + (should (equal (char-after (point)) ?{)))) =20 -(ert-deftest test-json-encode-plist-with-sort-predicate () - (let ((plist '(:c 3 :a 1 :b 2)) - (json-encoding-object-sort-predicate 'string<)) - (should (equal (json-encode plist) "{\"a\":1,\"b\":2,\"c\":3}")))) - -(ert-deftest json-read-simple-alist () - (let ((json-object-type 'alist)) - (should (equal (json-read-from-string "{\"a\": 1, \"b\": 2}") - '((a . 1) - (b . 2)))))) - -(ert-deftest json-encode-string-with-special-chars () - (should (equal (json-encode-string "a\n\fb") - "\"a\\n\\fb\"")) - (should (equal (json-encode-string "\nasd=D1=84=D1=8B=D0=B2\u001f\u007ff= gh\t") - "\"\\nasd=D1=84=D1=8B=D0=B2\\u001f\u007ffgh\\t\""))) - -(ert-deftest json-read-string-with-special-chars () - (should (equal (json-read-from-string "\"\\nasd\\u0444\\u044b\\u0432fgh\= \t\"") - "\nasd=D1=84=D1=8B=D0=B2fgh\t"))) +;;; Paths =20 (ert-deftest test-json-path-to-position-with-objects () (let* ((json-string "{\"foo\": {\"bar\": {\"baz\": \"value\"}}}") @@ -97,5 +112,202 @@ (matched-path (json-path-to-position 5 json-string))) (should (null matched-path)))) =20 +;;; Keywords + +(ert-deftest test-json-read-keyword () + (json-tests--with-temp-buffer "true" + (should (json-read-keyword "true"))) + (json-tests--with-temp-buffer "true" + (should-error + (json-read-keyword "false") :type 'json-unknown-keyword)) + (json-tests--with-temp-buffer "foo" + (should-error + (json-read-keyword "foo") :type 'json-unknown-keyword))) + +(ert-deftest test-json-encode-keyword () + (should (equal (json-encode-keyword t) "true")) + (should (equal (json-encode-keyword json-false) "false")) + (should (equal (json-encode-keyword json-null) "null"))) + +;;; Numbers + +(ert-deftest test-json-read-number () + (json-tests--with-temp-buffer "3" + (should (=3D (json-read-number) 3))) + (json-tests--with-temp-buffer "-5" + (should (=3D (json-read-number) -5))) + (json-tests--with-temp-buffer "123.456" + (should (=3D (json-read-number) 123.456))) + (json-tests--with-temp-buffer "1e3" + (should (=3D (json-read-number) 1e3))) + (json-tests--with-temp-buffer "2e+3" + (should (=3D (json-read-number) 2e3))) + (json-tests--with-temp-buffer "3E3" + (should (=3D (json-read-number) 3e3))) + (json-tests--with-temp-buffer "1e-7" + (should (=3D (json-read-number) 1e-7))) + (json-tests--with-temp-buffer "abc" + (should-error (json-read-number) :type 'json-number-format))) + +(ert-deftest test-json-encode-number () + (should (equal (json-encode-number 3) "3")) + (should (equal (json-encode-number -5) "-5")) + (should (equal (json-encode-number 123.456) "123.456"))) + +;; Strings + +(ert-deftest test-json-read-escaped-char () + (json-tests--with-temp-buffer "\\\"" + (should (equal (json-read-escaped-char) ?\")))) + +(ert-deftest test-json-read-string () + (json-tests--with-temp-buffer "\"foo \\\"bar\\\"\"" + (should (equal (json-read-string) "foo \"bar\""))) + (json-tests--with-temp-buffer "\"abc=CE=B1=CE=B2=CE=B3\"" + (should (equal (json-read-string) "abc=CE=B1=CE=B2=CE=B3"))) + (json-tests--with-temp-buffer "\"\\nasd\\u0444\\u044b\\u0432fgh\\t\"" + (should (equal (json-read-string) "\nasd=D1=84=D1=8B=D0=B2fgh\t"))) + (json-tests--with-temp-buffer "foo" + (should-error (json-read-string) :type 'json-string-format))) + +(ert-deftest test-json-encode-string () + (should (equal (json-encode-string "foo") "\"foo\"")) + (should (equal (json-encode-string "a\n\fb") "\"a\\n\\fb\"")) + (should (equal (json-encode-string "\nasd=D1=84=D1=8B=D0=B2\u001f\u007ff= gh\t") + "\"\\nasd=D1=84=D1=8B=D0=B2\\u001f\u007ffgh\\t\""))) + +(ert-deftest test-json-encode-key () + (should (equal (json-encode-key "foo") "\"foo\"")) + (should (equal (json-encode-key 'foo) "\"foo\"")) + (should (equal (json-encode-key :foo) "\"foo\"")) + (should-error (json-encode-key 5) :type 'json-key-format) + (should-error (json-encode-key ["foo"]) :type 'json-key-format) + (should-error (json-encode-key '("foo")) :type 'json-key-format)) + +;;; Objects + +(ert-deftest test-json-new-object () + (let ((json-object-type 'alist)) + (should (equal (json-new-object) '()))) + (let ((json-object-type 'plist)) + (should (equal (json-new-object) '()))) + (let* ((json-object-type 'hash-table) + (json-object (json-new-object))) + (should (hash-table-p json-object)) + (should (=3D (hash-table-count json-object) 0)))) + +(ert-deftest test-json-add-to-object () + (let* ((json-object-type 'alist) + (json-key-type nil) + (obj (json-new-object))) + (setq obj (json-add-to-object obj "a" 1)) + (setq obj (json-add-to-object obj "b" 2)) + (should (equal (assq 'a obj) '(a . 1))) + (should (equal (assq 'b obj) '(b . 2)))) + (let* ((json-object-type 'plist) + (json-key-type nil) + (obj (json-new-object))) + (setq obj (json-add-to-object obj "a" 1)) + (setq obj (json-add-to-object obj "b" 2)) + (should (=3D (plist-get obj :a) 1)) + (should (=3D (plist-get obj :b) 2))) + (let* ((json-object-type 'hash-table) + (json-key-type nil) + (obj (json-new-object))) + (setq obj (json-add-to-object obj "a" 1)) + (setq obj (json-add-to-object obj "b" 2)) + (should (=3D (gethash "a" obj) 1)) + (should (=3D (gethash "b" obj) 2)))) + +(ert-deftest test-json-read-object () + (json-tests--with-temp-buffer "{ \"a\": 1, \"b\": 2 }" + (let ((json-object-type 'alist)) + (should (equal (json-read-object) '((a . 1) (b . 2)))))) + (json-tests--with-temp-buffer "{ \"a\": 1, \"b\": 2 }" + (let ((json-object-type 'plist)) + (should (equal (json-read-object) '(:a 1 :b 2))))) + (json-tests--with-temp-buffer "{ \"a\": 1, \"b\": 2 }" + (let* ((json-object-type 'hash-table) + (hash-table (json-read-object))) + (should (=3D (gethash "a" hash-table) 1)) + (should (=3D (gethash "b" hash-table) 2)))) + (json-tests--with-temp-buffer "{ \"a\": 1 \"b\": 2 }" + (should-error (json-read-object) :type 'json-object-format))) + +(ert-deftest test-json-encode-hash-table () + (let ((hash-table (make-hash-table)) + (json-encoding-object-sort-predicate 'string<) + (json-encoding-pretty-print nil)) + (puthash :a 1 hash-table) + (puthash :b 2 hash-table) + (puthash :c 3 hash-table) + (should (equal (json-encode hash-table) + "{\"a\":1,\"b\":2,\"c\":3}")))) + +(ert-deftest json-encode-simple-alist () + (let ((json-encoding-pretty-print nil)) + (should (equal (json-encode '((a . 1) (b . 2))) + "{\"a\":1,\"b\":2}")))) + +(ert-deftest test-json-encode-plist () + (let ((plist '(:a 1 :b 2)) + (json-encoding-pretty-print nil)) + (should (equal (json-encode plist) "{\"a\":1,\"b\":2}")))) + +(ert-deftest test-json-encode-plist-with-sort-predicate () + (let ((plist '(:c 3 :a 1 :b 2)) + (json-encoding-object-sort-predicate 'string<) + (json-encoding-pretty-print nil)) + (should (equal (json-encode plist) "{\"a\":1,\"b\":2,\"c\":3}")))) + +(ert-deftest test-json-encode-alist-with-sort-predicate () + (let ((alist '((:c . 3) (:a . 1) (:b . 2))) + (json-encoding-object-sort-predicate 'string<) + (json-encoding-pretty-print nil)) + (should (equal (json-encode alist) "{\"a\":1,\"b\":2,\"c\":3}")))) + +(ert-deftest test-json-encode-list () + (let ((json-encoding-pretty-print nil)) + (should (equal (json-encode-list '(:a 1 :b 2)) + "{\"a\":1,\"b\":2}")) + (should (equal (json-encode-list '((:a . 1) (:b . 2))) + "{\"a\":1,\"b\":2}")) + (should (equal (json-encode-list '(1 2 3 4)) "[1,2,3,4]")))) + +;;; Arrays + +(ert-deftest test-json-read-array () + (let ((json-array-type 'vector)) + (json-tests--with-temp-buffer "[1, 2, \"a\", \"b\"]" + (should (equal (json-read-array) [1 2 "a" "b"])))) + (let ((json-array-type 'list)) + (json-tests--with-temp-buffer "[1, 2, \"a\", \"b\"]" + (should (equal (json-read-array) '(1 2 "a" "b"))))) + (json-tests--with-temp-buffer "[1 2]" + (should-error (json-read-array) :type 'json-error))) + +(ert-deftest test-json-encode-array () + (let ((json-encoding-pretty-print nil)) + (should (equal (json-encode-array [1 2 "a" "b"]) + "[1,2,\"a\",\"b\"]")))) + +;;; Reader + +(ert-deftest test-json-read () + (json-tests--with-temp-buffer "{ \"a\": 1 }" + ;; We don't care exactly what the return value is (that is tested + ;; in `test-json-read-object'), but it should parse without error. + (should (json-read))) + (json-tests--with-temp-buffer "" + (should-error (json-read) :type 'json-end-of-file)) + (json-tests--with-temp-buffer "xxx" + (should-error (json-read) :type 'json-readtable-error))) + +(ert-deftest test-json-read-from-string () + (let ((json-string "{ \"a\": 1 }")) + (json-tests--with-temp-buffer json-string + (should (equal (json-read-from-string json-string) + (json-read)))))) + (provide 'json-tests) ;;; json-tests.el ends here --=20 2.6.2 = --=-C2hVk1h1FxljcOswf6SI--