Skip to content

Commit ab6fd65

Browse files
vmuriartvmuriart
committed
Fix tests comparison to None, True, False, isinstance
- Replace type(()) with tuple to clarify intent
1 parent dce7554 commit ab6fd65

13 files changed

+177
-177
lines changed

‎src/tests/test_array.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -127,17 +127,17 @@ def test_boolean_array(self):
127127

128128
self.assertTrue(len(items) == 5)
129129

130-
self.assertTrue(items[0] == True)
131-
self.assertTrue(items[1] == False)
132-
self.assertTrue(items[2] == True)
133-
self.assertTrue(items[3] == False)
134-
self.assertTrue(items[4] == True)
130+
self.assertTrue(items[0] is True)
131+
self.assertTrue(items[1] is False)
132+
self.assertTrue(items[2] is True)
133+
self.assertTrue(items[3] is False)
134+
self.assertTrue(items[4] is True)
135135

136136
items[0] = False
137-
self.assertTrue(items[0] == False)
137+
self.assertTrue(items[0] is False)
138138

139139
items[0] = True
140-
self.assertTrue(items[0] == True)
140+
self.assertTrue(items[0] is True)
141141

142142
with self.assertRaises(TypeError):
143143
ob = Test.ByteArrayTest()
@@ -700,7 +700,7 @@ def test_object_array(self):
700700
self.assertTrue(items[0] == 99)
701701

702702
items[0] = None
703-
self.assertTrue(items[0] == None)
703+
self.assertTrue(items[0] is None)
704704

705705
with self.assertRaises(TypeError):
706706
ob = Test.ObjectArrayTest()
@@ -717,20 +717,20 @@ def test_null_array(self):
717717

718718
self.assertTrue(len(items) == 5)
719719

720-
self.assertTrue(items[0] == None)
721-
self.assertTrue(items[4] == None)
720+
self.assertTrue(items[0] is None)
721+
self.assertTrue(items[4] is None)
722722

723723
items[0] = "spam"
724724
self.assertTrue(items[0] == "spam")
725725

726726
items[0] = None
727-
self.assertTrue(items[0] == None)
727+
self.assertTrue(items[0] is None)
728728

729729
items[-4] = "spam"
730730
self.assertTrue(items[-4] == "spam")
731731

732732
items[-1] = None
733-
self.assertTrue(items[-1] == None)
733+
self.assertTrue(items[-1] is None)
734734

735735
empty = ob.empty
736736
self.assertTrue(len(empty) == 0)
@@ -763,7 +763,7 @@ def test_interface_array(self):
763763
self.assertTrue(items[-1].GetValue() == "0")
764764

765765
items[0] = None
766-
self.assertTrue(items[0] == None)
766+
self.assertTrue(items[0] is None)
767767

768768
with self.assertRaises(TypeError):
769769
ob = Test.InterfaceArrayTest()
@@ -801,7 +801,7 @@ def test_typed_array(self):
801801
self.assertTrue(items[-1].GetValue() == "0")
802802

803803
items[0] = None
804-
self.assertTrue(items[0] == None)
804+
self.assertTrue(items[0] is None)
805805

806806
with self.assertRaises(TypeError):
807807
ob = Test.TypedArrayTest()
@@ -889,7 +889,7 @@ def test_array_iteration(self):
889889
items = Test.NullArrayTest().items
890890

891891
for i in items:
892-
self.assertTrue(i == None)
892+
self.assertTrue(i is None)
893893

894894
empty = Test.NullArrayTest().empty
895895

@@ -1008,7 +1008,7 @@ def test_tuple_array_conversion_type_checking(self):
10081008
result = ArrayConversionTest.EchoRange(items)
10091009

10101010
self.assertTrue(result[0].__class__ == Spam)
1011-
self.assertTrue(result[1] == None)
1011+
self.assertTrue(result[1] is None)
10121012
self.assertTrue(len(result) == 10)
10131013

10141014
with self.assertRaises(TypeError):
@@ -1037,7 +1037,7 @@ def test_list_array_conversion_type_checking(self):
10371037
result = ArrayConversionTest.EchoRange(items)
10381038

10391039
self.assertTrue(result[0].__class__ == Spam)
1040-
self.assertTrue(result[1] == None)
1040+
self.assertTrue(result[1] is None)
10411041
self.assertTrue(len(result) == 10)
10421042

10431043
with self.assertRaises(TypeError):
@@ -1064,7 +1064,7 @@ def test_sequence_array_conversion_type_checking(self):
10641064
result = ArrayConversionTest.EchoRange(items)
10651065

