Use unittest.mock instead of case

10 files changed, 29 insertions, 15 deletions

diff --git a/t/integration/test_integration.py b/t/integration/test_integration.py
index eb64505..3003d86 100644
--- a/t/integration/test_integration.py
+++ b/t/integration/test_integration.py
@@ -2,7 +2,10 @@ import socket
 from struct import pack
 
 import pytest
-from case import ANY, Mock, call, patch
+# python 3.5 does not support assert_called()
+# TODO: After dropping support of python3.5
+#       unittest.mock can be used instead of case
+from case import Mock, ANY, call, patch
 
 import amqp
 from amqp import Channel, Connection, Message, sasl, spec
diff --git a/t/integration/test_rmq.py b/t/integration/test_rmq.py
index 2844fe3..2602630 100644
--- a/t/integration/test_rmq.py
+++ b/t/integration/test_rmq.py
@@ -1,8 +1,8 @@
 import os
 import ssl
+from unittest.mock import ANY, Mock
 
 import pytest
-from case import ANY, Mock
 
 import amqp
 
diff --git a/t/unit/test_abstract_channel.py b/t/unit/test_abstract_channel.py
index 5d71ae5..0034121 100644
--- a/t/unit/test_abstract_channel.py
+++ b/t/unit/test_abstract_channel.py
@@ -1,5 +1,6 @@
+from unittest.mock import Mock, patch, sentinel
+
 import pytest
-from case import Mock, patch, sentinel
 from vine import promise
 
 from amqp import spec
@@ -146,7 +147,9 @@ class test_AbstractChannel:
             )
             if method in (spec.Channel.Close, spec.Channel.CloseOk):
                 self.c._METHODS.__getitem__.assert_called_once_with(method)
-                self.c._callbacks[method].assert_called_once()
+                self.c._callbacks[method].assert_called_once_with(
+                    sentinel.CONTENT
+                )
             else:
                 self.c._METHODS.__getitem__.assert_not_called()
                 self.c._callbacks[method].assert_not_called()
diff --git a/t/unit/test_basic_message.py b/t/unit/test_basic_message.py
index 360a650..c0234bb 100644
--- a/t/unit/test_basic_message.py
+++ b/t/unit/test_basic_message.py
@@ -1,4 +1,4 @@
-from case import Mock
+from unittest.mock import Mock
 
 from amqp.basic_message import Message
 
diff --git a/t/unit/test_channel.py b/t/unit/test_channel.py
index 800711f..c8f1f9a 100644
--- a/t/unit/test_channel.py
+++ b/t/unit/test_channel.py
@@ -1,8 +1,9 @@
 import socket
 from struct import pack
+from unittest.mock import ANY, MagicMock, Mock, patch
 
 import pytest
-from case import ANY, ContextMock, MagicMock, Mock, patch
+from case import ContextMock
 from vine import promise
 
 from amqp import spec
diff --git a/t/unit/test_connection.py b/t/unit/test_connection.py
index 429991c..7187b54 100644
--- a/t/unit/test_connection.py
+++ b/t/unit/test_connection.py
@@ -2,7 +2,10 @@ import socket
 import warnings
 
 import pytest
-from case import ContextMock, Mock, call, patch
+# python 3.5 does not support assert_called()
+# TODO: After dropping support of python3.5
+#       unittest.mock can be used instead of case
+from case import Mock, call, patch, ContextMock
 
 from amqp import Connection, spec
 from amqp.connection import SSLError
diff --git a/t/unit/test_exceptions.py b/t/unit/test_exceptions.py
index 1a7abae..adcdbd0 100644
--- a/t/unit/test_exceptions.py
+++ b/t/unit/test_exceptions.py
@@ -1,5 +1,6 @@
+from unittest.mock import Mock
+
 import pytest
-from case import Mock
 
 import amqp.exceptions
 from amqp.exceptions import AMQPError, error_for_code
diff --git a/t/unit/test_method_framing.py b/t/unit/test_method_framing.py
index d721d7d..826f901 100644
--- a/t/unit/test_method_framing.py
+++ b/t/unit/test_method_framing.py
@@ -1,6 +1,9 @@
 from struct import pack
 
 import pytest
+# python 3.5 does not support assert_called()
+# TODO: After dropping support of python3.5
+#       unittest.mock can be used instead of case
 from case import Mock
 
 from amqp import spec
diff --git a/t/unit/test_sasl.py b/t/unit/test_sasl.py
index c47a694..ac81a66 100644
--- a/t/unit/test_sasl.py
+++ b/t/unit/test_sasl.py
@@ -2,9 +2,9 @@ import contextlib
 import socket
 import sys
 from io import BytesIO
+from unittest.mock import Mock, call, patch
 
 import pytest
-from case import Mock, call, patch
 
 from amqp import sasl
 from amqp.serialization import _write_table
@@ -99,7 +99,7 @@ class test_SASL:
             mech = GSSAPI(rdns=True)
             mech.start(connection)
 
-            connection.transport.sock.getpeername.assert_called()
+            connection.transport.sock.getpeername.assert_called_with()
             gethostbyaddr.assert_called_with('192.0.2.0')
             gssapi.Name.assert_called_with(b'amqp@broker.example.org',
                                            gssapi.NameType.hostbased_service)
diff --git a/t/unit/test_transport.py b/t/unit/test_transport.py
index d7f5f5f..50807f7 100644
--- a/t/unit/test_transport.py
+++ b/t/unit/test_transport.py
@@ -3,9 +3,9 @@ import socket
 import struct
 import os
 from struct import pack
+from unittest.mock import ANY, MagicMock, Mock, call, patch
 
 import pytest
-from case import ANY, MagicMock, Mock, call, patch
 
 from amqp import transport
 from amqp.exceptions import UnexpectedFrame
@@ -385,7 +385,7 @@ class test_AbstractTransport:
             sock_mock.gettimeout.return_value = 3
             with self.t.having_timeout(5) as actual_sock:
                 assert actual_sock == self.t.sock
-            sock_mock.gettimeout.assert_called()
+            sock_mock.gettimeout.assert_called_with()
             sock_mock.settimeout.assert_has_calls(
                 [
                     call(5),
@@ -402,7 +402,7 @@ class test_AbstractTransport:
                 with self.t.having_timeout(5) as actual_sock:
                     assert actual_sock == self.t.sock
                     raise DummyException()
-            sock_mock.gettimeout.assert_called()
+            sock_mock.gettimeout.assert_called_with()
             sock_mock.settimeout.assert_has_calls(
                 [
                     call(5),
@@ -417,7 +417,7 @@ class test_AbstractTransport:
             sock_mock.gettimeout.return_value = 5
             with self.t.having_timeout(5) as actual_sock:
                 assert actual_sock == self.t.sock
-            sock_mock.gettimeout.assert_called()
+            sock_mock.gettimeout.assert_called_with()
             sock_mock.settimeout.assert_not_called()
 
     def test_set_timeout_ewouldblock_exc(self):
@@ -644,7 +644,7 @@ class test_SSLTransport:
         self.t.sock = Mock(name='SSLSocket')
         self.t.sock.write.return_value = 2
         self.t._write('foo')
-        self.t.sock.write.assert_called()
+        self.t.sock.write.assert_called_with(ANY)
 
     def test_write_socket_closed(self):
         self.t.sock = Mock(name='SSLSocket')