QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-18 23:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tests] Fix, removing deprecated function for future Python release compatibility. (#8353)

Browse Source 
* removing deprecated function for future Python release compatibility.

* also removed assertNotEquals per @dpgaspar
This commit is contained in:
Marcus
2019-10-21 07:49:12 -07:00
committed by Daniel Vaz Gaspar
parent 1e533db3a2
commit 4cfd6b3ce1
18 changed files with 315 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
tests/utils_tests.py
View File

@@ -127,24 +127,24 @@ class UtilsTestCase(unittest.TestCase):
def test_parse_human_timedelta(self, mock_datetime):
mock_datetime.now.return_value = datetime(2019, 4, 1)
mock_datetime.side_effect = lambda *args, **kw: datetime(*args, **kw)
self.assertEquals(parse_human_timedelta("now"), timedelta(0))
self.assertEquals(parse_human_timedelta("1 year"), timedelta(366))
self.assertEquals(parse_human_timedelta("-1 year"), timedelta(-365))
self.assertEqual(parse_human_timedelta("now"), timedelta(0))
self.assertEqual(parse_human_timedelta("1 year"), timedelta(366))
self.assertEqual(parse_human_timedelta("-1 year"), timedelta(-365))
@patch("superset.utils.core.datetime")
def test_parse_past_timedelta(self, mock_datetime):
mock_datetime.now.return_value = datetime(2019, 4, 1)
mock_datetime.side_effect = lambda *args, **kw: datetime(*args, **kw)
self.assertEquals(parse_past_timedelta("1 year"), timedelta(365))
self.assertEquals(parse_past_timedelta("-1 year"), timedelta(365))
self.assertEquals(parse_past_timedelta("52 weeks"), timedelta(364))
self.assertEquals(parse_past_timedelta("1 month"), timedelta(31))
self.assertEqual(parse_past_timedelta("1 year"), timedelta(365))
self.assertEqual(parse_past_timedelta("-1 year"), timedelta(365))
self.assertEqual(parse_past_timedelta("52 weeks"), timedelta(364))
self.assertEqual(parse_past_timedelta("1 month"), timedelta(31))
def test_zlib_compression(self):
json_str = '{"test": 1}'
blob = zlib_compress(json_str)
got_str = zlib_decompress(blob)
self.assertEquals(json_str, got_str)
self.assertEqual(json_str, got_str)
@patch("superset.utils.core.to_adhoc", mock_to_adhoc)
def test_merge_extra_filters(self):
@@ -152,12 +152,12 @@ class UtilsTestCase(unittest.TestCase):
form_data = {"A": 1, "B": 2, "c": "test"}
expected = {"A": 1, "B": 2, "c": "test"}
merge_extra_filters(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
# empty extra_filters
form_data = {"A": 1, "B": 2, "c": "test", "extra_filters": []}
expected = {"A": 1, "B": 2, "c": "test", "adhoc_filters": []}
merge_extra_filters(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
# copy over extra filters into empty filters
form_data = {
"extra_filters": [
@@ -184,7 +184,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
merge_extra_filters(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
# adds extra filters to existing filters
form_data = {
"extra_filters": [
@@ -227,7 +227,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
merge_extra_filters(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
# adds extra filters to existing filters and sets time options
form_data = {
"extra_filters": [
@@ -256,7 +256,7 @@ class UtilsTestCase(unittest.TestCase):
"druid_time_origin": "now",
}
merge_extra_filters(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
@patch("superset.utils.core.to_adhoc", mock_to_adhoc)
def test_merge_extra_filters_ignores_empty_filters(self):
@@ -268,7 +268,7 @@ class UtilsTestCase(unittest.TestCase):
}
expected = {"adhoc_filters": []}
merge_extra_filters(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
@patch("superset.utils.core.to_adhoc", mock_to_adhoc)
def test_merge_extra_filters_ignores_nones(self):
@@ -296,7 +296,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
merge_extra_filters(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
@patch("superset.utils.core.to_adhoc", mock_to_adhoc)
def test_merge_extra_filters_ignores_equal_filters(self):
@@ -356,7 +356,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
merge_extra_filters(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
@patch("superset.utils.core.to_adhoc", mock_to_adhoc)
def test_merge_extra_filters_merges_different_val_types(self):
@@ -408,7 +408,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
merge_extra_filters(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
form_data = {
"extra_filters": [
{"col": "a", "op": "in", "val": "someval"},
@@ -457,7 +457,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
merge_extra_filters(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
@patch("superset.utils.core.to_adhoc", mock_to_adhoc)
def test_merge_extra_filters_adds_unequal_lists(self):
@@ -516,7 +516,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
merge_extra_filters(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
def test_merge_request_params(self):
form_data = {"since": "2000", "until": "now"}
@@ -527,25 +527,25 @@ class UtilsTestCase(unittest.TestCase):
self.assertNotIn("form_data", form_data.keys())
def test_datetime_f(self):
self.assertEquals(
self.assertEqual(
datetime_f(datetime(1990, 9, 21, 19, 11, 19, 626096)),
"<nobr>1990-09-21T19:11:19.626096</nobr>",
)
self.assertEquals(len(datetime_f(datetime.now())), 28)
self.assertEquals(datetime_f(None), "<nobr>None</nobr>")
self.assertEqual(len(datetime_f(datetime.now())), 28)
self.assertEqual(datetime_f(None), "<nobr>None</nobr>")
iso = datetime.now().isoformat()[:10].split("-")
[a, b, c] = [int(v) for v in iso]
self.assertEquals(datetime_f(datetime(a, b, c)), "<nobr>00:00:00</nobr>")
self.assertEqual(datetime_f(datetime(a, b, c)), "<nobr>00:00:00</nobr>")
def test_format_timedelta(self):
self.assertEquals(format_timedelta(timedelta(0)), "0:00:00")
self.assertEquals(format_timedelta(timedelta(days=1)), "1 day, 0:00:00")
self.assertEquals(format_timedelta(timedelta(minutes=-6)), "-0:06:00")
self.assertEquals(
self.assertEqual(format_timedelta(timedelta(0)), "0:00:00")
self.assertEqual(format_timedelta(timedelta(days=1)), "1 day, 0:00:00")
self.assertEqual(format_timedelta(timedelta(minutes=-6)), "-0:06:00")
self.assertEqual(
format_timedelta(timedelta(0) - timedelta(days=1, hours=5, minutes=6)),
"-1 day, 5:06:00",
)
self.assertEquals(
self.assertEqual(
format_timedelta(timedelta(0) - timedelta(days=16, hours=4, minutes=3)),
"-16 days, 4:03:00",
)
@@ -557,7 +557,7 @@ class UtilsTestCase(unittest.TestCase):
resp = jsonObj.process_bind_param(obj, "dialect")
self.assertIn('"a": 5', resp)
self.assertIn('"b": ["a", "g", 5]', resp)
self.assertEquals(jsonObj.process_result_value(val, "dialect"), obj)
self.assertEqual(jsonObj.process_result_value(val, "dialect"), obj)
def test_validate_json(self):
invalid = '{"a": 5, "b": [1, 5, ["g", "h]]}'
@@ -574,8 +574,8 @@ class UtilsTestCase(unittest.TestCase):
result1 = test_function(1, 2, 3)
result2 = test_function(1, 2, 3)
self.assertEquals(result1, result2)
self.assertEquals(watcher["val"], 1)
self.assertEqual(result1, result2)
self.assertEqual(watcher["val"], 1)
def test_memoized_on_methods(self):
class test_class:
@@ -591,10 +591,10 @@ class UtilsTestCase(unittest.TestCase):
instance = test_class(5)
result1 = instance.test_method(1, 2, 3)
result2 = instance.test_method(1, 2, 3)
self.assertEquals(result1, result2)
self.assertEquals(instance.watcher, 1)
self.assertEqual(result1, result2)
self.assertEqual(instance.watcher, 1)
instance.num = 10
self.assertEquals(result2, instance.test_method(1, 2, 3))
self.assertEqual(result2, instance.test_method(1, 2, 3))
def test_memoized_on_methods_with_watches(self):
class test_class:
@@ -611,13 +611,13 @@ class UtilsTestCase(unittest.TestCase):
instance = test_class(3, 12)
result1 = instance.test_method(1, 2, 3)
result2 = instance.test_method(1, 2, 3)
self.assertEquals(result1, result2)
self.assertEquals(instance.watcher, 1)
self.assertEqual(result1, result2)
self.assertEqual(instance.watcher, 1)
result3 = instance.test_method(2, 3, 4)
self.assertEquals(instance.watcher, 2)
self.assertEqual(instance.watcher, 2)
result4 = instance.test_method(2, 3, 4)
self.assertEquals(instance.watcher, 2)
self.assertEquals(result3, result4)
self.assertEqual(instance.watcher, 2)
self.assertEqual(result3, result4)
self.assertNotEqual(result3, result1)
instance.x = 1
result5 = instance.test_method(2, 3, 4)
@@ -707,7 +707,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
convert_legacy_filters_into_adhoc(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
@patch("superset.utils.core.to_adhoc", mock_to_adhoc)
def test_convert_legacy_filters_into_adhoc_filters(self):
@@ -724,7 +724,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
convert_legacy_filters_into_adhoc(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
@patch("superset.utils.core.to_adhoc", mock_to_adhoc)
def test_convert_legacy_filters_into_adhoc_having(self):
@@ -739,7 +739,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
convert_legacy_filters_into_adhoc(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
@patch("superset.utils.core.to_adhoc", mock_to_adhoc)
def test_convert_legacy_filters_into_adhoc_having_filters(self):
@@ -756,7 +756,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
convert_legacy_filters_into_adhoc(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
@patch("superset.utils.core.to_adhoc", mock_to_adhoc)
def test_convert_legacy_filters_into_adhoc_present_and_empty(self):
@@ -767,7 +767,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
convert_legacy_filters_into_adhoc(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
@patch("superset.utils.core.to_adhoc", mock_to_adhoc)
def test_convert_legacy_filters_into_adhoc_present_and_nonempty(self):
@@ -785,7 +785,7 @@ class UtilsTestCase(unittest.TestCase):
]
}
convert_legacy_filters_into_adhoc(form_data)
self.assertEquals(form_data, expected)
self.assertEqual(form_data, expected)
def test_parse_js_uri_path_items_eval_undefined(self):
self.assertIsNone(parse_js_uri_path_item("undefined", eval_undefined=True))