Use unittest.TestCase for all tests

Signed-off-by: Roald Nefs <info@roaldnefs.com>

Author: roaldnefs

tests/conftest.py

@@ -1,72 +1,75 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020 Roald Nefs <info@roaldnefs.com>
+# Copyright (C) 2020, 2012 Roald Nefs <info@roaldnefs.com>
 #
 # This file is part of python-transip.
-
+#
 # python-transip is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-
+#
 # python-transip is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
-
+#
 # You should have received a copy of the GNU Lesser General Public License
 # along with python-transip.  If not, see <https://www.gnu.org/licenses/>.
 
 import responses  # type: ignore
 import unittest
-import pytest
 
-from typing import Type, List, Dict, Any, Union
+from typing import List, Dict, Any, Union
 
 from transip import TransIP
 from transip.v6.objects import Domain, WhoisContact, Nameserver, DnsEntry
-from tests.utils import load_responses_fixture
+from tests.utils import load_responses_fixtures
 
 
-@pytest.mark.usefixtures("minimal_client_class")
 class DomainsTest(unittest.TestCase):
     """Test the DomainService."""
 
-    client: Type[TransIP]
+    client: TransIP
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        """Set up a minimal TransIP client for using the domain services."""
+        cls.client = TransIP(access_token='ACCESS_TOKEN')
 
-    def setUp(self):
-        # Setup mocked responses for the /domains endpoint
-        load_responses_fixture("domains.json")
+    def setUp(self) -> None:
+        """Setup mocked responses for the '/domains' endpoint."""
+        load_responses_fixtures("domains.json")
 
     @responses.activate
     def test_get(self) -> None:
-        domain: Type[Domain] = self.client.domains.get("example.com")
+        domain: Domain = self.client.domains.get("example.com")
 
         assert domain.get_id() == "example.com"  # type: ignore
 
     @responses.activate
     def test_contacts_list(self) -> None:
-        domain: Type[Domain] = self.client.domains.get("example.com")
-        contacts: List[Type[Domain]] = domain.contacts.list()  # type: ignore
-        contact: Type[Domain] = contacts[0]
+        domain: Domain = self.client.domains.get("example.com")
+        contacts: List[Domain] = domain.contacts.list()  # type: ignore
+        contact: Domain = contacts[0]
 
         assert len(contacts) == 1
         assert contact.companyName == "Example B.V."  # type: ignore
 
     @responses.activate
     def test_nameservers_list(self) -> None:
-        domain: Type[Domain] = self.client.domains.get("example.com")
-        nameservers: List[Type[Nameserver]] = domain.nameservers.list()  # type: ignore
-        nameserver: Type[Nameserver] = nameservers[0]
+        domain: Domain = self.client.domains.get("example.com")
+        nameservers: List[Nameserver] = domain.nameservers.list()  # type: ignore
+        nameserver: Nameserver = nameservers[0]
 
         assert len(nameservers) == 1
         assert nameserver.get_id() == "ns0.transip.nl"  # type: ignore
 
     @responses.activate
     def test_dns_list(self) -> None:
-        domain: Type[Domain] = self.client.domains.get("example.com")
-        entries: List[Type[DnsEntry]] = domain.dns.list()  # type: ignore
-        entry: Type[DnsEntry] = entries[0]
+        domain: Domain = self.client.domains.get("example.com")
+        entries: List[DnsEntry] = domain.dns.list()  # type: ignore
+        entry: DnsEntry = entries[0]
 
         assert len(entries) == 1
         assert entry.name == "www"  # type: ignore
@@ -79,7 +82,7 @@ def test_dns_create(self) -> None:
             "type": "A",
             "content": "127.0.0.1"
         }
-        domain: Type[Domain] = self.client.domains.get("example.com")
+        domain: Domain = self.client.domains.get("example.com")
         domain.dns.create(dns_entry_data)  # type: ignore
 
         assert len(responses.calls) == 2

tests/services/test_domains.py

@@ -1,77 +1,55 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020 Roald Nefs <info@roaldnefs.com>
+# Copyright (C) 2020, 2021 Roald Nefs <info@roaldnefs.com>
 #
 # This file is part of python-transip.
-
+#
 # python-transip is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-
+#
 # python-transip is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
-
+#
 # You should have received a copy of the GNU Lesser General Public License
 # along with python-transip.  If not, see <https://www.gnu.org/licenses/>.
 
-from typing import Type, List
+from typing import List, Tuple, Any, Dict
 import responses  # type: ignore
+import unittest
 
 from transip import TransIP
 from transip.v6.objects import Invoice
+from tests.utils import load_responses_fixtures
 
+class InvoicesTest(unittest.TestCase):
+    """Test the InvoiceService."""
 
-@responses.activate
-def test_invoices_list(transip_minimal_client: Type[TransIP]) -> None:
-    responses.add(
-        responses.GET,
-        "https://api.transip.nl/v6/invoices",
-        json={
-            "invoices": [
-                {
-                    "invoiceNumber": "F0000.1911.0000.0004",
-                    "creationDate": "2020-01-01",
-                    "payDate": "2020-01-01",
-                    "dueDate": "2020-02-01",
-                    "invoiceStatus": "waitsforpayment",
-                    "currency": "EUR",
-                    "totalAmount": 1000,
-                    "totalAmountInclVat": 1240
-                }
-            ]
-        },
-        status=200,
-    )
-    
-    invoices: List[Type[Invoice]] = transip_minimal_client.invoices.list()
-    invoice: Type[Invoice] = invoices[0] 
-    assert len(invoices) == 1
-    assert invoice.get_id() == "F0000.1911.0000.0004"  # type: ignore
+    client: TransIP
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        """Set up a minimal TransIP client for using the invoice services."""
+        cls.client = TransIP(access_token='ACCESS_TOKEN')
 