10661066
self.assertTrue(result[0].__class__ == Spam)
1067-
self.assertTrue(result[1] == None)
1067+
self.assertTrue(result[1] is None)
10681068
self.assertTrue(len(result) == 10)
10691069

10701070
with self.assertRaises(TypeError):
@@ -1143,13 +1143,13 @@ def test_special_array_creation(self):
11431143
inst = InterfaceTest()
11441144

11451145
value = Array[System.Boolean]([True, True])
1146-
self.assertTrue(value[0] == True)
1147-
self.assertTrue(value[1] == True)
1146+
self.assertTrue(value[0] is True)
1147+
self.assertTrue(value[1] is True)
11481148
self.assertTrue(value.Length == 2)
11491149

11501150
value = Array[bool]([True, True])
1151-
self.assertTrue(value[0] == True)
1152-
self.assertTrue(value[1] == True)
1151+
self.assertTrue(value[0] is True)
1152+
self.assertTrue(value[1] is True)
11531153
self.assertTrue(value.Length == 2)
11541154

11551155
value = Array[System.Byte]([0, 255])

‎src/tests/test_class.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def test_class_standard_attrs(self):
2626

2727
self.assertTrue(ClassTest.__name__ == 'ClassTest')
2828
self.assertTrue(ClassTest.__module__ == 'Python.Test')
29-
self.assertTrue(type(ClassTest.__dict__) == DictProxyType)
29+
self.assertTrue(isinstance(ClassTest.__dict__, DictProxyType))
3030
self.assertTrue(len(ClassTest.__doc__) > 0)
3131

3232
def test_class_docstrings(self):

‎src/tests/test_compat.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ def test_simple_import(self):
2020
self.assertTrue(CLR.__name__ == 'clr')
2121

2222
import sys
23-
self.assertTrue(type(sys) == types.ModuleType)
23+
self.assertTrue(isinstance(sys, types.ModuleType))
2424
self.assertTrue(sys.__name__ == 'sys')
2525

2626
if PY3:
2727
import http.client
28-
self.assertTrue(type(http.client) == types.ModuleType)
28+
self.assertTrue(isinstance(http.client, types.ModuleType))
2929
self.assertTrue(http.client.__name__ == 'http.client')
3030

3131
elif PY2:
3232
import httplib
33-
self.assertTrue(type(httplib) == types.ModuleType)
33+
self.assertTrue(isinstance(httplib, types.ModuleType))
3434
self.assertTrue(httplib.__name__ == 'httplib')
3535

3636
def test_simple_import_with_alias(self):
@@ -40,17 +40,17 @@ def test_simple_import_with_alias(self):
4040
self.assertTrue(myCLR.__name__ == 'clr')
4141

4242
import sys as mySys
43-
self.assertTrue(type(mySys) == types.ModuleType)
43+
self.assertTrue(isinstance(mySys, types.ModuleType))
4444
self.assertTrue(mySys.__name__ == 'sys')
4545

4646
if PY3:
4747
import http.client as myHttplib
48-
self.assertTrue(type(myHttplib) == types.ModuleType)
48+
self.assertTrue(isinstance(myHttplib, types.ModuleType))
4949
self.assertTrue(myHttplib.__name__ == 'http.client')
5050

5151
elif PY2:
5252
import httplib as myHttplib
53-
self.assertTrue(type(myHttplib) == types.ModuleType)
53+
self.assertTrue(isinstance(myHttplib, types.ModuleType))
5454
self.assertTrue(myHttplib.__name__ == 'httplib')
5555

5656
def test_dotted_name_import(self):
@@ -66,7 +66,7 @@ def test_dotted_name_import(self):
6666
self.assertTrue(System is CLR.System)
6767

6868
import xml.dom
69-
self.assertTrue(type(xml.dom) == types.ModuleType)
69+
self.assertTrue(isinstance(xml.dom, types.ModuleType))
7070
self.assertTrue(xml.dom.__name__ == 'xml.dom')
7171

7272
def test_dotted_name_import_with_alias(self):
@@ -82,7 +82,7 @@ def test_dotted_name_import_with_alias(self):
8282
self.assertTrue(mySystem is myCLRSystem)
8383

8484
import xml.dom as myDom
85-
self.assertTrue(type(myDom) == types.ModuleType)
85+
self.assertTrue(isinstance(myDom, types.ModuleType))
8686
self.assertTrue(myDom.__name__ == 'xml.dom')
8787

8888
def test_simple_import_from(self):
@@ -92,7 +92,7 @@ def test_simple_import_from(self):
9292
self.assertTrue(System.__name__ == 'System')
9393

