diff options
author | Scott Maxwell <scott@codecobblers.com> | 2012-03-02 22:20:16 -0800 |
---|---|---|
committer | Scott Maxwell <scott@codecobblers.com> | 2012-03-02 22:20:16 -0800 |
commit | 89d774e3a8039d454dc81cfd128cb803b4ad48fa (patch) | |
tree | f07376da7be44eac068840c709143ac691e00a1f | |
parent | bdd25021bd1958003ed96026eed66f161bb9fc70 (diff) | |
download | simplejson-89d774e3a8039d454dc81cfd128cb803b4ad48fa.tar.gz |
Integrated unit test into test suite
Had to add it to __init__.py and remove my manual no-speedups tests.
-rw-r--r-- | simplejson/tests/__init__.py | 1 | ||||
-rw-r--r-- | simplejson/tests/test_bigint_as_string.py | 18 |
2 files changed, 1 insertions, 18 deletions
diff --git a/simplejson/tests/__init__.py b/simplejson/tests/__init__.py index 8d2e443..12289b6 100644 --- a/simplejson/tests/__init__.py +++ b/simplejson/tests/__init__.py @@ -27,6 +27,7 @@ def additional_tests(suite=None): def all_tests_suite(): suite = unittest.TestLoader().loadTestsFromNames([ + 'simplejson.tests.test_bigint_as_string', 'simplejson.tests.test_check_circular', 'simplejson.tests.test_decode', 'simplejson.tests.test_default', diff --git a/simplejson/tests/test_bigint_as_string.py b/simplejson/tests/test_bigint_as_string.py index b04aa1e..cb81fab 100644 --- a/simplejson/tests/test_bigint_as_string.py +++ b/simplejson/tests/test_bigint_as_string.py @@ -21,21 +21,3 @@ class TestBigintAsString(TestCase): d = {'value': value_pair[0]} self.assertEquals('{"value": %s}' % value_pair[0], json.dumps(d)) self.assertEquals('{"value": %s}' % value_pair[1], json.dumps(d, bigint_as_string=True)) - - def test_ints_without_speedups(self): - self.assertIsNotNone(json.encoder.c_make_encoder) - json._toggle_speedups(False) - self.test_ints() - json._toggle_speedups(True) - - def test_lists_without_speedups(self): - self.assertIsNotNone(json.encoder.c_make_encoder) - json._toggle_speedups(False) - self.test_lists() - json._toggle_speedups(True) - - def test_dicts_without_speedups(self): - self.assertIsNotNone(json.encoder.c_make_encoder) - json._toggle_speedups(False) - self.test_dicts() - json._toggle_speedups(True) |