Refactor tests to remove unittest2 dependency

Author: russss

dev-requirements.txt

@@ -1,4 +1,3 @@
 flake8==3.8.4
 black==20.8b1
 pytest==6.1.2
-unittest2==1.1.0

emv/protocol/test/test_command.py

@@ -1,7 +1,3 @@
-from __future__ import division, absolute_import, print_function, unicode_literals
-
-# coding=utf-8
-from unittest2 import TestCase
 from emv.protocol.command import (
     CAPDU,
     SelectCommand,
@@ -10,23 +6,22 @@
 from emv.util import unformat_bytes
 
 
-class TestCAPDU(TestCase):
-    def test_unmarshal(self):
-        pdu = CAPDU.unmarshal(unformat_bytes("00 A4 04 00 07 A0 00 00 00 03 80 02"))
-        self.assertIs(type(pdu), SelectCommand)
-        self.assertEqual(pdu.p1, 0x04)
-        self.assertEqual(pdu.p2, 0x00)
-        self.assertEqual(len(pdu.data), 0x07)
-        self.assertEqual(pdu.le, None)
+def test_unmarshal():
+    pdu = CAPDU.unmarshal(unformat_bytes("00 A4 04 00 07 A0 00 00 00 03 80 02"))
+    assert type(pdu) is SelectCommand
+    assert pdu.p1 == 0x04
+    assert pdu.p2 == 0x00
+    assert len(pdu.data) == 0x07
+    assert pdu.le is None
 
-        pdu = CAPDU.unmarshal(
-            unformat_bytes(
-                """80 AE 80 00 1D 00 00 00 00 00 00 00 00 00 00 00 00
-                              00 00 80 00 00 00 00 00 00 01 01 01 00 00 00 00 00"""
-            )
+    pdu = CAPDU.unmarshal(
+        unformat_bytes(
+            """80 AE 80 00 1D 00 00 00 00 00 00 00 00 00 00 00 00
+                          00 00 80 00 00 00 00 00 00 01 01 01 00 00 00 00 00"""
         )
-        self.assertIs(type(pdu), GenerateApplicationCryptogramCommand)
-        self.assertEqual(pdu.p1, 0x80)
-        self.assertEqual(pdu.p2, 0x00)
-        self.assertEqual(len(pdu.data), 0x1D)
-        self.assertEqual(pdu.le, None)
+    )
+    assert type(pdu) is GenerateApplicationCryptogramCommand
+    assert pdu.p1 == 0x80
+    assert pdu.p2 == 0x00
+    assert len(pdu.data) == 0x1D
+    assert pdu.le is None

emv/protocol/test/test_data_elements.py

@@ -1,18 +1,13 @@
-from __future__ import division, absolute_import, print_function, unicode_literals
-
-# coding=utf-8
-from unittest2 import TestCase
 from emv.protocol.data_elements import ELEMENT_TABLE
 
 
-class TestDataElements(TestCase):
-    def test_data_elements(self):
-        # Test uniqueness of the main element table
-        seen_tags = set()
-        seen_shortnames = set()
-        for tag, name, parse, shortname in ELEMENT_TABLE:
-            self.assertNotIn(tag, seen_tags)
-            if shortname is not None:
-                self.assertNotIn(shortname, seen_shortnames)
-                seen_shortnames.add(shortname)
-            seen_tags.add(tag)
+def test_data_elements():
+    # Test uniqueness of the main element table
+    seen_tags = set()
+    seen_shortnames = set()
+    for tag, name, parse, shortname in ELEMENT_TABLE:
+        assert tag not in seen_tags
+        if shortname is not None:
+            assert shortname not in seen_shortnames
+            seen_shortnames.add(shortname)
+        seen_tags.add(tag)

emv/protocol/test/test_response.py

@@ -1,16 +1,13 @@
-# coding=utf-8
-from __future__ import division, absolute_import, print_function, unicode_literals
-from unittest2 import TestCase
+import pytest
 from emv.protocol.response import RAPDU, SuccessResponse, WarningResponse, ErrorResponse
 
 
-class TestRAPDU(TestCase):
-    def test_unmarshal(self):
-        pdu = RAPDU.unmarshal([0x90, 0x00])
-        self.assertIs(type(pdu), SuccessResponse)
+def test_unmarshal():
+    pdu = RAPDU.unmarshal([0x90, 0x00])
+    assert type(pdu) is SuccessResponse
 
-        pdu = RAPDU.unmarshal([0x63, 0xC2])
-        self.assertIs(type(pdu), WarningResponse)
+    pdu = RAPDU.unmarshal([0x63, 0xC2])
+    assert type(pdu) is WarningResponse
 
-        with self.assertRaises(ErrorResponse):
-            RAPDU.unmarshal([0x6A, 0x81])
+    with pytest.raises(ErrorResponse):
+        RAPDU.unmarshal([0x6A, 0x81])