mirror of
https://github.com/python/cpython.git
synced 2025-11-03 03:22:27 +00:00
use assert[Not]In where appropriate
This commit is contained in:
parent
8cd0a66a0f
commit
aa98058cc4
86 changed files with 622 additions and 599 deletions
|
|
@ -112,8 +112,8 @@ class TestPredicates(IsTestBase):
|
|||
x = C()
|
||||
x.a = 42
|
||||
members = dict(inspect.getmembers(x))
|
||||
self.assertTrue('a' in members)
|
||||
self.assertTrue('b' not in members)
|
||||
self.assertIn('a', members)
|
||||
self.assertNotIn('b', members)
|
||||
|
||||
def test_isabstract(self):
|
||||
from abc import ABCMeta, abstractmethod
|
||||
|
|
@ -442,23 +442,23 @@ class TestClassesAndFunctions(unittest.TestCase):
|
|||
datablob = '1'
|
||||
|
||||
attrs = attrs_wo_objs(A)
|
||||
self.assertTrue(('s', 'static method', A) in attrs, 'missing static method')
|
||||
self.assertTrue(('c', 'class method', A) in attrs, 'missing class method')
|
||||
self.assertTrue(('p', 'property', A) in attrs, 'missing property')
|
||||
self.assertTrue(('m', 'method', A) in attrs, 'missing plain method')
|
||||
self.assertTrue(('m1', 'method', A) in attrs, 'missing plain method')
|
||||
self.assertTrue(('datablob', 'data', A) in attrs, 'missing data')
|
||||
self.assertIn(('s', 'static method', A), attrs, 'missing static method')
|
||||
self.assertIn(('c', 'class method', A), attrs, 'missing class method')
|
||||
self.assertIn(('p', 'property', A), attrs, 'missing property')
|
||||
self.assertIn(('m', 'method', A), attrs, 'missing plain method')
|
||||
self.assertIn(('m1', 'method', A), attrs, 'missing plain method')
|
||||
self.assertIn(('datablob', 'data', A), attrs, 'missing data')
|
||||
|
||||
class B(A):
|
||||
def m(self): pass
|
||||
|
||||
attrs = attrs_wo_objs(B)
|
||||
self.assertTrue(('s', 'static method', A) in attrs, 'missing static method')
|
||||
self.assertTrue(('c', 'class method', A) in attrs, 'missing class method')
|
||||
self.assertTrue(('p', 'property', A) in attrs, 'missing property')
|
||||
self.assertTrue(('m', 'method', B) in attrs, 'missing plain method')
|
||||
self.assertTrue(('m1', 'method', A) in attrs, 'missing plain method')
|
||||
self.assertTrue(('datablob', 'data', A) in attrs, 'missing data')
|
||||
self.assertIn(('s', 'static method', A), attrs, 'missing static method')
|
||||
self.assertIn(('c', 'class method', A), attrs, 'missing class method')
|
||||
self.assertIn(('p', 'property', A), attrs, 'missing property')
|
||||
self.assertIn(('m', 'method', B), attrs, 'missing plain method')
|
||||
self.assertIn(('m1', 'method', A), attrs, 'missing plain method')
|
||||
self.assertIn(('datablob', 'data', A), attrs, 'missing data')
|
||||
|
||||
|
||||
class C(A):
|
||||
|
|
@ -466,23 +466,23 @@ class TestClassesAndFunctions(unittest.TestCase):
|
|||
def c(self): pass
|
||||
|
||||
attrs = attrs_wo_objs(C)
|
||||
self.assertTrue(('s', 'static method', A) in attrs, 'missing static method')
|
||||
self.assertTrue(('c', 'method', C) in attrs, 'missing plain method')
|
||||
self.assertTrue(('p', 'property', A) in attrs, 'missing property')
|
||||
self.assertTrue(('m', 'method', C) in attrs, 'missing plain method')
|
||||
self.assertTrue(('m1', 'method', A) in attrs, 'missing plain method')
|
||||
self.assertTrue(('datablob', 'data', A) in attrs, 'missing data')
|
||||
self.assertIn(('s', 'static method', A), attrs, 'missing static method')
|
||||
self.assertIn(('c', 'method', C), attrs, 'missing plain method')
|
||||
self.assertIn(('p', 'property', A), attrs, 'missing property')
|
||||
self.assertIn(('m', 'method', C), attrs, 'missing plain method')
|
||||
self.assertIn(('m1', 'method', A), attrs, 'missing plain method')
|
||||
self.assertIn(('datablob', 'data', A), attrs, 'missing data')
|
||||
|
||||
class D(B, C):
|
||||
def m1(self): pass
|
||||
|
||||
attrs = attrs_wo_objs(D)
|
||||
self.assertTrue(('s', 'static method', A) in attrs, 'missing static method')
|
||||
self.assertTrue(('c', 'class method', A) in attrs, 'missing class method')
|
||||
self.assertTrue(('p', 'property', A) in attrs, 'missing property')
|
||||
self.assertTrue(('m', 'method', B) in attrs, 'missing plain method')
|
||||
self.assertTrue(('m1', 'method', D) in attrs, 'missing plain method')
|
||||
self.assertTrue(('datablob', 'data', A) in attrs, 'missing data')
|
||||
self.assertIn(('s', 'static method', A), attrs, 'missing static method')
|
||||
self.assertIn(('c', 'class method', A), attrs, 'missing class method')
|
||||
self.assertIn(('p', 'property', A), attrs, 'missing property')
|
||||
self.assertIn(('m', 'method', B), attrs, 'missing plain method')
|
||||
self.assertIn(('m1', 'method', D), attrs, 'missing plain method')
|
||||
self.assertIn(('datablob', 'data', A), attrs, 'missing data')
|
||||
|
||||
# Repeat all that, but w/ new-style classes.
|
||||
def test_classify_newstyle(self):
|
||||
|
|
@ -504,24 +504,24 @@ class TestClassesAndFunctions(unittest.TestCase):
|
|||
datablob = '1'
|
||||
|
||||
attrs = attrs_wo_objs(A)
|
||||
self.assertTrue(('s', 'static method', A) in attrs, 'missing static method')
|
||||
self.assertTrue(('c', 'class method', A) in attrs, 'missing class method')
|
||||
self.assertTrue(('p', 'property', A) in attrs, 'missing property')
|
||||
self.assertTrue(('m', 'method', A) in attrs, 'missing plain method')
|
||||
self.assertTrue(('m1', 'method', A) in attrs, 'missing plain method')
|
||||
self.assertTrue(('datablob', 'data', A) in attrs, 'missing data')
|
||||
self.assertIn(('s', 'static method', A), attrs, 'missing static method')
|
||||
self.assertIn(('c', 'class method', A), attrs, 'missing class method')
|
||||
self.assertIn(('p', 'property', A), attrs, 'missing property')
|
||||
self.assertIn(('m', 'method', A), attrs, 'missing plain method')
|
||||
self.assertIn(('m1', 'method', A), attrs, 'missing plain method')
|
||||
self.assertIn(('datablob', 'data', A), attrs, 'missing data')
|
||||
|
||||
class B(A):
|
||||
|
||||
def m(self): pass
|
||||
|
||||
attrs = attrs_wo_objs(B)
|
||||
self.assertTrue(('s', 'static method', A) in attrs, 'missing static method')
|
||||
self.assertTrue(('c', 'class method', A) in attrs, 'missing class method')
|
||||
self.assertTrue(('p', 'property', A) in attrs, 'missing property')
|
||||
self.assertTrue(('m', 'method', B) in attrs, 'missing plain method')
|
||||
self.assertTrue(('m1', 'method', A) in attrs, 'missing plain method')
|
||||
self.assertTrue(('datablob', 'data', A) in attrs, 'missing data')
|
||||
self.assertIn(('s', 'static method', A), attrs, 'missing static method')
|
||||
self.assertIn(('c', 'class method', A), attrs, 'missing class method')
|
||||
self.assertIn(('p', 'property', A), attrs, 'missing property')
|
||||
self.assertIn(('m', 'method', B), attrs, 'missing plain method')
|
||||
self.assertIn(('m1', 'method', A), attrs, 'missing plain method')
|
||||
self.assertIn(('datablob', 'data', A), attrs, 'missing data')
|
||||
|
||||
|
||||
class C(A):
|
||||
|
|
@ -530,24 +530,24 @@ class TestClassesAndFunctions(unittest.TestCase):
|
|||
def c(self): pass
|
||||
|
||||
attrs = attrs_wo_objs(C)
|
||||
self.assertTrue(('s', 'static method', A) in attrs, 'missing static method')
|
||||
self.assertTrue(('c', 'method', C) in attrs, 'missing plain method')
|
||||
self.assertTrue(('p', 'property', A) in attrs, 'missing property')
|
||||
self.assertTrue(('m', 'method', C) in attrs, 'missing plain method')
|
||||
self.assertTrue(('m1', 'method', A) in attrs, 'missing plain method')
|
||||
self.assertTrue(('datablob', 'data', A) in attrs, 'missing data')
|
||||
self.assertIn(('s', 'static method', A), attrs, 'missing static method')
|
||||
self.assertIn(('c', 'method', C), attrs, 'missing plain method')
|
||||
self.assertIn(('p', 'property', A), attrs, 'missing property')
|
||||
self.assertIn(('m', 'method', C), attrs, 'missing plain method')
|
||||
self.assertIn(('m1', 'method', A), attrs, 'missing plain method')
|
||||
self.assertIn(('datablob', 'data', A), attrs, 'missing data')
|
||||
|
||||
class D(B, C):
|
||||
|
||||
def m1(self): pass
|
||||
|
||||
attrs = attrs_wo_objs(D)
|
||||
self.assertTrue(('s', 'static method', A) in attrs, 'missing static method')
|
||||
self.assertTrue(('c', 'method', C) in attrs, 'missing plain method')
|
||||
self.assertTrue(('p', 'property', A) in attrs, 'missing property')
|
||||
self.assertTrue(('m', 'method', B) in attrs, 'missing plain method')
|
||||
self.assertTrue(('m1', 'method', D) in attrs, 'missing plain method')
|
||||
self.assertTrue(('datablob', 'data', A) in attrs, 'missing data')
|
||||
self.assertIn(('s', 'static method', A), attrs, 'missing static method')
|
||||
self.assertIn(('c', 'method', C), attrs, 'missing plain method')
|
||||
self.assertIn(('p', 'property', A), attrs, 'missing property')
|
||||
self.assertIn(('m', 'method', B), attrs, 'missing plain method')
|
||||
self.assertIn(('m1', 'method', D), attrs, 'missing plain method')
|
||||
self.assertIn(('datablob', 'data', A), attrs, 'missing data')
|
||||
|
||||
def test_main():
|
||||
run_unittest(TestDecorators, TestRetrievingSourceCode, TestOneliners,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue