diff --git a/test/test_custom_render.py b/test/test_custom_render.py index 6f3fc7d3..9032763a 100644 --- a/test/test_custom_render.py +++ b/test/test_custom_render.py @@ -55,9 +55,13 @@ def test_custom_template_for_chart(): 'name': '雪纺衫', 'value': 36 }] + + data1 = {'衬衫': '34', '羊毛衫': 45, '雪纺衫': 40} names, values = Bar.cast(data) + names1, values1 = Bar.cast(data1) bar = Bar("柱状图数据堆叠示例") bar.add("商家A", names, values, is_stack=True) + bar.add("商家B", names1, values1, is_stack=True) bar.render(new_version=True, path='new_version_bar.html') with codecs.open('new_version_bar.html', 'r', 'utf-8') as f: actual_content = f.read() diff --git a/test/test_utils.py b/test/test_utils.py index c381d931..1b43b3ab 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -46,13 +46,13 @@ def test_write_utf8_html_file(): def test_json_encoder(): data = date(2017, 1, 1) - expected = '{\n"date": "2017-01-01"\n}' - eq_(expected, json_dumps({'date': data})) + v = json_dumps({'date': data, 'a': '1'}) + print(v) + assert v in ( + '{\n"a": "1",\n"date": "2017-01-01"\n}', + '{\n"date": "2017-01-01",\n"a": "1"\n}' + ) - # data2 = {'np_list': np.array(['a', 'b', 'c'])} - # expected2 = '{\n"np_list": [\n"a",\n"b",\n"c"\n]\n}' - # eq_(expected2, json_dumps(data2)) - # - # data3 = {'list': ['a', 'b', 'c']} - # expected3 = '{\n"list": [\n"a",\n"b",\n"c"\n]\n}' - # eq_(expected3, json_dumps(data3)) + data2 = {'np_list': np.array(['a', 'b', 'c'])} + data2_e = {'np_list': ['a', 'b', 'c']} + eq_(json_dumps(data2_e), json_dumps(data2))