From 0de5111f0dc90220dfea960c4fa88fd86b6c40fc Mon Sep 17 00:00:00 2001 From: philipp Date: Sun, 29 Jan 2017 13:01:23 +0000 Subject: [PATCH 1/1] Replaced direct assert with assertEqual in TestMySqlPython. git-svn-id: http://www.winterrodeln.org/svn/wrpylib/trunk@2616 7aebc617-e5e2-0310-91dc-80fb5f6d2477 --- tests/test_mwdb.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/test_mwdb.py b/tests/test_mwdb.py index 2a038d7..4e6dc8f 100644 --- a/tests/test_mwdb.py +++ b/tests/test_mwdb.py @@ -83,29 +83,29 @@ class TestMySqlPython(unittest.TestCase): def test_datatype_page(self): result = self.exec_sql('select page_title, page_restrictions, page_touched from page where page_id = 1321') - assert type(result[0]) == str # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL - assert type(result[1]) == bytes # tinyblob NOT NULL - assert type(result[2]) == bytes # binary(14) NOT NULL + self.assertEqual(type(result[0]), str) # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL + self.assertEqual(type(result[1]), bytes) # tinyblob NOT NULL + self.assertEqual(type(result[2]), bytes) # binary(14) NOT NULL def test_datatype_revision(self): result = self.exec_sql('select rev_comment, rev_user_text, rev_timestamp from revision where rev_id = 7586') - assert type(result[0]) == bytes # tinyblob NOT NULL - assert type(result[1]) == str # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL - assert type(result[2]) == bytes # binary(14) NOT NULL + self.assertEqual(type(result[0]), bytes) # tinyblob NOT NULL + self.assertEqual(type(result[1]), str) # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL + self.assertEqual(type(result[2]), bytes) # binary(14) NOT NULL def test_datatypes_text(self): result = self.exec_sql('select old_text, old_flags from text where old_id = 7438') - assert type(result[0]) == bytes # mediumblob NOT NULL - assert type(result[1]) == bytes # tinyblob NOT NULL + self.assertEqual(type(result[0]), bytes) # mediumblob NOT NULL + self.assertEqual(type(result[1]), bytes) # tinyblob NOT NULL def test_datatype_user(self): result = self.exec_sql('select user_name, user_real_name, user_email from user where user_id = 1') - assert type(result[0]) == str # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL - assert type(result[1]) == str # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL - assert type(result[2]) == str # tinytext NOT NULL + self.assertEqual(type(result[0]), str) # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL + self.assertEqual(type(result[1]), str) # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL + self.assertEqual(type(result[2]), str) # tinytext NOT NULL assert result[0] == 'Philipp' def test_datatype_categorylinks(self): result = self.exec_sql('select cl_to, cl_sortkey from categorylinks where cl_from = 609') - assert type(result[0]) == str # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL - assert type(result[1]) == bytes # varbinary(230) NOT NULL + self.assertEqual(type(result[0]), str) # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL + self.assertEqual(type(result[1]), bytes) # varbinary(230) NOT NULL -- 2.39.5