+    def setUp(self) -> None:
+        """Setup mocked responses for the '/invoices' endpoint."""
+        load_responses_fixtures("account.json")
 
-@responses.activate
-def test_invoices_get(transip_minimal_client: Type[TransIP]) -> None:
-    responses.add(
-        responses.GET,
-        "https://api.transip.nl/v6/invoices/F0000.1911.0000.0004",
-        json={
-            "invoice": {
-                "invoiceNumber": "F0000.1911.0000.0004",
-                "creationDate": "2020-01-01",
-                "payDate": "2020-01-01",
-                "dueDate": "2020-02-01",
-                "invoiceStatus": "waitsforpayment",
-                "currency": "EUR",
-                "totalAmount": 1000,
-                "totalAmountInclVat": 1240
-            }
-        },
-        status=200,
-    )
+    @responses.activate
+    def test_list(self) -> None:
+        invoices: List[Invoice] = self.client.invoices.list()
+        invoice: Invoice = invoices[0]
 
-    invoice_id: str = "F0000.1911.0000.0004"
-    invoice: Type[Invoice] = transip_minimal_client.invoices.get(invoice_id)
-    assert invoice.get_id() == "F0000.1911.0000.0004"  # type: ignore
+        assert len(invoices) == 1
+        assert invoice.get_id() == "F0000.1911.0000.0004"  # type: ignore
+
+    @responses.activate
+    def test_get(self) -> None:
+        invoice_id: str = "F0000.1911.0000.0004"
+        invoice: Invoice = self.client.invoices.get(invoice_id)
+
+        assert invoice.get_id() == "F0000.1911.0000.0004"  # type: ignore

tests/services/test_invoices.py

@@ -1,55 +1,57 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020 Roald Nefs <info@roaldnefs.com>
+# Copyright (C) 2020, 2021 Roald Nefs <info@roaldnefs.com>
 #
 # This file is part of python-transip.
-
+#
 # python-transip is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-
+#
 # python-transip is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
-
+#
 # You should have received a copy of the GNU Lesser General Public License
 # along with python-transip.  If not, see <https://www.gnu.org/licenses/>.
 
-from typing import Type, List, Tuple, Any, Dict
+from typing import List, Tuple, Any, Dict
 import responses  # type: ignore
-import json
-import pytest
 import unittest
 
 from transip import TransIP
 from transip.v6.objects import SshKey
-from tests.utils import load_responses_fixture
+from tests.utils import load_responses_fixtures
 
 
-@pytest.mark.usefixtures("minimal_client_class")
 class SshKeysTest(unittest.TestCase):
     """Test the SshKeyService."""
 
-    client: Type[TransIP]
+    client: TransIP
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        """Set up a minimal TransIP client for using the ssh-key services."""
+        cls.client = TransIP(access_token='ACCESS_TOKEN')
 
-    def setUp(self):
-        # Setup mocked responses for the /ssh-keys endpoint
-        load_responses_fixture("account.json")
+    def setUp(self) -> None:
+        """Setup mocked responses for the '/ssh-keys' endpoint."""
+        load_responses_fixtures("account.json")
 
     @responses.activate
     def test_list(self) -> None:
-        ssh_keys: List[Type[SshKey]] = self.client.ssh_keys.list()
-        ssh_key: Type[SshKey] = ssh_keys[0]
+        ssh_keys: List[SshKey] = self.client.ssh_keys.list()
+        ssh_key: SshKey = ssh_keys[0]
 
         assert len(ssh_keys) == 1
         assert ssh_key.get_id() == 123  # type: ignore
 
     @responses.activate
     def test_get(self) -> None:
         ssh_key_id: int = 123
-        ssh_key: Type[SshKey] = self.client.ssh_keys.get(ssh_key_id)
+        ssh_key: SshKey = self.client.ssh_keys.get(ssh_key_id)
 
         assert ssh_key.get_id() == 123  # type: ignore
 
@@ -64,7 +66,7 @@ def test_delete(self) -> None:
     @responses.activate
     def test_delete_object(self) -> None:
         ssh_key_id: int = 123
-        ssh_key: Type[SshKey] = self.client.ssh_keys.get(ssh_key_id)
+        ssh_key: SshKey = self.client.ssh_keys.get(ssh_key_id)
 
         try:
             ssh_key.delete()  # type: ignore

tests/services/test_ssh_keys.py

@@ -1,26 +1,45 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020 Roald Nefs <info@roaldnefs.com>
+# Copyright (C) 2020, 2021 Roald Nefs <info@roaldnefs.com>
 #
 # This file is part of python-transip.
-
+#
 # python-transip is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-
+#
 # python-transip is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
-
+#
 # You should have received a copy of the GNU Lesser General Public License
 # along with python-transip.  If not, see <https://www.gnu.org/licenses/>.
 
-from typing import Type
+import unittest
 
 from transip import TransIP
 
 
-def test_transip_url(transip_minimal_client: Type[TransIP]) -> None:
-    assert transip_minimal_client.url == "https://api.transip.nl/v6"
+class TransIPTest(unittest.TestCase):
+    """Test the TransIP client class."""
+
+    client: TransIP
+
+    @classmethod
+    def setUpClass(self) -> None:
+        """Set up a minimal TransIP client."""
+        self.client = TransIP(access_token='ACCESS_TOKEN')
+
+    def test_base_url(self) -> None:
+        """Test the base URL of the API."""
+        url: str = self.client.url
+
+        assert url == "https://api.transip.nl/v6"
+
+    def test_authorization_header(self) -> None:
+        """Test if the Authorization header is set correctly."""
+        auth_header: str = self.client.headers["Authorization"]
+
+        assert auth_header == "Bearer ACCESS_TOKEN"