diff options
| -rw-r--r-- | tests/test_acceptparse.py | 8 | ||||
| -rw-r--r-- | tests/test_byterange.py | 8 | ||||
| -rw-r--r-- | tests/test_etag.py | 64 | ||||
| -rw-r--r-- | tests/test_multidict.py | 8 |
4 files changed, 20 insertions, 68 deletions
diff --git a/tests/test_acceptparse.py b/tests/test_acceptparse.py index ad7d0d2..468a22b 100644 --- a/tests/test_acceptparse.py +++ b/tests/test_acceptparse.py @@ -245,9 +245,7 @@ def test_nil_radd_masterclass(): def test_nil_contains(): nilaccept = NilAccept('Connection-Close') - # NilAccept.__contains__ always returns True - assert '' in nilaccept - assert 'dummy' in nilaccept + assert 'anything' in nilaccept def test_nil_first_match(): nilaccept = NilAccept('Connection-Close') @@ -270,9 +268,7 @@ def test_nil_best_match(): # NoAccept tests def test_noaccept_contains(): - noaccept = NoAccept('Connection-Close') - # NoAccept.__contains__ always returns False - assert 'text/plain' not in noaccept + assert 'text/plain' not in NoAccept('Connection-Close') # MIMEAccept tests diff --git a/tests/test_byterange.py b/tests/test_byterange.py index 6e19be7..104c247 100644 --- a/tests/test_byterange.py +++ b/tests/test_byterange.py @@ -57,13 +57,13 @@ def test_range_str_end_none(): range = Range( ((0, 100), ) ) # Manually set test values range.ranges = ( (0, None), ) - assert_equal( range.__str__(), 'bytes=0-' ) + assert_equal( str(range), 'bytes=0-' ) def test_range_str_end_none_negative_start(): range = Range( ((0, 100), ) ) # Manually set test values range.ranges = ( (-5, None), ) - assert_equal( range.__str__(), 'bytes=-5' ) + assert_equal( str(range), 'bytes=-5' ) def test_range_str_1(): # Single range @@ -151,13 +151,13 @@ def test_contentrange_repr(): def test_contentrange_str_length_none(): contentrange = ContentRange( 0, 99, 100 ) contentrange.length = None - assert_equal( contentrange.__str__(), 'bytes 0-98/*' ) + assert_equal( str(contentrange), 'bytes 0-98/*' ) def test_contentrange_str_start_none(): contentrange = ContentRange( 0, 99, 100 ) contentrange.start = None contentrange.stop = None - assert_equal( contentrange.__str__(), 'bytes */100' ) + assert_equal( str(contentrange), 'bytes */100' ) def test_contentrange_iter(): contentrange = ContentRange( 0, 99, 100 ) diff --git a/tests/test_etag.py b/tests/test_etag.py index 70221fe..181b891 100644 --- a/tests/test_etag.py +++ b/tests/test_etag.py @@ -78,41 +78,17 @@ class AnyETagTests(unittest.TestCase): etag = self._makeOne() self.assertEqual(etag.__nonzero__(), False) - def test___contains__None(self): - etag = self._makeOne() - self.assertEqual(etag.__contains__(None), True) - - def test___contains__empty_list(self): - etag = self._makeOne() - self.assertEqual(etag.__contains__([]), True) - - def test___contains__empty_string(self): - etag = self._makeOne() - self.assertEqual(etag.__contains__(''), True) - def test___contains__something(self): etag = self._makeOne() - self.assertEqual(etag.__contains__('something'), True) - - def test_weak_match_None(self): - etag = self._makeOne() - self.assertEqual(etag.weak_match(None), True) - - def test_weak_match_empty_list(self): - etag = self._makeOne() - self.assertEqual(etag.weak_match([]), True) - - def test_weak_match_empty_string(self): - etag = self._makeOne() - self.assertEqual(etag.weak_match(''), True) + self.assertEqual('anything' in etag, True) def test_weak_match_something(self): etag = self._makeOne() - self.assertEqual(etag.weak_match('something'), True) + self.assertEqual(etag.weak_match('anything'), True) def test___str__(self): etag = self._makeOne() - self.assertEqual(etag.__str__(), '*') + self.assertEqual(str(etag), '*') class NoETagTests(unittest.TestCase): def _getTargetClass(self): @@ -130,41 +106,21 @@ class NoETagTests(unittest.TestCase): etag = self._makeOne() self.assertEqual(etag.__nonzero__(), False) - def test___contains__None(self): - etag = self._makeOne() - self.assertEqual(etag.__contains__(None), False) - - def test___contains__empty_list(self): - etag = self._makeOne() - self.assertEqual(etag.__contains__([]), False) - - def test___contains__empty_string(self): - etag = self._makeOne() - self.assertEqual(etag.__contains__(''), False) - def test___contains__something(self): etag = self._makeOne() - self.assertEqual(etag.__contains__('something'), False) + assert 'anything' not in etag def test_weak_match_None(self): etag = self._makeOne() self.assertEqual(etag.weak_match(None), False) - def test_weak_match_empty_list(self): - etag = self._makeOne() - self.assertEqual(etag.weak_match([]), False) - - def test_weak_match_empty_string(self): - etag = self._makeOne() - self.assertEqual(etag.weak_match(''), False) - def test_weak_match_something(self): etag = self._makeOne() - self.assertEqual(etag.weak_match('something'), False) + assert not etag.weak_match('anything') def test___str__(self): etag = self._makeOne() - self.assertEqual(etag.__str__(), '') + self.assertEqual(str(etag), '') class ETagMatcherTests(unittest.TestCase): def _getTargetClass(self): @@ -335,15 +291,15 @@ class IfRangeTests(unittest.TestCase): def test___str__(self): ir = self._makeOne() - self.assertEqual(ir.__str__(), '') + self.assertEqual(str(ir), '') def test___str__etag(self): ir = self._makeOne(etag='ETAG', date='Fri, 09 Nov 2001 01:08:47 -0000') - self.assertEqual(ir.__str__(), 'ETAG') + self.assertEqual(str(ir), 'ETAG') def test___str__date(self): ir = self._makeOne(date='Fri, 09 Nov 2001 01:08:47 -0000') - self.assertEqual(ir.__str__(), 'Fri, 09 Nov 2001 01:08:47 -0000') + self.assertEqual(str(ir), 'Fri, 09 Nov 2001 01:08:47 -0000') def test_match(self): ir = self._makeOne() @@ -428,7 +384,7 @@ class NoIfRangeTests(unittest.TestCase): def test___str__(self): ir = self._makeOne() - self.assertEquals(ir.__str__(), '') + self.assertEquals(str(ir), '') def test___nonzero__(self): ir = self._makeOne() diff --git a/tests/test_multidict.py b/tests/test_multidict.py index 5948723..a93fdf8 100644 --- a/tests/test_multidict.py +++ b/tests/test_multidict.py @@ -220,8 +220,8 @@ class NestedMultiDictTestCase(BaseDictTests, unittest.TestCase): def test_contains(self): d = self._get_instance() - self.assertEquals(d.__contains__('a'), True) - self.assertEquals(d.__contains__('z'), False) + assert 'a' in d + assert 'z' not in d def test_add(self): d = self._get_instance() @@ -376,7 +376,7 @@ class NoVarsTestCase(unittest.TestCase): def test_contains(self): d = self._get_instance() - self.assertEqual(d.__contains__('a'), False) + assert 'a' not in d def test_copy(self): d = self._get_instance() @@ -403,7 +403,7 @@ class DummyField(object): self.name = name self.value = value self.filename = filename - + class DummyFieldStorage(object): def __init__(self, name, value, filename=None): self.list = [DummyField(name, value, filename)] |