Skip to content

Clean-up Tests #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vmuriart wants to merge 14 commits into from
Closed

Clean-up Tests #329

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0ea7455
Clean-up tests & remove warnfilter
vmuriart Jan 22, 2017
0e26b1a
Sanitize how to run tests
vmuriart Jan 22, 2017
8f29544
Remove dependency on six
vmuriart Jan 22, 2017
30470bb
Clean-up imports
vmuriart Jan 22, 2017
d79db2d
Fix nameclash object
vmuriart Jan 22, 2017
072219c
Refactor utility functions
vmuriart Jan 22, 2017
5206a46
Rename tests
vmuriart Jan 22, 2017
2ef3041
Refactor assertRaises
vmuriart Jan 22, 2017
8c3fe2b
Format for pep8 and linters
vmuriart Jan 22, 2017
c583053
Fix tests comparison to None, True, False, isinstance
vmuriart Jan 22, 2017
4350ac3
Rename test fixtures
vmuriart Jan 22, 2017
2ae78cc
Remove unused `using` from testing and format
vmuriart Jan 22, 2017
b4e8d97
Use unittest.skip(...)
vmuriart Jan 22, 2017
5f163ef
Merge branch 'master' into unittests
filmor Jan 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix tests comparison to None, True, False, isinstance 
- Replace type(()) with tuple to clarify intent
  • Loading branch information
@vmuriart
vmuriart committed Jan 31, 2017
commit c583053c5a699e6300813d85a01357248436501d
44 changes: 22 additions & 22 deletions src/tests/test_array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,17 +127,17 @@ def test_boolean_array(self):

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

self.assertTrue(items[0] == True)
self.assertTrue(items[1] == False)
self.assertTrue(items[2] == True)
self.assertTrue(items[3] == False)
self.assertTrue(items[4] == True)
self.assertTrue(items[0] is True)
self.assertTrue(items[1] is False)
self.assertTrue(items[2] is True)
self.assertTrue(items[3] is False)
self.assertTrue(items[4] is True)

items[0] = False
self.assertTrue(items[0] == False)
self.assertTrue(items[0] is False)

items[0] = True
self.assertTrue(items[0] == True)
self.assertTrue(items[0] is True)

with self.assertRaises(TypeError):
ob = Test.ByteArrayTest()
Expand Down Expand Up @@ -700,7 +700,7 @@ def test_object_array(self):
self.assertTrue(items[0] == 99)

items[0] = None
self.assertTrue(items[0] == None)
self.assertTrue(items[0] is None)

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

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

self.assertTrue(items[0] == None)
self.assertTrue(items[4] == None)
self.assertTrue(items[0] is None)
self.assertTrue(items[4] is None)

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

items[0] = None
self.assertTrue(items[0] == None)
self.assertTrue(items[0] is None)

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

items[-1] = None
self.assertTrue(items[-1] == None)
self.assertTrue(items[-1] is None)

empty = ob.empty
self.assertTrue(len(empty) == 0)
Expand Down Expand Up @@ -763,7 +763,7 @@ def test_interface_array(self):
self.assertTrue(items[-1].GetValue() == "0")

items[0] = None
self.assertTrue(items[0] == None)
self.assertTrue(items[0] is None)

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

items[0] = None
self.assertTrue(items[0] == None)
self.assertTrue(items[0] is None)

with self.assertRaises(TypeError):
ob = Test.TypedArrayTest()
Expand Down Expand Up @@ -889,7 +889,7 @@ def test_array_iteration(self):
items = Test.NullArrayTest().items

for i in items:
self.assertTrue(i == None)
self.assertTrue(i is None)

empty = Test.NullArrayTest().empty

Expand Down Expand Up @@ -1008,7 +1008,7 @@ def test_tuple_array_conversion_type_checking(self):
result = ArrayConversionTest.EchoRange(items)

self.assertTrue(result[0].__class__ == Spam)
self.assertTrue(result[1] == None)
self.assertTrue(result[1] is None)
self.assertTrue(len(result) == 10)

with self.assertRaises(TypeError):
Expand Down Expand Up @@ -1037,7 +1037,7 @@ def test_list_array_conversion_type_checking(self):
result = ArrayConversionTest.EchoRange(items)

self.assertTrue(result[0].__class__ == Spam)
self.assertTrue(result[1] == None)
self.assertTrue(result[1] is None)
self.assertTrue(len(result) == 10)

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

self.assertTrue(result[0].__class__ == Spam)
self.assertTrue(result[1] == None)
self.assertTrue(result[1] is None)
self.assertTrue(len(result) == 10)

with self.assertRaises(TypeError):
Expand Down Expand Up @@ -1143,13 +1143,13 @@ def test_special_array_creation(self):
inst = InterfaceTest()

