Skip to content
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

Jump to bottom

Fix running tests #37

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix running tests #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 20 additions & 20 deletions tests/chai_test.py → tests/test_chai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ class ChaiTest(unittest.TestCase):
def test_setup(self):
case = CupOf()
case.setup()
self.assertEquals( deque(), case._stubs )
self.assertEquals( deque(), case._mocks )
self.assertEqual( deque(), case._stubs )
self.assertEqual( deque(), case._mocks )

def test_teardown_closes_out_stubs_and_mocks(self):
class Stub(object):
Expand All @@ -76,8 +76,8 @@ def teardown(self): self.calls += 1
case._stubs = deque([stub])
case._mocks = deque([(obj,'mock1','fee'), (obj,'mock2')])
case.teardown()
self.assertEquals( 1, stub.calls )
self.assertEquals( 'fee', obj.mock1 )
self.assertEqual( 1, stub.calls )
self.assertEqual( 'fee', obj.mock1 )
self.assertFalse( hasattr(obj, 'mock2') )

def test_stub(self):
Expand All @@ -87,14 +87,14 @@ def pour(self): pass
case = CupOf()
milk = Milk()
case.setup()
self.assertEquals( deque(), case._stubs )
self.assertEqual( deque(), case._stubs )
case.stub( milk.pour )
self.assertTrue( isinstance(milk.pour, Stub) )
self.assertEquals( deque([milk.pour]), case._stubs )
self.assertEqual( deque([milk.pour]), case._stubs )

# Test it's only added once
case.stub( milk, 'pour' )
self.assertEquals( deque([milk.pour]), case._stubs )
self.assertEqual( deque([milk.pour]), case._stubs )

def test_expect(self):
class Milk(object):
Expand All @@ -103,27 +103,27 @@ def pour(self): pass
case = CupOf()
milk = Milk()
case.setup()
self.assertEquals( deque(), case._stubs )
self.assertEqual( deque(), case._stubs )
case.expect( milk.pour )
self.assertEquals( deque([milk.pour]), case._stubs )
self.assertEqual( deque([milk.pour]), case._stubs )

# Test it's only added once
case.expect( milk, 'pour' )
self.assertEquals( deque([milk.pour]), case._stubs )
self.assertEqual( deque([milk.pour]), case._stubs )

self.assertEquals( 2, len(milk.pour._expectations) )
self.assertEqual( 2, len(milk.pour._expectations) )

def test_mock_no_binding(self):
case = CupOf()
case.setup()

self.assertEquals( deque(), case._mocks )
self.assertEqual( deque(), case._mocks )
mock1 = case.mock()
self.assertTrue( isinstance(mock1, Mock) )
self.assertEquals( deque(), case._mocks )
self.assertEqual( deque(), case._mocks )
mock2 = case.mock()
self.assertTrue( isinstance(mock2, Mock) )
self.assertEquals( deque(), case._mocks )
self.assertEqual( deque(), case._mocks )
self.assertNotEqual( mock1, mock2 )

def test_mock_with_attr_binding(self):
Expand All @@ -136,18 +136,18 @@ def pour(self): return self._case.pop(0)
milk = Milk()
orig_pour = milk.pour

self.assertEquals( deque(), case._mocks )
self.assertEqual( deque(), case._mocks )
mock1 = case.mock( milk, 'pour' )
self.assertTrue( isinstance(mock1, Mock) )
self.assertEquals( deque([(milk,'pour',orig_pour)]), case._mocks )
self.assertEqual( deque([(milk,'pour',orig_pour)]), case._mocks )
mock2 = case.mock( milk, 'pour' )
self.assertTrue( isinstance(mock2, Mock) )
self.assertEquals( deque([(milk,'pour',orig_pour),(milk,'pour',mock1)]), case._mocks )
self.assertEqual( deque([(milk,'pour',orig_pour),(milk,'pour',mock1)]), case._mocks )
self.assertNotEqual( mock1, mock2 )

mock3 = case.mock( milk, 'foo' )
self.assertTrue( isinstance(mock3, Mock) )
self.assertEquals( deque([(milk,'pour',orig_pour),(milk,'pour',mock1),(milk,'foo')]), case._mocks )
self.assertEqual( deque([(milk,'pour',orig_pour),(milk,'pour',mock1),(milk,'foo')]), case._mocks )

def test_chai_class_use_metaclass(self):
obj = CupOf()
Expand All @@ -169,8 +169,8 @@ def teardown(self): self.teardown_calls += 1
case._stubs = deque([stub])

case.test_local_definitions_work_and_are_global()
self.assertEquals(1, stub.unmet_calls)
self.assertEquals(1, stub.teardown_calls)
self.assertEqual(1, stub.unmet_calls)
self.assertEqual(1, stub.teardown_calls)

def test_raises_if_unmet_expectations(self):
class Milk(object):
Expand Down
50 changes: 25 additions & 25 deletions tests/comparator_test.py → tests/test_comparator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ def test_equals(self):

def test_equals_repr(self):
comp = Equals(3)
self.assertEquals(str(comp), "3")
self.assertEqual(str(comp), "3")

def test_eq(self):
comp = Equals(3)
self.assertEquals( comp, 3 )
self.assertEqual( comp, 3 )

def test_is_a(self):
comp = IsA(str)
Expand All @@ -64,13 +64,13 @@ def test_is_a(self):

def test_is_a_repr(self):
comp = IsA(str)
self.assertEquals(repr(comp), "IsA(str)")
self.assertEqual(repr(comp), "IsA(str)")