9494
from xml import dom
95-
self.assertTrue(type(dom) == types.ModuleType)
95+
self.assertTrue(isinstance(dom, types.ModuleType))
9696
self.assertTrue(dom.__name__ == 'xml.dom')
9797

9898
def test_simple_import_from_with_alias(self):
@@ -102,7 +102,7 @@ def test_simple_import_from_with_alias(self):
102102
self.assertTrue(mySystem.__name__ == 'System')
103103

104104
from xml import dom as myDom
105-
self.assertTrue(type(myDom) == types.ModuleType)
105+
self.assertTrue(isinstance(myDom, types.ModuleType))
106106
self.assertTrue(myDom.__name__ == 'xml.dom')
107107

108108
def test_dotted_name_import_from(self):
@@ -116,11 +116,11 @@ def test_dotted_name_import_from(self):
116116
self.assertTrue(XmlDocument.__name__ == 'XmlDocument')
117117

118118
from xml.dom import pulldom
119-
self.assertTrue(type(pulldom) == types.ModuleType)
119+
self.assertTrue(isinstance(pulldom, types.ModuleType))
120120
self.assertTrue(pulldom.__name__ == 'xml.dom.pulldom')
121121

122122
from xml.dom.pulldom import PullDOM
123-
self.assertTrue(type(PullDOM) == ClassType)
123+
self.assertTrue(isinstance(PullDOM, ClassType))
124124
self.assertTrue(PullDOM.__name__ == 'PullDOM')
125125

126126
def test_dotted_name_import_from_with_alias(self):
@@ -134,11 +134,11 @@ def test_dotted_name_import_from_with_alias(self):
134134
self.assertTrue(myXmlDocument.__name__ == 'XmlDocument')
135135

136136
from xml.dom import pulldom as myPulldom
137-
self.assertTrue(type(myPulldom) == types.ModuleType)
137+
self.assertTrue(isinstance(myPulldom, types.ModuleType))
138138
self.assertTrue(myPulldom.__name__ == 'xml.dom.pulldom')
139139

140140
from xml.dom.pulldom import PullDOM as myPullDOM
141-
self.assertTrue(type(myPullDOM) == ClassType)
141+
self.assertTrue(isinstance(myPullDOM, ClassType))
142142
self.assertTrue(myPullDOM.__name__ == 'PullDOM')
143143

144144
def test_from_module_import_star(self):
@@ -163,13 +163,13 @@ def test_explicit_assembly_load(self):
163163
import sys
164164

165165
assembly = Assembly.LoadWithPartialName('System.Data')
166-
self.assertTrue(assembly != None)
166+
self.assertTrue(assembly is not None)
167167

168168
import CLR.System.Data
169169
self.assertTrue('System.Data' in sys.modules)
170170

171171
assembly = Assembly.LoadWithPartialName('SpamSpamSpamSpamEggsAndSpam')
172-
self.assertTrue(assembly == None)
172+
self.assertTrue(assembly is None)
173173

174174
def test_implicit_load_already_valid_namespace(self):
175175
"""Test implicit assembly load over an already valid namespace."""

‎src/tests/test_conversion.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,52 +14,52 @@ class ConversionTests(unittest.TestCase):
1414
def test_bool_conversion(self):
1515
"""Test bool conversion."""
1616
ob = ConversionTest()
17-
self.assertTrue(ob.BooleanField == False)
17+
self.assertTrue(ob.BooleanField is False)
1818
self.assertTrue(ob.BooleanField is False)
1919
self.assertTrue(ob.BooleanField == 0)
2020

2121
ob.BooleanField = True
22-
self.assertTrue(ob.BooleanField == True)
22+
self.assertTrue(ob.BooleanField is True)
2323
self.assertTrue(ob.BooleanField is True)
2424
self.assertTrue(ob.BooleanField == 1)
2525

2626
ob.BooleanField = False
27-
self.assertTrue(ob.BooleanField == False)
27+
self.assertTrue(ob.BooleanField is False)
2828
self.assertTrue(ob.BooleanField is False)
2929
self.assertTrue(ob.BooleanField == 0)
3030

3131
ob.BooleanField = 1
32-
self.assertTrue(ob.BooleanField == True)
32+
self.assertTrue(ob.BooleanField is True)
3333
self.assertTrue(ob.BooleanField is True)
3434
self.assertTrue(ob.BooleanField == 1)
3535

3636
ob.BooleanField = 0
37-
self.assertTrue(ob.BooleanField == False)
37+
self.assertTrue(ob.BooleanField is False)
3838
self.assertTrue(ob.BooleanField is False)
3939
self.assertTrue(ob.BooleanField == 0)
4040

