From f372d3d4951cff192a9a8fd524e90b9fea5023e7 Mon Sep 17 00:00:00 2001 From: Hugo Date: Wed, 26 Sep 2018 21:00:08 +0300 Subject: [PATCH] Upgrade unit test asserts --- tests/test_smart_list.py | 56 +++++++++++++++++++------------------- tests/test_string_mixin.py | 68 +++++++++++++++++++++++----------------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/tests/test_smart_list.py b/tests/test_smart_list.py index 6569c8a..3c9f711 100644 --- a/tests/test_smart_list.py +++ b/tests/test_smart_list.py @@ -135,36 +135,36 @@ class TestSmartList(unittest.TestCase): self.assertEqual(b"[0, 1, 2, 3, u'one', u'two']", str(list1)) self.assertEqual(b"[0, 1, 2, 3, u'one', u'two']", repr(list1)) - self.assertTrue(list1 < list3) - self.assertTrue(list1 <= list3) - self.assertFalse(list1 == list3) - self.assertTrue(list1 != list3) - self.assertFalse(list1 > list3) - self.assertFalse(list1 >= list3) + self.assertLess(list1, list3) + self.assertLessEqual(list1, list3) + self.assertNotEqual(list1, list3) + self.assertNotEqual(list1, list3) + self.assertLessEqual(list1, list3) + self.assertLess(list1, list3) other1 = [0, 2, 3, 4] - self.assertTrue(list1 < other1) - self.assertTrue(list1 <= other1) - self.assertFalse(list1 == other1) - self.assertTrue(list1 != other1) - self.assertFalse(list1 > other1) - self.assertFalse(list1 >= other1) + self.assertLess(list1, other1) + self.assertLessEqual(list1, other1) + self.assertNotEqual(list1, other1) + self.assertNotEqual(list1, other1) + self.assertLessEqual(list1, other1) + self.assertLess(list1, other1) other2 = [0, 0, 1, 2] - self.assertFalse(list1 < other2) - self.assertFalse(list1 <= other2) - self.assertFalse(list1 == other2) - self.assertTrue(list1 != other2) - self.assertTrue(list1 > other2) - self.assertTrue(list1 >= other2) + self.assertGreaterEqual(list1, other2) + self.assertGreater(list1, other2) + self.assertNotEqual(list1, other2) + self.assertNotEqual(list1, other2) + self.assertGreater(list1, other2) + self.assertGreaterEqual(list1, other2) other3 = [0, 1, 2, 3, "one", "two"] - self.assertFalse(list1 < other3) - self.assertTrue(list1 <= other3) - self.assertTrue(list1 == other3) - self.assertFalse(list1 != other3) - self.assertFalse(list1 > other3) - self.assertTrue(list1 >= other3) + self.assertGreaterEqual(list1, other3) + self.assertLessEqual(list1, other3) + self.assertEqual(list1, other3) + self.assertEqual(list1, other3) + self.assertLessEqual(list1, other3) + self.assertGreaterEqual(list1, other3) self.assertTrue(bool(list1)) self.assertFalse(bool(list2)) @@ -194,10 +194,10 @@ class TestSmartList(unittest.TestCase): self.assertEqual(["two", "one", 3, 2, 1, 0], list(reversed(list1))) self.assertEqual([], list(reversed(list2))) - self.assertTrue("one" in list1) - self.assertTrue(3 in list1) - self.assertFalse(10 in list1) - self.assertFalse(0 in list2) + self.assertIn("one", list1) + self.assertIn(3, list1) + self.assertNotIn(10, list1) + self.assertNotIn(0, list2) self.assertEqual([], list2 * 5) self.assertEqual([], 5 * list2) diff --git a/tests/test_string_mixin.py b/tests/test_string_mixin.py index e6c133f..11ee6b7 100644 --- a/tests/test_string_mixin.py +++ b/tests/test_string_mixin.py @@ -84,33 +84,33 @@ class TestStringMixIn(unittest.TestCase): str4 = "this is a fake string" str5 = "fake string, this is" - self.assertFalse(str1 > str2) - self.assertTrue(str1 >= str2) - self.assertTrue(str1 == str2) - self.assertFalse(str1 != str2) - self.assertFalse(str1 < str2) - self.assertTrue(str1 <= str2) - - self.assertTrue(str1 > str3) - self.assertTrue(str1 >= str3) - self.assertFalse(str1 == str3) - self.assertTrue(str1 != str3) - self.assertFalse(str1 < str3) - self.assertFalse(str1 <= str3) - - self.assertFalse(str1 > str4) - self.assertTrue(str1 >= str4) - self.assertTrue(str1 == str4) - self.assertFalse(str1 != str4) - self.assertFalse(str1 < str4) - self.assertTrue(str1 <= str4) - - self.assertFalse(str5 > str1) - self.assertFalse(str5 >= str1) - self.assertFalse(str5 == str1) - self.assertTrue(str5 != str1) - self.assertTrue(str5 < str1) - self.assertTrue(str5 <= str1) + self.assertLessEqual(str1, str2) + self.assertGreaterEqual(str1, str2) + self.assertEqual(str1, str2) + self.assertEqual(str1, str2) + self.assertGreaterEqual(str1, str2) + self.assertLessEqual(str1, str2) + + self.assertGreater(str1, str3) + self.assertGreaterEqual(str1, str3) + self.assertNotEqual(str1, str3) + self.assertNotEqual(str1, str3) + self.assertGreaterEqual(str1, str3) + self.assertGreater(str1, str3) + + self.assertLessEqual(str1, str4) + self.assertGreaterEqual(str1, str4) + self.assertEqual(str1, str4) + self.assertEqual(str1, str4) + self.assertGreaterEqual(str1, str4) + self.assertLessEqual(str1, str4) + + self.assertLessEqual(str5, str1) + self.assertLess(str5, str1) + self.assertNotEqual(str5, str1) + self.assertNotEqual(str5, str1) + self.assertLess(str5, str1) + self.assertLessEqual(str5, str1) def test_other_magics(self): """test other magically implemented features, like len() and iter()""" @@ -155,13 +155,13 @@ class TestStringMixIn(unittest.TestCase): self.assertRaises(IndexError, lambda: str1[11]) self.assertRaises(IndexError, lambda: str2[0]) - self.assertTrue("k" in str1) - self.assertTrue("fake" in str1) - self.assertTrue("str" in str1) - self.assertTrue("" in str1) - self.assertTrue("" in str2) - self.assertFalse("real" in str1) - self.assertFalse("s" in str2) + self.assertIn("k", str1) + self.assertIn("fake", str1) + self.assertIn("str", str1) + self.assertIn("", str1) + self.assertIn("", str2) + self.assertNotIn("real", str1) + self.assertNotIn("s", str2) def test_other_methods(self): """test the remaining non-magic methods of StringMixIn"""