Add unittesting

Author: areed1192

.vscode/settings.json

@@ -3,5 +3,9 @@
   "python.linting.pylintEnabled": false,
   "python.pythonPath": "C:\\Users\\Alex\\AppData\\Local\\Programs\\Python\\Python39\\python.exe",
   "python.linting.flake8Enabled": true,
-  "python.linting.flake8Args": ["--max-line-length=140", "--ignore=E402"]
+  "python.linting.flake8Args": ["--max-line-length=140", "--ignore=E402"],
+  "python.testing.unittestArgs": ["-v", "-s", "./tests", "-p", "test_*.py"],
+  "python.testing.pytestEnabled": false,
+  "python.testing.nosetestsEnabled": false,
+  "python.testing.unittestEnabled": true
 }

ms_graph/workbooks.py renamed to ms_graph/_workbooks.py

@@ -28,3 +28,6 @@ def __init__(self, session: object) -> None:
 
         # Set the endpoint.
         self.endpoint = 'workbook'
+
+    def create_session(self) -> Dict:
+        pass

ms_graph/session.py

@@ -1,6 +1,7 @@
+import json as json_lib
 import requests
+import logging
 
-from pprint import pprint
 from typing import Dict
 
 
@@ -28,7 +29,16 @@ def __init__(self, client: object) -> None:
 
         from ms_graph.client import MicrosoftGraphClient
 
+        # We can also add custom formatting to our log messages.
+        log_format = '%(asctime)-15s|%(filename)s|%(message)s'
+
         self.client: MicrosoftGraphClient = client
+        logging.basicConfig(
+            filename="logs/log_file_custom.log",
+            level=logging.INFO,
+            encoding="utf-8",
+            format=log_format
+        )
 
     def build_headers(self, mode: str = 'json') -> Dict:
         """Used to build the headers needed to make the request.
@@ -106,7 +116,9 @@ def make_request(self, method: str, endpoint: str, mode: str = None, params: dic
         # Define the headers.
         headers = self.build_headers(mode='json')
 
-        print(url)
+        logging.info(
+            "URL: {url}".format(url=url)
+        )
 
         # Define a new session.
         request_session = requests.Session()
@@ -139,5 +151,19 @@ def make_request(self, method: str, endpoint: str, mode: str = None, params: dic
                 'status_code': response.status_code
             }
         elif not response.ok:
-            pprint(response.json())
+
+            # Define the error dict.
+            error_dict = {
+                'error_code': response.status_code,
+                'response_url': response.url,
+                'response_body': json_lib.loads(response.content.decode('ascii')),
+                'response_request': dict(response.request.headers),
+                'response_method': response.request.method,
+            }
+
+            # Log the error.
+            logging.error(
+                msg=json_lib.dumps(obj=error_dict, indent=4)
+            )
+
             raise requests.HTTPError()

samples/use_client.py

@@ -10,10 +10,7 @@
     'Directory.ReadWrite.All',
     'User.Read.All',
     'Directory.Read.All',
-    'Directory.ReadWrite.All',
-    # 'offline_access',
-    # 'openid',
-    # 'profile'
+    'Directory.ReadWrite.All'
 ]
 
 # Initialize the Parser.

tests/test_client.py

@@ -2,31 +2,109 @@
 
 from unittest import TestCase
 from configparser import ConfigParser
+from ms_graph.client import MicrosoftGraphClient
 
+from ms_graph.mail import Mail
+from ms_graph.notes import Notes
+from ms_graph.users import Users
+from ms_graph.search import Search
+from ms_graph.drives import Drives
+from ms_graph.groups import Groups
+from ms_graph.session import GraphSession
+from ms_graph.drive_items import DriveItems
+from ms_graph.personal_contacts import PersonalContacts
 
-class MySession(TestCase):
 
-    """Will perform a unit test for the <PLACEHOLDER> session."""
+class MicrosoftGraphSessionTest(TestCase):
+
+    """Will perform a unit test for the `MicrosoftGraphClient` session."""
 
     def setUp(self) -> None:
-        """Set up the <PLACEHOLDER> Client."""
+        """Set up the `MicrosoftGraphClient` Client."""
+
+        scopes = [
+            'Calendars.ReadWrite',
+            'Files.ReadWrite.All',
+            'User.ReadWrite.All',
+            'Notes.ReadWrite.All',
+            'Directory.ReadWrite.All',
+            'User.Read.All',
+            'Directory.Read.All',
+            'Directory.ReadWrite.All'
+        ]
 
         # Initialize the Parser.
         config = ConfigParser()
 
         # Read the file.
-        config.read('configs/config.ini')
+        config.read('config/config.ini')
 
         # Get the specified credentials.
-        config.get('main', '')
+        client_id = config.get('graph_api', 'client_id')
+        client_secret = config.get('graph_api', 'client_secret')
+        redirect_uri = config.get('graph_api', 'redirect_uri')
+
+        # Initialize the Client.
+        graph_client = MicrosoftGraphClient(
+            client_id=client_id,
+            client_secret=client_secret,
+            redirect_uri=redirect_uri,
+            scope=scopes,
+            credentials='config/ms_graph_state.jsonc'
+        )
+
+        self.client = graph_client
 
     def test_creates_instance_of_session(self):
-        """Create an instance and make sure it's a <PLACEHOLDER>."""
-        pass
+        """Create an instance and make sure it's a `MicrosoftGraphClient`."""
+
+        self.assertIsInstance(self.client, MicrosoftGraphClient)
+
+    def test_creates_instance_of_mail(self):
+        """Create an instance and make sure it's a `MicrosoftGraphClient.Mail`."""
+
+        self.assertIsInstance(self.client.mail(), Mail)
+
+    def test_creates_instance_of_drive_items(self):
+        """Create an instance and make sure it's a `MicrosoftGraphClient.DriveItems`."""
+
+        self.assertIsInstance(self.client.drive_item(), DriveItems)
+
+    def test_creates_instance_of_drives(self):
+        """Create an instance and make sure it's a `MicrosoftGraphClient.Drives`."""
+
+        self.assertIsInstance(self.client.drives(), Drives)
+
+    def test_creates_instance_of_users(self):
+        """Create an instance and make sure it's a `MicrosoftGraphClient.Users`."""
+
+        self.assertIsInstance(self.client.users(), Users)
+
+    def test_creates_instance_of_groups(self):
+        """Create an instance and make sure it's a `MicrosoftGraphClient.Groups`."""
+
+        self.assertIsInstance(self.client.groups(), Groups)
+
+    def test_creates_instance_of_notes(self):
+        """Create an instance and make sure it's a `MicrosoftGraphClient.Notes`."""
+
+        self.assertIsInstance(self.client.notes(), Notes)
+
+    def test_creates_instance_of_search(self):
+        """Create an instance and make sure it's a `MicrosoftGraphClient.Search`."""
+
+        self.assertIsInstance(self.client.search(), Search)
+
+    def test_creates_instance_of_personal_contacts(self):
+        """Create an instance and make sure it's a `MicrosoftGraphClient.PersonalContacts`."""
+
+        self.assertIsInstance(
+            self.client.personal_contacts(), PersonalContacts)
 
     def tearDown(self) -> None:
-        """Teardown the <PLACEHOLDER> Client."""
-        pass
+        """Teardown the `MicrosoftGraphClient` Client."""
+
+        del self.client
 
 
 if __name__ == '__main__':