From 4a196e71d4aa325b93749b015a757109de006db5 Mon Sep 17 00:00:00 2001 From: Matěj Cepl Date: Wed, 18 Jan 2012 10:27:19 +0100 Subject: Plenty of setup.py work. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Yet another (hopefully the last) fix of the development website. We are on fedorahosted.org now. * Move tests to test/ module * Clean up setup.py (when using defaults, install doesn’t install tests, which I like) * Add new setup.py command test to run the test suite. --- test/__init__.py | 1 + test/test_json_diff.py | 228 ++++++++++++++++++++++++++++++++++++++++++++++++ test/test_strings.py | 231 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 460 insertions(+) create mode 100644 test/__init__.py create mode 100644 test/test_json_diff.py create mode 100644 test/test_strings.py (limited to 'test') diff --git a/test/__init__.py b/test/__init__.py new file mode 100644 index 0000000..1b30feb --- /dev/null +++ b/test/__init__.py @@ -0,0 +1 @@ +"This package contains automated code tests for json_diff." diff --git a/test/test_json_diff.py b/test/test_json_diff.py new file mode 100644 index 0000000..cb2e878 --- /dev/null +++ b/test/test_json_diff.py @@ -0,0 +1,228 @@ +# coding: utf-8 +""" +PyUnit unit tests +""" +import unittest +import sys +import locale +try: + import json +except ImportError: + import simplejson as json +import json_diff +from StringIO import StringIO +import codecs + +from test_strings import ARRAY_DIFF, ARRAY_NEW, ARRAY_OLD, \ + NESTED_DIFF, NESTED_DIFF_EXCL, NESTED_DIFF_INCL, NESTED_NEW, NESTED_OLD, \ + NO_JSON_NEW, NO_JSON_OLD, SIMPLE_ARRAY_DIFF, SIMPLE_ARRAY_NEW, \ + NESTED_DIFF_IGNORING, \ + SIMPLE_ARRAY_OLD, SIMPLE_DIFF, SIMPLE_DIFF_HTML, SIMPLE_NEW, SIMPLE_OLD + + +class OptionsClass(object): + def __init__(self, inc=None, exc=None, ign=None): + self.exclude = exc + self.include = inc + self.ignore_append = ign + + +class OurTestCase(unittest.TestCase): + def _run_test(self, oldf, newf, difff, msg="", opts=None): + diffator = json_diff.Comparator(oldf, newf, opts) + diff = diffator.compare_dicts() + expected = json.load(difff) + self.assertEqual(json.dumps(diff, sort_keys=True), + json.dumps(expected, sort_keys=True), + msg + "\n\nexpected = %s\n\nobserved = %s" % + (json.dumps(expected, sort_keys=True, indent=4, + ensure_ascii=False), + json.dumps(diff, sort_keys=True, indent=4, + ensure_ascii=False))) + + def _run_test_strings(self, olds, news, diffs, msg="", opts=None): + self._run_test(StringIO(olds), StringIO(news), StringIO(diffs), + msg, opts) + + def _run_test_formatted(self, oldf, newf, difff, msg="", opts=None): + diffator = json_diff.Comparator(oldf, newf, opts) + diff = ("\n".join([line.strip() \ + for line in unicode(\ + json_diff.HTMLFormatter(diffator.compare_dicts())).\ + split("\n")])).strip() + expected = ("\n".join([line.strip() for line in difff if line])).\ + strip() + self.assertEqual(diff, expected, msg + + "\n\nexpected = %s\n\nobserved = %s" % + (expected, diff)) + + +class TestBasicJSON(OurTestCase): + def test_empty(self): + diffator = json_diff.Comparator({}, {}) + diff = diffator.compare_dicts() + self.assertEqual(json.dumps(diff).strip(), "{}", + "Empty objects diff.\n\nexpected = %s\n\nobserved = %s" % + ({}, diff)) + + def test_null(self): + self._run_test_strings('{"a": null}', '{"a": null}', + '{}', "Nulls") + + def test_null_to_string(self): + self._run_test_strings('{"a": null}', '{"a": "something"}', + '{"_update": {"a": "something"}}', "Null changed to string") + + def test_boolean(self): + self._run_test_strings('{"a": true}', '{"a": false}', + '{"_update": {"a": false}}', "Booleans") + + def test_integer(self): + self._run_test_strings(u'{"a": 1}', '{"a": 2}', + u'{"_update": {"a": 2}}', "Integers") + + def test_float(self): + self._run_test_strings(u'{"a": 1.0}', '{"a": 1.1}', + u'{"_update": {"a": 1.1}}', "Floats") + + def test_int_to_float(self): + self._run_test_strings(u'{"a": 1}', '{"a": 1.0}', + u'{"_update": {"a": 1.0}}', "Integer changed to float") + + def test_simple(self): + self._run_test_strings(SIMPLE_OLD, SIMPLE_NEW, SIMPLE_DIFF, + "All-scalar objects diff.") + + def test_simple_formatted(self): + self._run_test_formatted(StringIO(SIMPLE_OLD), StringIO(SIMPLE_NEW), + StringIO(SIMPLE_DIFF_HTML), + "All-scalar objects diff (formatted).") + + def test_simple_array(self): + self._run_test_strings(SIMPLE_ARRAY_OLD, SIMPLE_ARRAY_NEW, + SIMPLE_ARRAY_DIFF, "Simple array objects diff.") + + def test_another_array(self): + self._run_test_strings(ARRAY_OLD, ARRAY_NEW, + ARRAY_DIFF, "Array objects diff.") + + +class TestHappyPath(OurTestCase): + def test_realFile(self): + self._run_test(open("test/old.json"), open("test/new.json"), + open("test/diff.json"), "Simply nested objects (from file) diff.") + + def test_nested(self): + self._run_test_strings(NESTED_OLD, NESTED_NEW, NESTED_DIFF, + "Nested objects diff.") + + def test_nested_formatted(self): + self._run_test_formatted(open("test/old.json"), open("test/new.json"), + codecs.open("test/nested_html_output.html", "r", "utf-8"), + "Simply nested objects (from file) diff formatted as HTML.") + + def test_nested_excluded(self): + self._run_test_strings(NESTED_OLD, NESTED_NEW, NESTED_DIFF_EXCL, + "Nested objects diff with exclusion.", + OptionsClass(exc=["nome"])) + + def test_nested_included(self): + self._run_test_strings(NESTED_OLD, NESTED_NEW, NESTED_DIFF_INCL, + "Nested objects diff.", OptionsClass(inc=["nome"])) + + def test_nested_ignoring_append(self): + self._run_test_strings(NESTED_OLD, NESTED_NEW, NESTED_DIFF_IGNORING, + "Nested objects diff.", OptionsClass(ign=True)) + + +class TestBadPath(OurTestCase): + def test_no_JSON(self): + self.assertRaises(json_diff.BadJSONError, + json_diff.Comparator, StringIO(NO_JSON_OLD), + StringIO(NO_JSON_NEW) + ) + + def test_bad_JSON_no_hex(self): + self.assertRaises(json_diff.BadJSONError, self._run_test_strings, + u'{"a": 0x1}', '{"a": 2}', u'{"_update": {"a": 2}}', + "Hex numbers not supported") + + def test_bad_JSON_no_octal(self): + self.assertRaises(json_diff.BadJSONError, self._run_test_strings, + u'{"a": 01}', '{"a": 2}', u'{"_update": {"a": 2}}', + "Octal numbers not supported") + + +class TestPiglitData(OurTestCase): + def test_piglit_result_only(self): + self._run_test(open("test/old-testing-data.json"), + open("test/new-testing-data.json"), + open("test/diff-result-only-testing-data.json"), + "Large piglit reports diff (just resume field).", + OptionsClass(inc=["result"])) + +# def test_piglit_results(self): +# self._run_test(open("test/old-testing-data.json"), +# open("test/new-testing-data.json"), +# open("test/diff-testing-data.json"), "Large piglit results diff.") + + +class TestMainArgsMgmt(unittest.TestCase): + def test_args_help(self): + save_stdout = StringIO() + sys.stdout = save_stdout + + try: + json_diff.main(["./test_json_diff.py", "-h"]) + except SystemExit: + save_stdout.seek(0) + sys.stdout = sys.__stdout__ + expected = "usage:" + observed = save_stdout.read().lower() + + self.assertEquals(observed[:len(expected)], expected, + "testing -h usage message" + + "\n\nexpected = %s\n\nobserved = %s" % + (expected, observed)) + + def test_args_run_same(self): + save_stdout = StringIO() + sys.stdout = save_stdout + cur_loc = locale.getlocale() + locale.setlocale(locale.LC_ALL, "cs_CZ.utf8") + + res = json_diff.main(["./test_json_diff.py", + "test/old.json", "test/old.json"]) + + sys.stdout = sys.__stdout__ + locale.setlocale(locale.LC_ALL, cur_loc) + self.assertEquals(res, 0, "comparing same file" + + "\n\nexpected = %d\n\nobserved = %d" % + (0, res)) + + def test_args_run_different(self): + save_stdout = StringIO() + sys.stdout = save_stdout + cur_loc = locale.getlocale() + locale.setlocale(locale.LC_ALL, "cs_CZ.utf8") + + res = json_diff.main(["./test_json_diff.py", + "test/old.json", "test/new.json"]) + + sys.stdout = sys.__stdout__ + locale.setlocale(locale.LC_ALL, cur_loc) + self.assertEqual(res, 1, "comparing different files" + + "\n\nexpected = %d\n\nobserved = %d" % + (1, res)) + +add_tests_from_class = unittest.TestLoader().loadTestsFromTestCase + +suite = unittest.TestSuite() +suite.addTest(add_tests_from_class(TestBasicJSON)) +suite.addTest(add_tests_from_class(TestHappyPath)) +suite.addTest(add_tests_from_class(TestBadPath)) +suite.addTest(add_tests_from_class(TestPiglitData)) +suite.addTest(add_tests_from_class(TestMainArgsMgmt)) + +if __name__ == "__main__": + unittest.main() diff --git a/test/test_strings.py b/test/test_strings.py new file mode 100644 index 0000000..af86ab7 --- /dev/null +++ b/test/test_strings.py @@ -0,0 +1,231 @@ +# coding: utf-8 + +NO_JSON_OLD = u""" +THIS IS NOT A JSON STRING +""" + +NO_JSON_NEW = u""" +AND THIS NEITHER +""" + +SIMPLE_OLD = u""" +{ + "a": 1, + "b": true, + "c": "Janošek" +} +""" + +SIMPLE_NEW = u""" +{ + "b": false, + "c": "Maruška", + "d": "přidáno" +} +""" + +SIMPLE_DIFF = u""" +{ + "_append": { + "d": "přidáno" + }, + "_remove": { + "a": 1 + }, + "_update": { + "c": "Maruška", + "b": false + } +} +""" + +SIMPLE_DIFF_HTML = u""" + + + +json_diff result + + +

