From a6e822a802963d4be8b7219f0cbf605fe25b934c Mon Sep 17 00:00:00 2001 From: Ismael Carnales Date: Tue, 14 Jul 2009 09:36:33 -0300 Subject: [PATCH] use assertEqual instead of assert in newitem tests --- scrapy/tests/test_newitem.py | 82 ++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/scrapy/tests/test_newitem.py b/scrapy/tests/test_newitem.py index 60faf2eb5..06cad2f04 100644 --- a/scrapy/tests/test_newitem.py +++ b/scrapy/tests/test_newitem.py @@ -14,17 +14,17 @@ class NewItemTest(unittest.TestCase): i = TestItem() i.name = u'name' - assert i.name == u'name' + self.assertEqual(i.name, u'name') def test_init(self): class TestItem(Item): name = fields.TextField() i = TestItem() - assert i.name is None + self.assert_(i.name is None) i2 = TestItem({'name': u'john doe'}) - assert i2.name == u'john doe' + self.assertEqual(i2.name, u'john doe') self.assertRaises(TypeError, TestItem, name=u'john doe') @@ -39,7 +39,7 @@ class NewItemTest(unittest.TestCase): i = TestMultiItem() i.name = u'name' i.names = [u'name1', u'name2'] - assert i.names == [u'name1', u'name2'] + self.assertEqual(i.names, [u'name1', u'name2']) def test_invalid_field(self): class TestItem(Item): @@ -61,7 +61,7 @@ class NewItemTest(unittest.TestCase): name = fields.TextField(default=u'John') i = TestItem() - assert i.name == u'John' + self.assertEqual(i.name, u'John') def test_wrong_default(self): def set_wrong_default(): @@ -76,7 +76,7 @@ class NewItemTest(unittest.TestCase): i = TestItem() i.name = (u'John', u'Doe') - assert i.name == u'John Doe' + self.assertEqual(i.name, u'John Doe') def test_repr(self): class TestItem(Item): @@ -87,11 +87,12 @@ class NewItemTest(unittest.TestCase): i.name = u'John Doe' i.number = '123' itemrepr = repr(i) - assert itemrepr == "TestItem({'name': u'John Doe', 'number': 123})" + self.assertEqual(itemrepr, + "TestItem({'name': u'John Doe', 'number': 123})") i2 = eval(itemrepr) - assert i2.name == 'John Doe' - assert i2.number == 123 + self.assertEqual(i2.name, 'John Doe') + self.assertEqual(i2.number, 123) def test_private_attr(self): class TestItem(Item): @@ -124,7 +125,7 @@ class NewItemFieldsTest(unittest.TestCase): def test_base_field(self): f = fields.BaseField() - assert f.get_default() is None + self.assert_(f.get_default() is None) self.assertRaises(NotImplementedError, f.to_python, 1) def test_boolean_field(self): @@ -134,19 +135,19 @@ class NewItemFieldsTest(unittest.TestCase): i = TestItem() i.field = True - assert i.field is True + self.assert_(i.field is True) i.field = 1 - assert i.field is True + self.assert_(i.field is True) i.field = False - assert i.field is False + self.assert_(i.field is False) i.field = 0 - assert i.field is False + self.assert_(i.field is False) i.field = None - assert i.field is False + self.assert_(i.field is False) def test_date_field(self): class TestItem(Item): @@ -156,14 +157,14 @@ class NewItemFieldsTest(unittest.TestCase): d_today = datetime.date.today() i.field = d_today - assert i.field == d_today + self.assertEqual(i.field, d_today) dt_today = datetime.datetime.today() i.field = dt_today - assert i.field == dt_today.date() + self.assertEqual(i.field, dt_today.date()) i.field = '2009-05-21' - assert i.field == datetime.date(2009, 5, 21) + self.assertEqual(i.field, datetime.date(2009, 5, 21)) def set_invalid_format(): i.field = '21-05-2009' @@ -185,24 +186,25 @@ class NewItemFieldsTest(unittest.TestCase): dt_today = datetime.datetime.today() i.field = dt_today - assert i.field == dt_today + self.assertEqual(i.field, dt_today) d_today = datetime.date.today() i.field = d_today - assert i.field == datetime.datetime(d_today.year, d_today.month, - d_today.day) + self.assertEqual(i.field, datetime.datetime(d_today.year, + d_today.month, d_today.day)) i.field = '2009-05-21 11:08:10.100' - assert i.field == datetime.datetime(2009, 5, 21, 11, 8, 10, 100) + self.assertEqual(i.field, datetime.datetime(2009, 5, 21, 11, 8, 10, + 100)) i.field = '2009-05-21 11:08:10' - assert i.field == datetime.datetime(2009, 5, 21, 11, 8, 10) + self.assertEqual(i.field, datetime.datetime(2009, 5, 21, 11, 8, 10)) i.field = '2009-05-21 11:08' - assert i.field == datetime.datetime(2009, 5, 21, 11, 8) + self.assertEqual(i.field, datetime.datetime(2009, 5, 21, 11, 8)) i.field = '2009-05-21' - assert i.field == datetime.datetime(2009, 5, 21) + self.assertEqual(i.field, datetime.datetime(2009, 5, 21)) def set_invalid_usecs(): i.field = '2009-05-21 11:08:10.usecs' @@ -228,10 +230,10 @@ class NewItemFieldsTest(unittest.TestCase): i = TestItem() i.field = decimal.Decimal('3.14') - assert i.field == decimal.Decimal('3.14') + self.assertEqual(i.field, decimal.Decimal('3.14')) i.field = '3.14' - assert i.field == decimal.Decimal('3.14') + self.assertEqual(i.field, decimal.Decimal('3.14')) def set_invalid_value(): i.field = 'text' @@ -247,10 +249,10 @@ class NewItemFieldsTest(unittest.TestCase): i = TestItem() i.field = 3.14 - assert i.field == 3.14 + self.assertEqual(i.field, 3.14) i.field = '3.14' - assert i.field == 3.14 + self.assertEqual(i.field, 3.14) def set_invalid_value(): i.field = 'text' @@ -266,10 +268,10 @@ class NewItemFieldsTest(unittest.TestCase): i = TestItem() i.field = 3 - assert i.field == 3 + self.assertEqual(i.field, 3) i.field = '3' - assert i.field == 3 + self.assertEqual(i.field, 3) def set_invalid_value(): i.field = 'text' @@ -285,8 +287,8 @@ class NewItemFieldsTest(unittest.TestCase): i = TestItem() i.field = u'hello' - assert i.field == u'hello' - assert isinstance(i.field, unicode) + self.assertEqual(i.field, u'hello') + self.assert_(isinstance(i.field, unicode)) def set_str(): i.field = 'string' @@ -304,14 +306,14 @@ class NewItemFieldsTest(unittest.TestCase): i = TestItem() i.field = [u'hello', u'world'] self.assertEqual(i.field, u'hello world') - assert isinstance(i.field, unicode) + self.assert_(isinstance(i.field, unicode)) self.assertRaises(TypeError, setattr, i, 'field', [u'hello', 3, u'world']) self.assertRaises(TypeError, setattr, i, 'field', [u'hello', 'world']) i = TestItem() i.field = [] - assert isinstance(i.field, unicode) + self.assert_(isinstance(i.field, unicode)) self.assertEqual(i.field, '') def test_time_field(self): @@ -322,22 +324,22 @@ class NewItemFieldsTest(unittest.TestCase): dt_t = datetime.time(11, 8, 10, 100) i.field = dt_t - assert i.field == dt_t + self.assertEqual(i.field, dt_t) self.assertRaises(TypeError, setattr, i, 'field', None) dt_dt = datetime.datetime.today() i.field = dt_dt - assert i.field == dt_dt.time + self.assertEqual(i.field, dt_dt.time) i.field = '11:08:10.100' - assert i.field == datetime.time(11, 8, 10, 100) + self.assertEqual(i.field, datetime.time(11, 8, 10, 100)) i.field = '11:08:10' - assert i.field == datetime.time(11, 8, 10) + self.assertEqual(i.field, datetime.time(11, 8, 10)) i.field = '11:08' - assert i.field == datetime.time(11, 8) + self.assertEqual(i.field, datetime.time(11, 8)) def set_invalid_usecs(): i.field = '11:08:10.usecs'