value = Array[System.Boolean]([True, True])
self.assertTrue(value[0] == True)
self.assertTrue(value[1] == True)
self.assertTrue(value[0] is True)
self.assertTrue(value[1] is True)
self.assertTrue(value.Length == 2)

value = Array[bool]([True, True])
self.assertTrue(value[0] == True)
self.assertTrue(value[1] == True)
self.assertTrue(value[0] is True)
self.assertTrue(value[1] is True)
self.assertTrue(value.Length == 2)

value = Array[System.Byte]([0, 255])
Expand Down
2 changes: 1 addition & 1 deletion src/tests/test_class.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def test_class_standard_attrs(self):

self.assertTrue(ClassTest.__name__ == 'ClassTest')
self.assertTrue(ClassTest.__module__ == 'Python.Test')
self.assertTrue(type(ClassTest.__dict__) == DictProxyType)
self.assertTrue(isinstance(ClassTest.__dict__, DictProxyType))
self.assertTrue(len(ClassTest.__doc__) > 0)

def test_class_docstrings(self):
Expand Down
32 changes: 16 additions & 16 deletions src/tests/test_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ def test_simple_import(self):
self.assertTrue(CLR.__name__ == 'clr')

import sys
self.assertTrue(type(sys) == types.ModuleType)
self.assertTrue(isinstance(sys, types.ModuleType))
self.assertTrue(sys.__name__ == 'sys')

if PY3:
import http.client
self.assertTrue(type(http.client) == types.ModuleType)
self.assertTrue(isinstance(http.client, types.ModuleType))
self.assertTrue(http.client.__name__ == 'http.client')

elif PY2:
import httplib
self.assertTrue(type(httplib) == types.ModuleType)
self.assertTrue(isinstance(httplib, types.ModuleType))
self.assertTrue(httplib.__name__ == 'httplib')

def test_simple_import_with_alias(self):
Expand All @@ -40,17 +40,17 @@ def test_simple_import_with_alias(self):
self.assertTrue(myCLR.__name__ == 'clr')

import sys as mySys
self.assertTrue(type(mySys) == types.ModuleType)
self.assertTrue(isinstance(mySys, types.ModuleType))
self.assertTrue(mySys.__name__ == 'sys')

if PY3:
import http.client as myHttplib
self.assertTrue(type(myHttplib) == types.ModuleType)
self.assertTrue(isinstance(myHttplib, types.ModuleType))
self.assertTrue(myHttplib.__name__ == 'http.client')

elif PY2:
import httplib as myHttplib
self.assertTrue(type(myHttplib) == types.ModuleType)
self.assertTrue(isinstance(myHttplib, types.ModuleType))
self.assertTrue(myHttplib.__name__ == 'httplib')

def test_dotted_name_import(self):
Expand All @@ -66,7 +66,7 @@ def test_dotted_name_import(self):
self.assertTrue(System is CLR.System)

import xml.dom
self.assertTrue(type(xml.dom) == types.ModuleType)
self.assertTrue(isinstance(xml.dom, types.ModuleType))
self.assertTrue(xml.dom.__name__ == 'xml.dom')

def test_dotted_name_import_with_alias(self):
Expand All @@ -82,7 +82,7 @@ def test_dotted_name_import_with_alias(self):
self.assertTrue(mySystem is myCLRSystem)

import xml.dom as myDom
self.assertTrue(type(myDom) == types.ModuleType)
self.assertTrue(isinstance(myDom, types.ModuleType))
self.assertTrue(myDom.__name__ == 'xml.dom')

def test_simple_import_from(self):
Expand All @@ -92,7 +92,7 @@ def test_simple_import_from(self):
self.assertTrue(System.__name__ == 'System')

from xml import dom
self.assertTrue(type(dom) == types.ModuleType)
self.assertTrue(isinstance(dom, types.ModuleType))
self.assertTrue(dom.__name__ == 'xml.dom')

def test_simple_import_from_with_alias(self):
Expand All @@ -102,7 +102,7 @@ def test_simple_import_from_with_alias(self):
self.assertTrue(mySystem.__name__ == 'System')

from xml import dom as myDom
self.assertTrue(type(myDom) == types.ModuleType)
self.assertTrue(isinstance(myDom, types.ModuleType))
self.assertTrue(myDom.__name__ == 'xml.dom')

def test_dotted_name_import_from(self):
Expand All @@ -116,11 +116,11 @@ def test_dotted_name_import_from(self):
self.assertTrue(XmlDocument.__name__ == 'XmlDocument')

from xml.dom import pulldom
self.assertTrue(type(pulldom) == types.ModuleType)
self.assertTrue(isinstance(pulldom, types.ModuleType))
self.assertTrue(pulldom.__name__ == 'xml.dom.pulldom')

from xml.dom.pulldom import PullDOM
self.assertTrue(type(PullDOM) == ClassType)
self.assertTrue(isinstance(PullDOM, ClassType))
self.assertTrue(PullDOM.__name__ == 'PullDOM')