json_diff result

+ + + + + + + + + + +
a = 1
c = Maruška
b = False
d = přidáno
+ + +""" + +SIMPLE_ARRAY_OLD = u""" +{ + "a": [ 1 ] +} +""" + +SIMPLE_ARRAY_NEW = u""" +{ + "a": [ 1, 2 ] +} +""" + +SIMPLE_ARRAY_DIFF = u""" +{ + "_update": { + "a": { + "_append": { + "1": 2 + } + } + } +} +""" + +NESTED_OLD = u""" +{ + "a": 1, + "b": 2, + "ignore": { + "else": true + }, + "child": { + "nome": "Janošek" + } +} +""" + +NESTED_NEW = u""" +{ + "a": 2, + "c": 3, + "child": { + "nome": "Maruška" + } +} +""" + +NESTED_DIFF = u""" +{ + "_append": { + "c": 3 + }, + "_remove": { + "b": 2, + "ignore": { + "else": true + } + }, + "_update": { + "a": 2, + "child": { + "_update": { + "nome": "Maruška" + } + } + } +} +""" + +NESTED_DIFF_EXCL = u""" +{ + "_append": { + "c": 3 + }, + "_remove": { + "b": 2, + "ignore": { + "else": true + } + }, + "_update": { + "a": 2 + } +} +""" + +NESTED_DIFF_INCL = u""" +{ + "_update": { + "child": { + "_update": { + "nome": "Maruška" + } + } + } +} +""" + +NESTED_DIFF_IGNORING = u""" +{ + "_remove": { + "b": 2, + "ignore": { + "else": true + } + }, + "_update": { + "a": 2, + "child": { + "_update": { + "nome": "Maruška" + } + } + } +} +""" + +ARRAY_OLD = u""" +{ + "a": 1, + "b": 2, + "children": [ + "Pepíček", "Anička", "Maruška" + ] +} +""" + +ARRAY_NEW = u""" +{ + "a": 1, + "children": [ + "Pepíček", "Tonička", "Maruška" + ], + "c": 3 +} +""" + +ARRAY_DIFF = u""" + { + "_append": { + "c": 3 + }, + "_remove": { + "b": 2 + }, + "_update": { + "children": { + "_update": { + "1": "Tonička" + } + } + } +} +""" -- cgit