def test_is_a_format_name(self):
comp = IsA(str)
self.assertEquals(comp._format_name(), "str")
self.assertEqual(comp._format_name(), "str")
comp = IsA((str, list))
self.assertEquals(comp._format_name(), "['str', 'list']")
self.assertEqual(comp._format_name(), "['str', 'list']")

def test_is(self):
class Test(object):
Expand All @@ -79,7 +79,7 @@ def __eq__(self, other): return True
obj1 = Test()
obj2 = Test()
comp = Is(obj1)
self.assertEquals( obj1, obj2 )
self.assertEqual( obj1, obj2 )
self.assertTrue( comp.test(obj1) )
self.assertFalse( comp.test(obj2) )

Expand All @@ -90,7 +90,7 @@ def __str__(self):
return "An Object"

obj = TestObj()
self.assertEquals(repr(Is(obj)), "Is(An Object)" )
self.assertEqual(repr(Is(obj)), "Is(An Object)" )

def test_almost_equal(self):
comp = AlmostEqual(3.14159265, 3)
Expand All @@ -99,7 +99,7 @@ def test_almost_equal(self):

def test_almost_equal_repr(self):
comp = AlmostEqual(3.14159265, 3)
self.assertEquals(repr(comp), "AlmostEqual(value: 3.14159265, places: 3)")
self.assertEqual(repr(comp), "AlmostEqual(value: 3.14159265, places: 3)")

def test_regex(self):
comp = Regex('[wf][io]{2}')
Expand All @@ -109,7 +109,7 @@ def test_regex(self):

def test_regex_repr(self):
comp = Regex('[wf][io]{2}')
self.assertEquals(repr(comp), "Regex(pattern: [wf][io]{2}, flags: 0)")
self.assertEqual(repr(comp), "Regex(pattern: [wf][io]{2}, flags: 0)")

def test_any(self):
comp = Any(1,2.3,str)
Expand All @@ -120,9 +120,9 @@ def test_any(self):
def test_any_repr(self):
comp = Any(1,2,3,str)
if sys.version_info.major==2:
self.assertEquals(repr(comp), "Any([1, 2, 3, Any([IsA(str), Is(<type 'str'>)])])")
self.assertEqual(repr(comp), "Any([1, 2, 3, Any([IsA(str), Is(<type 'str'>)])])")
else:
self.assertEquals(repr(comp), "Any([1, 2, 3, Any([IsA(str), Is(<class 'str'>)])])")
self.assertEqual(repr(comp), "Any([1, 2, 3, Any([IsA(str), Is(<class 'str'>)])])")

def test_in(self):
comp = In(['foo', 'bar'])
Expand All @@ -149,7 +149,7 @@ def test_all(self):
comp = All(IsA(bytearray), Equals('foo'.encode('ascii')))
self.assertTrue( comp.test(bytearray('foo'.encode('ascii'))) )
self.assertFalse( comp.test('foo') )
self.assertEquals( 'foo'.encode('ascii'), bytearray('foo'.encode('ascii')) )
self.assertEqual( 'foo'.encode('ascii'), bytearray('foo'.encode('ascii')) )

def test_all_repr(self):
comp = All(IsA(bytearray), Equals('foobar'))
Expand Down Expand Up @@ -186,38 +186,38 @@ def test_ignore_repr(self):

def test_variable(self):
comp = Variable('foo')
self.assertEquals( 0, len(Variable._cache) )
self.assertEqual( 0, len(Variable._cache) )
self.assertTrue( comp.test('bar') )
self.assertEquals( 1, len(Variable._cache) )
self.assertEqual( 1, len(Variable._cache) )
self.assertTrue( comp.test('bar') )
self.assertFalse( comp.test('bar2') )

self.assertTrue( Variable('foo').test('bar') )
self.assertFalse( Variable('foo').test('bar2') )
self.assertEquals( 1, len(Variable._cache) )
self.assertEqual( 1, len(Variable._cache) )

self.assertEquals( 'bar', comp.value )
self.assertEquals( 'bar', Variable('foo').value )
self.assertEqual( 'bar', comp.value )
self.assertEqual( 'bar', Variable('foo').value )

v = Variable('foo2')
self.assertEquals( 1, len(Variable._cache) )
self.assertEqual( 1, len(Variable._cache) )
v.test('dog')
self.assertEquals( 'dog', v.value )
self.assertEquals( 2, len(Variable._cache) )
self.assertEqual( 'dog', v.value )
self.assertEqual( 2, len(Variable._cache) )

Variable.clear()
self.assertEquals( 0, len(Variable._cache) )
self.assertEqual( 0, len(Variable._cache) )

def test_variable_repr(self):
v = Variable('foo')
self.assertEquals( repr(v), "Variable('foo')" )
self.assertEqual( repr(v), "Variable('foo')" )

def test_like_init(self):
c = Like({'foo':'bar'})
self.assertEquals( {'foo':'bar'}, c._src )
self.assertEqual( {'foo':'bar'}, c._src )

c = Like(['foo', 'bar'])
self.assertEquals( ['foo','bar'], c._src )
self.assertEqual( ['foo','bar'], c._src )

def test_like_test(self):
c = Like({'foo':'bar'})
Expand All @@ -232,4 +232,4 @@ def test_like_test(self):

def test_like_repr(self):
c = Like({'foo':'bar'})
self.assertEquals( repr(c), "Like({'foo': 'bar'})" )
self.assertEqual( repr(c), "Like({'foo': 'bar'})" )
Loading