def test_dotted_name_import_from_with_alias(self):
Expand All @@ -134,11 +134,11 @@ def test_dotted_name_import_from_with_alias(self):
self.assertTrue(myXmlDocument.__name__ == 'XmlDocument')

from xml.dom import pulldom as myPulldom
self.assertTrue(type(myPulldom) == types.ModuleType)
self.assertTrue(isinstance(myPulldom, types.ModuleType))
self.assertTrue(myPulldom.__name__ == 'xml.dom.pulldom')

from xml.dom.pulldom import PullDOM as myPullDOM
self.assertTrue(type(myPullDOM) == ClassType)
self.assertTrue(isinstance(myPullDOM, ClassType))
self.assertTrue(myPullDOM.__name__ == 'PullDOM')

def test_from_module_import_star(self):
Expand All @@ -163,13 +163,13 @@ def test_explicit_assembly_load(self):
import sys

assembly = Assembly.LoadWithPartialName('System.Data')
self.assertTrue(assembly != None)
self.assertTrue(assembly is not None)

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

assembly = Assembly.LoadWithPartialName('SpamSpamSpamSpamEggsAndSpam')
self.assertTrue(assembly == None)
self.assertTrue(assembly is None)

def test_implicit_load_already_valid_namespace(self):
"""Test implicit assembly load over an already valid namespace."""
Expand Down
38 changes: 19 additions & 19 deletions src/tests/test_conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,52 +14,52 @@ class ConversionTests(unittest.TestCase):
def test_bool_conversion(self):
"""Test bool conversion."""
ob = ConversionTest()
self.assertTrue(ob.BooleanField == False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField == 0)

ob.BooleanField = True
self.assertTrue(ob.BooleanField == True)
self.assertTrue(ob.BooleanField is True)
self.assertTrue(ob.BooleanField is True)
self.assertTrue(ob.BooleanField == 1)

ob.BooleanField = False
self.assertTrue(ob.BooleanField == False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField == 0)

ob.BooleanField = 1
self.assertTrue(ob.BooleanField == True)
self.assertTrue(ob.BooleanField is True)
self.assertTrue(ob.BooleanField is True)
self.assertTrue(ob.BooleanField == 1)

ob.BooleanField = 0
self.assertTrue(ob.BooleanField == False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField == 0)

ob.BooleanField = System.Boolean(None)
self.assertTrue(ob.BooleanField == False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField == 0)

ob.BooleanField = System.Boolean('')
self.assertTrue(ob.BooleanField == False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField == 0)

ob.BooleanField = System.Boolean(0)
self.assertTrue(ob.BooleanField == False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField is False)
self.assertTrue(ob.BooleanField == 0)

ob.BooleanField = System.Boolean(1)
self.assertTrue(ob.BooleanField == True)
self.assertTrue(ob.BooleanField is True)
self.assertTrue(ob.BooleanField is True)
self.assertTrue(ob.BooleanField == 1)

ob.BooleanField = System.Boolean('a')
self.assertTrue(ob.BooleanField == True)
self.assertTrue(ob.BooleanField is True)
self.assertTrue(ob.BooleanField is True)
self.assertTrue(ob.BooleanField == 1)

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

ob.StringField = None
self.assertTrue(ob.StringField == None)
self.assertTrue(ob.StringField is None)

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

ob.SpamField = None
self.assertTrue(ob.SpamField == None)
self.assertTrue(ob.SpamField is None)

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

ob = ConversionTest()
self.assertTrue(ob.ObjectField == None)
self.assertTrue(ob.ObjectField is None)

ob.ObjectField = Spam("eggs")
self.assertTrue(ob.ObjectField.__class__.__name__ == "Spam")
self.assertTrue(ob.ObjectField.GetValue() == "eggs")

ob.ObjectField = None
self.assertTrue(ob.ObjectField == None)
self.assertTrue(ob.ObjectField is None)

ob.ObjectField = System.String("spam")
self.assertTrue(ob.ObjectField == "spam")
Expand Down Expand Up @@ -627,13 +627,13 @@ def test_null_conversion(self):
ob = ConversionTest()

ob.StringField = None
self.assertTrue(ob.StringField == None)
self.assertTrue(ob.StringField is None)

ob.ObjectField = None
self.assertTrue(ob.ObjectField == None)
self.assertTrue(ob.ObjectField is None)

ob.SpamField = None
self.assertTrue(ob.SpamField == None)
self.assertTrue(ob.SpamField is None)

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

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

self.assertTrue(ob.ByteArrayField == None)
self.assertTrue(ob.ByteArrayField is None)

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

self.assertTrue(ob.SByteArrayField == None)
self.assertTrue(ob.SByteArrayField is None)

ob.SByteArrayField = [0, 1, 2, 3, 4]
array = ob.SByteArrayField
Expand Down
Loading