4141
ob.BooleanField = System.Boolean(None)
42-
self.assertTrue(ob.BooleanField == False)
42+
self.assertTrue(ob.BooleanField is False)
4343
self.assertTrue(ob.BooleanField is False)
4444
self.assertTrue(ob.BooleanField == 0)
4545

4646
ob.BooleanField = System.Boolean('')
47-
self.assertTrue(ob.BooleanField == False)
47+
self.assertTrue(ob.BooleanField is False)
4848
self.assertTrue(ob.BooleanField is False)
4949
self.assertTrue(ob.BooleanField == 0)
5050

5151
ob.BooleanField = System.Boolean(0)
52-
self.assertTrue(ob.BooleanField == False)
52+
self.assertTrue(ob.BooleanField is False)
5353
self.assertTrue(ob.BooleanField is False)
5454
self.assertTrue(ob.BooleanField == 0)
5555

5656
ob.BooleanField = System.Boolean(1)
57-
self.assertTrue(ob.BooleanField == True)
57+
self.assertTrue(ob.BooleanField is True)
5858
self.assertTrue(ob.BooleanField is True)
5959
self.assertTrue(ob.BooleanField == 1)
6060

6161
ob.BooleanField = System.Boolean('a')
62-
self.assertTrue(ob.BooleanField == True)
62+
self.assertTrue(ob.BooleanField is True)
6363
self.assertTrue(ob.BooleanField is True)
6464
self.assertTrue(ob.BooleanField == 1)
6565

@@ -531,7 +531,7 @@ def test_string_conversion(self):
531531
self.assertTrue(ob.StringField == u'\uffff\uffff')
532532

533533
ob.StringField = None
534-
self.assertTrue(ob.StringField == None)
534+
self.assertTrue(ob.StringField is None)
535535

536536
with self.assertRaises(TypeError):
537537
ConversionTest().StringField = 1
@@ -552,7 +552,7 @@ def test_interface_conversion(self):
552552
# need to test spam subclass here.
553553

554554
ob.SpamField = None
555-
self.assertTrue(ob.SpamField == None)
555+
self.assertTrue(ob.SpamField is None)
556556

557557
with self.assertRaises(TypeError):
558558
ob = ConversionTest()
@@ -567,14 +567,14 @@ def test_object_conversion(self):
567567
from Python.Test import Spam
568568

569569
ob = ConversionTest()
570-
self.assertTrue(ob.ObjectField == None)
570+
self.assertTrue(ob.ObjectField is None)
571571

572572
ob.ObjectField = Spam("eggs")
573573
self.assertTrue(ob.ObjectField.__class__.__name__ == "Spam")
574574
self.assertTrue(ob.ObjectField.GetValue() == "eggs")
575575

576576
ob.ObjectField = None
577-
self.assertTrue(ob.ObjectField == None)
577+
self.assertTrue(ob.ObjectField is None)
578578

579579
ob.ObjectField = System.String("spam")
580580
self.assertTrue(ob.ObjectField == "spam")
@@ -627,13 +627,13 @@ def test_null_conversion(self):
627627
ob = ConversionTest()
628628

629629
ob.StringField = None
630-
self.assertTrue(ob.StringField == None)
630+
self.assertTrue(ob.StringField is None)
631631

632632
ob.ObjectField = None
633-
self.assertTrue(ob.ObjectField == None)
633+
self.assertTrue(ob.ObjectField is None)
634634

635635
ob.SpamField = None
636-
self.assertTrue(ob.SpamField == None)
636+
self.assertTrue(ob.SpamField is None)
637637

638638
# Primitive types and enums should not be set to null.
639639

@@ -647,7 +647,7 @@ def test_byte_array_conversion(self):
647647
"""Test byte array conversion."""
648648
ob = ConversionTest()
649649

650-
self.assertTrue(ob.ByteArrayField == None)
650+
self.assertTrue(ob.ByteArrayField is None)
651651

652652
ob.ByteArrayField = [0, 1, 2, 3, 4]
653653
array = ob.ByteArrayField
@@ -665,7 +665,7 @@ def test_sbyte_array_conversion(self):
665665
"""Test sbyte array conversion."""
666666
ob = ConversionTest()
667667

668-
self.assertTrue(ob.SByteArrayField == None)
668+
self.assertTrue(ob.SByteArrayField is None)
669669

670670
ob.SByteArrayField = [0, 1, 2, 3, 4]
671671
array = ob.SByteArrayField

0 commit comments

Comments
 (0)